From 8dd271fdec526241ad3ed9c7f2641127a939893c Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Sat, 14 Sep 2024 19:21:58 +0200
Subject: 53081: remove old BeOS support code

---
 Src/init.c       |  8 ++------
 Src/options.c    |  9 ---------
 Src/signals.c    |  7 -------
 Src/zsh_system.h | 12 ------------
 4 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'Src')

diff --git a/Src/init.c b/Src/init.c
index 8c7776c7a..70e878e20 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -695,7 +695,6 @@ init_io(char *cmd)
     } else
 	opts[USEZLE] = 0;
 
-#ifdef JOB_CONTROL
     /* If interactive, make sure the shell is in the foreground and is the
      * process group leader.
      */
@@ -708,9 +707,6 @@ init_io(char *cmd)
 	    acquire_pgrp(); /* might also clear opts[MONITOR] */
 	}
     }
-#else
-    opts[MONITOR] = 0;
-#endif
 }
 
 /**/
@@ -718,7 +714,7 @@ mod_export void
 init_shout(void)
 {
     static char shoutbuf[BUFSIZ];
-#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
+#if defined(TIOCSETD) && defined(NTTYDISC)
     int ldisc;
 #endif
 
@@ -729,7 +725,7 @@ init_shout(void)
 	return;
     }
 
-#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
+#if defined(TIOCSETD) && defined(NTTYDISC)
     ldisc = NTTYDISC;
     ioctl(SHTTY, TIOCSETD, (char *)&ldisc);
 #endif
diff --git a/Src/options.c b/Src/options.c
index a0e1aa024..8b37ab5e8 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -877,7 +877,6 @@ dosetopt(int optno, int value, int force, char *new_opts)
 	}
 #endif /* HAVE_SETRESGID && HAVE_SETRESUID */
 
-#ifdef JOB_CONTROL
     } else if (!force && optno == MONITOR && value) {
 	if (new_opts[optno] == value)
 	    return 0;
@@ -887,14 +886,6 @@ dosetopt(int optno, int value, int force, char *new_opts)
 	    origpgrp = GETPGRP();
 	    acquire_pgrp();
 	}
-#else
-    } else if(optno == MONITOR && value) {
-	    return -1;
-#endif /* not JOB_CONTROL */
-#ifdef GETPWNAM_FAKED
-    } else if(optno == CDABLEVARS && value) {
-	    return -1;
-#endif /* GETPWNAM_FAKED */
     } else if ((optno == EMACSMODE || optno == VIMODE) && value) {
 	if (sticky && sticky->emulation)
 	    return -1;
diff --git a/Src/signals.c b/Src/signals.c
index 6eecbf7d5..86f1a49f6 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -216,7 +216,6 @@ signal_suspend(UNUSED(int sig), int wait_cmd)
     int ret;
 
     sigset_t set;
-    sigset_t oset;
 
     sigemptyset(&set);
 
@@ -229,13 +228,7 @@ signal_suspend(UNUSED(int sig), int wait_cmd)
 	  (sigtrapped[SIGINT] & ~ZSIG_IGNORED)))
 	sigaddset(&set, SIGINT);
 
-# ifdef BROKEN_POSIX_SIGSUSPEND
-    sigprocmask(SIG_SETMASK, &set, &oset);
-    ret = pause();
-    sigprocmask(SIG_SETMASK, &oset, NULL);
-# else /* not BROKEN_POSIX_SIGSUSPEND */
     ret = sigsuspend(&set);
-# endif /* BROKEN_POSIX_SIGSUSPEND */
 
     return ret;
 }
diff --git a/Src/zsh_system.h b/Src/zsh_system.h
index 5c004d53e..21446a9b1 100644
--- a/Src/zsh_system.h
+++ b/Src/zsh_system.h
@@ -369,8 +369,6 @@ struct timespec {
 # ifndef TIME_H_SELECT_H_CONFLICTS
 #  include <sys/select.h>
 # endif
-#elif defined(SELECT_IN_SYS_SOCKET_H)
-# include <sys/socket.h>
 #endif
 
 #if defined(__APPLE__) && defined(HAVE_SELECT)
@@ -803,16 +801,6 @@ extern short ospeed;
 #endif
 #endif
 
-/* Can't support job control without working tcsetgrp() */
-#ifdef BROKEN_TCSETPGRP
-#undef JOB_CONTROL
-#endif /* BROKEN_TCSETPGRP */
-
-#ifdef BROKEN_KILL_ESRCH
-#undef ESRCH
-#define ESRCH EINVAL
-#endif /* BROKEN_KILL_ESRCH */
-
 /* Can we do locale stuff? */
 #undef USE_LOCALE
 #if defined(CONFIG_LOCALE) && defined(HAVE_SETLOCALE) && defined(LC_ALL)
-- 
cgit 1.4.1