[src/trunk]: src/bin/ksh Drop Ultrix support from ksh(1), a DEC UNIX for VAX

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c061d34836e6
branches:  trunk
changeset: 354604:c061d34836e6
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu Jun 22 19:41:07 2017 +0000

description:
Drop Ultrix support from ksh(1), a DEC UNIX for VAX

diffstat:

 bin/ksh/c_ksh.c  |   6 +++---
 bin/ksh/config.h |   5 +----
 bin/ksh/io.c     |  10 ++--------
 3 files changed, 6 insertions(+), 15 deletions(-)

diffs (77 lines):

diff -r 8b482e523bf3 -r c061d34836e6 bin/ksh/c_ksh.c
--- a/bin/ksh/c_ksh.c   Thu Jun 22 18:39:04 2017 +0000
+++ b/bin/ksh/c_ksh.c   Thu Jun 22 19:41:07 2017 +0000
@@ -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 @@
 
                                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;
diff -r 8b482e523bf3 -r c061d34836e6 bin/ksh/config.h
--- a/bin/ksh/config.h  Thu Jun 22 18:39:04 2017 +0000
+++ b/bin/ksh/config.h  Thu Jun 22 19:41:07 2017 +0000
@@ -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 
 
diff -r 8b482e523bf3 -r c061d34836e6 bin/ksh/io.c
--- a/bin/ksh/io.c      Thu Jun 22 18:39:04 2017 +0000
+++ b/bin/ksh/io.c      Thu Jun 22 19:41:07 2017 +0000
@@ -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 @@
        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;
 }