WARNSify

[bsdgames-darwin.git] / monop / misc.c

diff --git a/monop/misc.c b/monop/misc.c
index f031cad07cf81057e801d0665ba057c68178cb4f..00d301e28cc2a94d175e52d5d09c9f71f99b7171 100644 (file)
--- a/monop/misc.c
+++ b/monop/misc.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: misc.c,v 1.5 1997/03/29 20:42:24 thorpej Exp $ */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,35 +34,17 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c     5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:53:37 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.5 1997/03/29 20:42:24 thorpej Exp $";
+#endif
 #endif /* not lint */
 
 # include      "monop.ext"
 # include      <ctype.h>
 # include      <signal.h>
 
-# define       execsh(sh)      execl(sh, shell_name[roll(1, num_names)-1], 0)
-
-static char    *shell_def      = "/bin/csh",
-               *shell_name[]   = {
-                       ".Hi Mom!",
-                       ".Kick Me",
-                       ".I'm really the next process down",
-                       ".Hi Kids!",
-                       ".This space for rent",
-                       ".Singin' in the rain....",
-                       ".I am but a Cog in the Wheel of Life",
-                       ".Look out!!! Behind you!!!!!",
-                       ".Looking for a good time, sailor?",
-                       ".I don't get NO respect...",
-                       ".Augghh!  You peeked!"
-               };
-
-static int     num_names       = sizeof shell_name / sizeof (char *);;
-
-char   *shell_in();
-
 /*
  *     This routine executes a truncated set of commands until a
  * "yes or "no" answer is gotten.
@@ -108,15 +92,17 @@ reg char   *prompt; {
 
        reg int         num;
        reg char        *sp;
+       int             c;
        char            buf[257];
 
        for (;;) {
 inter:
                printf(prompt);
                num = 0;
-               for (sp = buf; (*sp=getchar()) != '\n'; sp++)
-                       if (*sp == -1)  /* check for interrupted system call */
+               for (sp = buf; (c=getchar()) != '\n'; *sp++ = c)
+                       if (c == -1)    /* check for interrupted system call */
                                goto inter;
+               *sp = c;
                if (sp == buf)
                        continue;
                for (sp = buf; isspace(*sp); sp++)
@@ -292,69 +278,3 @@ reg int    *s1, *s2, size; {
        while (size--)
                *s1++ = *s2++;
 }
-/*
- *     This routine forks off a shell.  It uses the users login shell
- */
-shell_out() {
-
-       static char     *shell = NULL;
-
-       printline();
-       if (shell == NULL)
-               shell = shell_in();
-       fflush(stdout);
-       if (!fork()) {
-               signal(SIGINT, SIG_DFL);
-               execsh(shell);
-       }
-       ignoresigs();
-       wait();
-       resetsigs();
-       putchar('\n');
-       printline();
-}
-/*
- *     This routine looks up the users login shell
- */
-# include      <sys/types.h>
-# include      <pwd.h>
-
-char           *getenv();
-
-char *
-shell_in() {
-
-       reg struct passwd       *pp;
-       reg char                *sp;
-
-       if ((sp = getenv("SHELL")) == NULL) {
-               pp = getpwuid(getuid());
-               if (pp->pw_shell[0] != '\0')
-                       return pp->pw_shell;
-               else
-                       return shell_def;
-               /*return (*(pp->pw_shell) != '\0' ? pp->pw_shell : shell_def);*/
-       }
-       return sp;
-}
-/*
- *     This routine sets things up to ignore all the signals.
- */
-ignoresigs() {
-
-       reg int i;
-
-       for (i = 0; i < NSIG; i++)
-               signal(i, SIG_IGN);
-}
-/*
- *     This routine sets up things as they were before.
- */
-resetsigs() {
-
-       reg int i;
-
-       for (i = 0; i < NSIG; i++)
-               signal(i, SIG_DFL);
-       signal(SIGINT, quit);
-}