Module Name: src
Committed By: kamil
Date: Fri Jun 23 00:09:36 UTC 2017
Modified Files:
src/bin/ksh: sh.h tty.c
Log Message:
ksh: Remove support for NeXT Operating System
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/bin/ksh/sh.h
cvs rdiff -u -r1.5 -r1.6 src/bin/ksh/tty.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/sh.h
diff -u src/bin/ksh/sh.h:1.26 src/bin/ksh/sh.h:1.27
--- src/bin/ksh/sh.h:1.26 Thu Jun 22 23:50:24 2017
+++ src/bin/ksh/sh.h Fri Jun 23 00:09:36 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: sh.h,v 1.26 2017/06/22 23:50:24 kamil Exp $ */
+/* $NetBSD: sh.h,v 1.27 2017/06/23 00:09:36 kamil Exp $ */
/*
* Public Domain Bourne/Korn shell
*/
-/* $Id: sh.h,v 1.26 2017/06/22 23:50:24 kamil Exp $ */
+/* $Id: sh.h,v 1.27 2017/06/23 00:09:36 kamil Exp $ */
#include "config.h" /* system and option configuration info */
@@ -553,11 +553,7 @@ EXTERN int x_cols I__(80); /* tty column
/* Determine the location of the system (common) profile */
#ifndef KSH_SYSTEM_PROFILE
-# ifdef __NeXT
-# define KSH_SYSTEM_PROFILE "/etc/profile.std"
-# else /* __NeXT */
-# define KSH_SYSTEM_PROFILE "/etc/profile"
-# endif /* __NeXT */
+# define KSH_SYSTEM_PROFILE "/etc/profile"
#endif /* KSH_SYSTEM_PROFILE */
/* Used by v_evaluate() and setstr() to control action when error occurs */
Index: src/bin/ksh/tty.c
diff -u src/bin/ksh/tty.c:1.5 src/bin/ksh/tty.c:1.6
--- src/bin/ksh/tty.c:1.5 Fri Jun 23 00:04:20 2017
+++ src/bin/ksh/tty.c Fri Jun 23 00:09:36 2017
@@ -1,9 +1,9 @@
-/* $NetBSD: tty.c,v 1.5 2017/06/23 00:04:20 kamil Exp $ */
+/* $NetBSD: tty.c,v 1.6 2017/06/23 00:09:36 kamil Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: tty.c,v 1.5 2017/06/23 00:04:20 kamil Exp $");
+__RCSID("$NetBSD: tty.c,v 1.6 2017/06/23 00:09:36 kamil Exp $");
#endif
@@ -112,22 +112,6 @@ tty_init(init_ttystate)
/* SCO can't job control on /dev/tty, so don't try... */
#if !defined(__SCO__)
if ((tfd = open(devtty, O_RDWR, 0)) < 0) {
-#ifdef __NeXT
- /* rlogin on NeXT boxes does not set up the controlling tty,
- * so force it to be done here...
- */
- {
- extern char *ttyname ARGS((int));
- char *s = ttyname(isatty(2) ? 2 : 0);
- int fd;
-
- if (s && (fd = open(s, O_RDWR, 0)) >= 0) {
- close(fd);
- tfd = open(devtty, O_RDWR, 0);
- }
- }
-#endif /* __NeXT */
-
if (tfd < 0) {
tty_devtty = 0;
warningf(FALSE,
