diff options
Diffstat (limited to 'usr.bin/vi/common')
| -rw-r--r-- | usr.bin/vi/common/exf.c | 17 | ||||
| -rw-r--r-- | usr.bin/vi/common/key.c | 12 | ||||
| -rw-r--r-- | usr.bin/vi/common/recover.c | 11 |
3 files changed, 3 insertions, 37 deletions
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c index f8121ef1e07..d6ab1ca5249 100644 --- a/usr.bin/vi/common/exf.c +++ b/usr.bin/vi/common/exf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exf.c,v 1.28 2013/12/01 20:22:34 krw Exp $ */ +/* $OpenBSD: exf.c,v 1.29 2014/11/10 21:31:42 tedu Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -856,21 +856,6 @@ file_write(sp, fm, tm, name, flags) msgq_str(sp, M_ERR, name, "252|%s: write lock was unavailable"); -#if __linux__ - /* - * XXX - * In libc 4.5.x, fdopen(fd, "w") clears the O_APPEND flag (if set). - * This bug is fixed in libc 4.6.x. - * - * This code works around this problem for libc 4.5.x users. - * Note that this code is harmless if you're using libc 4.6.x. - */ - if (LF_ISSET(FS_APPEND) && lseek(fd, (off_t)0, SEEK_END) < 0) { - msgq(sp, M_SYSERR, "%s", name); - return (1); - } -#endif - /* * Use stdio for buffering. * diff --git a/usr.bin/vi/common/key.c b/usr.bin/vi/common/key.c index 43617a12d87..fbcc22a9190 100644 --- a/usr.bin/vi/common/key.c +++ b/usr.bin/vi/common/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.11 2013/11/28 22:12:40 krw Exp $ */ +/* $OpenBSD: key.c,v 1.12 2014/11/10 21:31:42 tedu Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -114,16 +114,6 @@ v_key_init(sp) * character set, as long as nul isn't a character. */ (void)setlocale(LC_ALL, ""); -#if __linux__ - /* - * In libc 4.5.26, setlocale(LC_ALL, ""), doesn't setup the table - * for ctype(3c) correctly. This bug is fixed in libc 4.6.x. - * - * This code works around this problem for libc 4.5.x users. - * Note that this code is harmless if you're using libc 4.6.x. - */ - (void)setlocale(LC_CTYPE, ""); -#endif v_key_ilookup(sp); v_keyval(sp, K_CNTRLD, KEY_VEOF); diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c index 8adb35d384a..1b5b154b787 100644 --- a/usr.bin/vi/common/recover.c +++ b/usr.bin/vi/common/recover.c @@ -1,4 +1,4 @@ -/* $OpenBSD: recover.c,v 1.15 2009/10/27 23:59:47 deraadt Exp $ */ +/* $OpenBSD: recover.c,v 1.16 2014/11/10 21:31:42 tedu Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -339,15 +339,6 @@ rcv_mailfile(sp, issync, cp_path) int fd; char *dp, *p, *t, buf[4096], mpath[MAXPATHLEN]; char *t1, *t2, *t3; - - /* - * XXX - * MAXHOSTNAMELEN is in various places on various systems, including - * <netdb.h> and <sys/socket.h>. If not found, use a large default. - */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 1024 -#endif char host[MAXHOSTNAMELEN]; gp = sp->gp; |