Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/flock.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/flock.c (modified) (3 diffs)

branches/3.3/mindi-busybox/util-linux/flock.c

@@ -58 +58 @@
      * we use "+" in order to support "flock -opt FILE PROG -with-opts",
      * we need to remove -c by hand.
-     * TODO: in upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
      */
     if (argv[0]
@@ -67 +66 @@
     ) {
         argv++;
+        if (argv[1])
+            bb_error_msg_and_die("-c takes only one argument");
+        opt |= OPT_c;
     }
 
@@ -91 +93 @@
     }
 
-    if (argv[0])
-        return spawn_and_wait(argv);
+    if (argv[0]) {
+        int rc;
+        if (opt & OPT_c) {
+            /* -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" */
+            argv -= 2;
+            argv[0] = (char*)get_shell_name();
+            argv[1] = (char*)"-c";
+            /* argv[2] = "PROG ARGS"; */
+            /* argv[3] = NULL; */
+        }
+        rc = spawn_and_wait(argv);
+        if (rc < 0)
+            bb_simple_perror_msg(argv[0]);
+        return rc;
+    }
 
     return EXIT_SUCCESS;