Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/data_extract_to_command.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/archival/libarchive/data_extract_to_command.c (modified) (2 diffs)

branches/3.3/mindi-busybox/archival/libarchive/data_extract_to_command.c

@@ -104 +104 @@
                 "-c",
                 archive_handle->tar__to_command,
-                NULL);
+                (char *)0);
             bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
         }
@@ -113 +113 @@
         close(p[1]);
 
-        if (safe_waitpid(pid, &status, 0) == -1)
-            bb_perror_msg_and_die("waitpid");
+        status = wait_for_exitstatus(pid);
         if (WIFEXITED(status) && WEXITSTATUS(status))
             bb_error_msg_and_die("'%s' returned status %d",
                 archive_handle->tar__to_command, WEXITSTATUS(status));
         if (WIFSIGNALED(status))
-            bb_error_msg_and_die("'%s' terminated on signal %d",
+            bb_error_msg_and_die("'%s' terminated by signal %d",
                 archive_handle->tar__to_command, WTERMSIG(status));