Update the lash shell (hopefully the last time...) so things like

[oweals/busybox.git] / gunzip.c

diff --git a/gunzip.c b/gunzip.c
index 09571f91c19694d9a792432f61522c8eb1701a12..8100003ec29c03de440d96f5d984f0445d959dcd 100644 (file)
--- a/gunzip.c
+++ b/gunzip.c
@@ -57,7 +57,6 @@ static char *license_msg[] = {
 };
 #endif
 
-#include "busybox.h"
 #include <getopt.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -71,6 +70,7 @@ static char *license_msg[] = {
 #include <stdlib.h>
 #include <time.h>
 #include <dirent.h>
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_memory_exhausted
 #define bb_need_name_too_long
@@ -297,7 +297,7 @@ int in;                                     /* input file descriptor */
 
                method = (int) get_byte();
                if (method != DEFLATED) {
-                       error_msg("unknown method %d -- get newer version of gzip\n", method);
+                       error_msg("unknown method %d -- get newer version of gzip", method);
                        exit_code = ERROR;
                        return -1;
                }
@@ -1116,11 +1116,11 @@ int in, out;                                    /* input and output file descriptors */
                if (res == 3) {
                        error_msg(memory_exhausted);
                } else if (res != 0) {
-                       error_msg("invalid compressed data--format violated\n");
+                       error_msg("invalid compressed data--format violated");
                }
 
        } else {
-               error_msg("internal error, invalid method\n");
+               error_msg("internal error, invalid method");
        }
 
        /* Get the crc and original length */
@@ -1149,15 +1149,15 @@ int in, out;                                    /* input and output file descriptors */
 
        /* Validate decompression */
        if (orig_crc != updcrc(outbuf, 0)) {
-               error_msg("invalid compressed data--crc error\n");
+               error_msg("invalid compressed data--crc error");
        }
        if (orig_len != (ulg) bytes_out) {
-               error_msg("invalid compressed data--length error\n");
+               error_msg("invalid compressed data--length error");
        }
 
        /* Check if there are more entries in a pkzip file */
        if (pkzip && inptr + 4 < insize && LG(inbuf + inptr) == LOCSIG) {
-               fprintf(stderr, "has more than one entry--rest ignored\n");
+               error_msg("has more than one entry--rest ignored");
                if (exit_code == OK)
                        exit_code = WARNING;
        }
@@ -1250,7 +1250,7 @@ int gunzip_main(int argc, char **argv)
                                force = 1;
                                break;
                        default:
-                               usage(gunzip_usage);
+                               show_usage();
                        }
                }
        }
@@ -1261,9 +1261,9 @@ int gunzip_main(int argc, char **argv)
        }
 
        if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
-               error_msg_and_die( "data not read from terminal. Use -f to force it.\n");
+               error_msg_and_die( "data not read from terminal. Use -f to force it.");
        if (isatty(fileno(stdout)) && tostdout==1 && force==0)
-               error_msg_and_die( "data not written to terminal. Use -f to force it.\n");
+               error_msg_and_die( "data not written to terminal. Use -f to force it.");
 
        gunzip_init();
 
@@ -1275,7 +1275,7 @@ int gunzip_main(int argc, char **argv)
        } else {
                /* Open up the input file */
                if (argc <= 0)
-                       usage(gunzip_usage);
+                       show_usage();
                if (strlen(*argv) > MAX_PATH_LEN) {
                        error_msg(name_too_long);
                        exit(WARNING);