Check the unzip child process for errors and pass the upwards. Also, avoid child...

[project/opkg-lede.git] / libbb / gz_open.c

diff --git a/libbb/gz_open.c b/libbb/gz_open.c
index 3107af983531d9881dff026e63b05854120a3a6a..3d07b58ab8d87bd33608bf33b68b11b087868fba 100644 (file)
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
@@ -29,7 +29,8 @@
 #include <unistd.h>
 #include "libbb.h"
 
-extern FILE *gz_open(FILE *compressed_file, int *pid)
+FILE *
+gz_open(FILE *compressed_file, int *pid)
 {
        int unzip_pipe[2];
 
@@ -48,19 +49,41 @@ extern FILE *gz_open(FILE *compressed_file, int *pid)
                fflush(NULL);
                fclose(compressed_file);
                close(unzip_pipe[1]);
-               exit(EXIT_SUCCESS);
+               _exit(EXIT_SUCCESS);
        }
        close(unzip_pipe[1]);
        return(fdopen(unzip_pipe[0], "r"));
 }
 
-extern void gz_close(int gunzip_pid)
+int
+gz_close(int gunzip_pid)
 {
-       if (kill(gunzip_pid, SIGTERM) == -1) {
-               perror_msg_and_die("%s: kill(gunzip_pid)", __FUNCTION__);
+       int status;
+       int ret;
+
+       if (waitpid(gunzip_pid, &status, 0) == -1) {
+               perror_msg("%s: waitpid", __FUNCTION__);
+               return -1;
+       }
+       
+       if (WIFSIGNALED(status)) {
+               error_msg("%s: unzip process killed by signal %d\n",
+                       __FUNCTION__, WTERMSIG(status));
+               return -1;
        }
 
-       if (waitpid(gunzip_pid, NULL, 0) == -1) {
-               perror_msg("%s wait", __FUNCTION__);
+       if (!WIFEXITED(status)) {
+               /* shouldn't happen */
+               error_msg("%s: Your system is broken: got status %d from waitpid\n",
+                               __FUNCTION__, status);
+               return -1;
        }
+
+       if ((ret = WEXITSTATUS(status))) {
+               error_msg("%s: unzip process failed with return code %d.\n",
+                               __FUNCTION__, ret);
+               return -1;
+       }
+
+       return 0;
 }