Module Name: src
Committed By: kamil
Date: Thu Jun 22 19:41:07 UTC 2017
Modified Files:
src/bin/ksh: c_ksh.c config.h io.c
Log Message:
Drop Ultrix support from ksh(1), a DEC UNIX for VAX
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/bin/ksh/c_ksh.c
cvs rdiff -u -r1.14 -r1.15 src/bin/ksh/config.h
cvs rdiff -u -r1.12 -r1.13 src/bin/ksh/io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/c_ksh.c
diff -u src/bin/ksh/c_ksh.c:1.23 src/bin/ksh/c_ksh.c:1.24
--- src/bin/ksh/c_ksh.c:1.23 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/c_ksh.c Thu Jun 22 19:41:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: c_ksh.c,v 1.23 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: c_ksh.c,v 1.24 2017/06/22 19:41:07 kamil Exp $ */
/*
* built-in Korn commands: c_*
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: c_ksh.c,v 1.23 2017/06/22 14:20:46 kamil Exp $");
+__RCSID("$NetBSD: c_ksh.c,v 1.24 2017/06/22 19:41:07 kamil Exp $");
#endif
#include "sh.h"
@@ -325,7 +325,7 @@ c_print(wp)
switch ((c = *s++)) {
/* Oddly enough, \007 seems more portable than
- * \a (due to Ultrix cc, old pcc's,
+ * \a (due to old pcc's,
* etc.).
*/
case 'a': c = '\007'; break;
Index: src/bin/ksh/config.h
diff -u src/bin/ksh/config.h:1.14 src/bin/ksh/config.h:1.15
--- src/bin/ksh/config.h:1.14 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/config.h Thu Jun 22 19:41:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.14 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: config.h,v 1.15 2017/06/22 19:41:07 kamil Exp $ */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@@ -72,9 +72,6 @@
/* Define if your kernel doesn't handle scripts starting with #! */
/* #undef SHARPBANG */
-/* Define if dup2() preserves the close-on-exec flag (ultrix does this) */
-/* #undef DUP2_BROKEN */
-
/* Define as the return value of signal handlers (0 or ). */
#define RETSIGVAL
Index: src/bin/ksh/io.c
diff -u src/bin/ksh/io.c:1.12 src/bin/ksh/io.c:1.13
--- src/bin/ksh/io.c:1.12 Thu Jun 22 14:20:46 2017
+++ src/bin/ksh/io.c Thu Jun 22 19:41:07 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.12 2017/06/22 14:20:46 kamil Exp $ */
+/* $NetBSD: io.c,v 1.13 2017/06/22 19:41:07 kamil Exp $ */
/*
* shell buffered IO and formatted output
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: io.c,v 1.12 2017/06/22 14:20:46 kamil Exp $");
+__RCSID("$NetBSD: io.c,v 1.13 2017/06/22 19:41:07 kamil Exp $");
#endif
@@ -283,12 +283,6 @@ ksh_dup2(ofd, nfd, errok)
if (ret < 0 && errno != EBADF && !errok)
errorf("too many files open in shell");
-#ifdef DUP2_BROKEN
- /* Ultrix systems like to preserve the close-on-exec flag */
- if (ret >= 0)
- (void) fcntl(nfd, F_SETFD, 0);
-#endif /* DUP2_BROKEN */
-
return ret;
}
