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 ba4d6a5099b12e917331a52475fcd5be0495b057..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,86 +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"));
 }
 
-/* gz_open implementation using gunzip and a vfork/exec -- dodges OOM killer */
-extern FILE *gzvopen(FILE *compressed_file, int *pid)
+int
+gz_close(int gunzip_pid)
 {
-       int unzip_pipe[2];
-       off_t floc;
-       int cfile;
-
-       /* create a new file descriptor for the input stream
-        * (it *must* be associated with a file)
-        * and seek to the same position in that fd as the stream.
-        */
-       cfile = dup(fileno(compressed_file));
-       floc = ftello(compressed_file);
-       lseek(cfile, floc, SEEK_SET);
+       int status;
+       int ret;
 
-       /* create the pipe */
-       if (pipe(unzip_pipe)!=0) {
-               error_msg("gzvopen(): pipe error");
-               return(NULL);
+       if (waitpid(gunzip_pid, &status, 0) == -1) {
+               perror_msg("%s: waitpid", __FUNCTION__);
+               return -1;
        }
-
-       *pid = vfork();
-
-       if (*pid < 0) {
-               error_msg("gzvopen(): fork failed");
-               return(NULL);
+       
+       if (WIFSIGNALED(status)) {
+               error_msg("%s: unzip process killed by signal %d\n",
+                       __FUNCTION__, WTERMSIG(status));
+               return -1;
        }
 
-       if (*pid==0) {
-               /* child process - reads STDIN, writes to pipe */
-
-               /* close unused read end of pipe */
-               close(unzip_pipe[0]);
-
-               /* connect child's stdout to the pipe write end */
-               dup2(unzip_pipe[1], 1);
-
-               /* connect child's stdin to the fd passed in to us */
-               dup2(cfile, 0);
-
-               /* execute the gunzip utility */
-               execlp("gunzip","gunzip",NULL);
-
-               /* if we get here, we had a failure - since we are
-                * using vfork(), we cannot call exit(), must call _exit().
-                */
-               _exit(-1);
+       if (!WIFEXITED(status)) {
+               /* shouldn't happen */
+               error_msg("%s: Your system is broken: got status %d from waitpid\n",
+                               __FUNCTION__, status);
+               return -1;
        }
 
-       /* Parent process is executing here */
-
-       /* we have no more need of the duplicate fd */
-       close(cfile);
-
-       /* close the write end of the pipe */
-       close(unzip_pipe[1]);
-
-       /* return the read end of the pipe as a FILE */
-       return(fdopen(unzip_pipe[0], "r"));
-}
-
-extern void gzvclose(int gunzip_pid)
-{
-        if (kill(gunzip_pid, SIGTERM) == -1) {
-               perror("gzvclose()");
-                fprintf(stderr,"%s: unable to kill gunzip pid.\n",
-                       __FUNCTION__);
-        }
+       if ((ret = WEXITSTATUS(status))) {
+               error_msg("%s: unzip process failed with return code %d.\n",
+                               __FUNCTION__, ret);
+               return -1;
+       }
 
-        if (waitpid(gunzip_pid, NULL, 0) == -1) {
-                fprintf(stderr,"%s: unable to wait on gunzip pid.\n",
-                       __FUNCTION__);
-        }
+       return 0;
 }