macro and text revision (-mdoc version 3)

[unix-history] / usr / src / lib / libc / stdlib / system.c

diff --git a/usr/src/lib/libc/stdlib/system.c b/usr/src/lib/libc/stdlib/system.c
index 1ad0370..1062556 100644 (file)
--- a/usr/src/lib/libc/stdlib/system.c
+++ b/usr/src/lib/libc/stdlib/system.c
@@ -2,46 +2,49 @@
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)system.c   5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)system.c   5.10 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-#include <sys/wait.h>
+#include <sys/types.h>

 #include <sys/signal.h>
 #include <sys/signal.h>

-#include <stdio.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <paths.h>

 
 system(command)
 
 system(command)

-       char *command;
+       const char *command;

 {
 {

-       int pid, wval, (*i)(), (*q)();
-       union wait stat_loc;
+       union wait pstat;
+       pid_t pid;
+       int omask;
+       sig_t intsave, quitsave;
+
+       if (!command)           /* just checking... */
+               return(1);

 
 

+       omask = sigblock(sigmask(SIGCHLD));

        switch(pid = vfork()) {
        case -1:                        /* error */
        switch(pid = vfork()) {
        case -1:                        /* error */

-               stat_loc.w_status = 0;
-               stat_loc.w_retcode = 127;
-               return(stat_loc.w_status);
+               (void)sigsetmask(omask);
+               pstat.w_status = 0;
+               pstat.w_retcode = 127;
+               return(pstat.w_status);

        case 0:                         /* child */
        case 0:                         /* child */

-               execl("/bin/sh", "sh", "-c", command, (char *)NULL);
+               (void)sigsetmask(omask);
+               execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL);

                _exit(127);
        }
                _exit(127);
        }

-       i = signal(SIGINT, SIG_IGN);
-       q = signal(SIGQUIT, SIG_IGN);
-       while ((wval = wait(&stat_loc)) != pid && wval != -1);
-       (void)signal(SIGINT, i);
-       (void)signal(SIGQUIT, q);
-       return(wval == -1 ? -1 : stat_loc.w_status);
+       intsave = signal(SIGINT, SIG_IGN);
+       quitsave = signal(SIGQUIT, SIG_IGN);
+       pid = waitpid(pid, (int *)&pstat, 0);
+       (void)sigsetmask(omask);
+       (void)signal(SIGINT, intsave);
+       (void)signal(SIGQUIT, quitsave);
+       return(pid == -1 ? -1 : pstat.w_status);

 }
 }