Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/setsid.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/setsid.c (modified) (2 diffs)

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

@@ -5 +5 @@
  * In the public domain.
  *
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+ * 1999-02-22 Arkadiusz Mickiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
  *
@@ -17 +17 @@
 #include "libbb.h"
 
-int setsid_main(int argc, char **argv);
-int setsid_main(int argc, char **argv)
+int setsid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setsid_main(int argc UNUSED_PARAM, char **argv)
 {
-    if (argc < 2)
+    if (!argv[1])
         bb_show_usage();
 
-    /* Comment why is this necessary? */
-    if (getpgrp() == getpid())
-        forkexit_or_rexec(argv);
+    /* setsid() is allowed only when we are not a process group leader.
+     * Otherwise our PID serves as PGID of some existing process group
+     * and cannot be used as PGID of a new process group. */
+    if (setsid() < 0) {
+        pid_t pid = fork_or_rexec(argv);
+        if (pid != 0) {
+            /* parent */
+            /* TODO:
+             * we can waitpid(pid, &status, 0) and then even
+             * emulate exitcode, making the behavior consistent
+             * in both forked and non forked cases.
+             * However, the code is larger and upstream
+             * does not do such trick.
+             */
+            exit(EXIT_SUCCESS);
+        }
 
-    setsid();  /* no error possible */
+        /* child */
+        /* now there should be no error: */
+        setsid();
+    }
 
-    BB_EXECVP(argv[1], argv + 1);
-    bb_perror_msg_and_die("%s", argv[1]);
+    argv++;
+    BB_EXECVP_or_die(argv);
 }