Cleanup gz_close().

 - Don't try to free() memory in a different process!
 - Move the function to a more appropriate file.
 - Fix error messages while here.

git-svn-id: http://opkg.googlecode.com/svn/trunk@305 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libbb/gz_open.c b/libbb/gz_open.c
index dbaf3bb023bceebd90694a4b7282fea0241a9692..0ed14173a5c389bea2d658997e9aa7d82beab38f 100644 (file)
--- a/libbb/gz_open.c
+++ b/libbb/gz_open.c
@@ -34,11 +34,11 @@ extern 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) {
@@ -51,8 +51,16 @@ extern FILE *gz_open(FILE *compressed_file, int *pid)
                exit(EXIT_SUCCESS);
        }
        close(unzip_pipe[1]);
-       if (unzip_pipe[0] == -1) {
-               error_msg("gzip stream init failed");
-       }
        return(fdopen(unzip_pipe[0], "r"));
 }
+
+extern void gz_close(int gunzip_pid)
+{
+       if (kill(gunzip_pid, SIGTERM) == -1) {
+               perror_msg_and_die("%s: kill(gunzip_pid): ", __FUNCTION__);
+       }
+
+       if (waitpid(gunzip_pid, NULL, 0) == -1) {
+               perror_msg("%s wait: ", __FUNCTION__);
+       }
+}

diff --git a/libbb/unzip.c b/libbb/unzip.c
index 08c17d4a2927877a7ad10f85b2791eafd8eda4e7..20a4d74ed7936d6333a8b496ec7cda4aa92a0218 100644 (file)
--- a/libbb/unzip.c
+++ b/libbb/unzip.c
@@ -1005,19 +1005,3 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
 
        return exit_code;
 }
-
-/*
- * This needs access to global variables wondow and crc_table, so its not in its own file.
- */
-extern void gz_close(int gunzip_pid)
-{
-       if (kill(gunzip_pid, SIGTERM) == -1) {
-               error_msg_and_die("***  Couldnt kill old gunzip process *** aborting");
-       }
-
-       if (waitpid(gunzip_pid, NULL, 0) == -1) {
-               printf("Couldnt wait ?");
-       }
-               free(window);
-               free(crc_table);
-}