Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/setsid.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/setsid.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/miscutils/setsid.c

@@ -15 +15 @@
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include "libbb.h"
 
-int setsid_main(int argc, char *argv[])
+int setsid_main(int argc, char **argv);
+int setsid_main(int argc, char **argv)
 {
     if (argc < 2)
         bb_show_usage();
 
-    if (getpgrp() == getpid()) {
-        switch(fork()){
-        case -1:
-            bb_perror_msg_and_die("fork");
-        case 0:
-            break;
-        default:    /* parent */
-            exit(0);
-        }
-        /* child falls through */
-    }
+    /* Comment why is this necessary? */
+    if (getpgrp() == getpid())
+        forkexit_or_rexec(argv);
 
     setsid();  /* no error possible */
 
-    execvp(argv[1], argv + 1);
-
+    BB_EXECVP(argv[1], argv + 1);
     bb_perror_msg_and_die("%s", argv[1]);
 }