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 dbaf3bb023bceebd90694a4b7282fea0241a9692..3d07b58ab8d87bd33608bf33b68b11b087868fba 100644 (file)
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
@@ -29,16 +29,17 @@
 #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];
 
        if (pipe(unzip_pipe)!=0) {
-               error_msg("pipe error");
+               perror_msg("%s: pipe", __FUNCTION__);
                return(NULL);
        }
        if ((*pid = fork()) == -1) {
-               error_msg("fork failed");
+               perror_msg("%s: fork", __FUNCTION__);
                return(NULL);
        }
        if (*pid==0) {
@@ -48,11 +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]);
-       if (unzip_pipe[0] == -1) {
-               error_msg("gzip stream init failed");
-       }
        return(fdopen(unzip_pipe[0], "r"));
 }
+
+int
+gz_close(int gunzip_pid)
+{
+       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 (!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;
+}