*
*/
-#include "internal.h"
+#include "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_memory_exhausted
#include "messages.c"
*/
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#define memzero(s, n) memset ((void *)(s), 0, (n))
#ifndef RETSIGTYPE
# define DECLARE(type, array, size) type * array
# define ALLOC(type, array, size) { \
array = (type*)calloc((size_t)(((size)+1L)/2), 2*sizeof(type)); \
- if (array == NULL) errorMsg(memory_exhausted); \
+ if (array == NULL) error_msg(memory_exhausted); \
}
# define FREE(array) {if (array != NULL) free(array), array=NULL;}
#else
/* Diagnostic functions */
#ifdef DEBUG
-# define Assert(cond,msg) {if(!(cond)) errorMsg(msg);}
+# define Assert(cond,msg) {if(!(cond)) error_msg(msg);}
# define Trace(x) fprintf x
# define Tracev(x) {if (verbose) fprintf x ;}
# define Tracevv(x) {if (verbose>1) fprintf x ;}
(char *) window + start, length) != EQUAL) {
fprintf(stderr,
" start %d, match %d, length %d\n", start, match, length);
- errorMsg("invalid match");
+ error_msg("invalid match");
}
if (verbose > 1) {
fprintf(stderr, "\\[%d,%d]", start - match, length);
#include <ctype.h>
#include <sys/types.h>
#include <signal.h>
-#include <sys/stat.h>
#include <errno.h>
/* configuration */
/* local variables */
-int ascii = 0; /* convert end-of-lines to local OS conventions */
-int decompress = 0; /* decompress (-d) */
-int no_name = -1; /* don't save or restore the original file name */
-int no_time = -1; /* don't save or restore the original file time */
-int foreground; /* set if program run in foreground */
-char *progname; /* program name */
+static int foreground; /* set if program run in foreground */
static int method = DEFLATED; /* compression method */
static int exit_code = OK; /* program exit code */
-int save_orig_name; /* set if original name must be saved */
-int last_member; /* set for .zip and .Z files */
-int part_nb; /* number of parts in .gz file */
-long time_stamp; /* original time stamp (modification time) */
-long ifile_size; /* input file size, -1 for devices (debug only) */
-char *env; /* contents of GZIP env variable */
-char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
-int z_len; /* strlen(z_suffix) */
-
-long bytes_in; /* number of input bytes */
-long bytes_out; /* number of output bytes */
-char ifname[MAX_PATH_LEN]; /* input file name */
-char ofname[MAX_PATH_LEN]; /* output file name */
-int remove_ofname = 0; /* remove output file on error */
-struct stat istat; /* status for input file */
-int ifd; /* input file descriptor */
-int ofd; /* output file descriptor */
-unsigned insize; /* valid bytes in inbuf */
-unsigned inptr; /* index of next byte to be processed in inbuf */
-unsigned outcnt; /* bytes in output buffer */
+static int part_nb; /* number of parts in .gz file */
+static long time_stamp; /* original time stamp (modification time) */
+static long ifile_size; /* input file size, -1 for devices (debug only) */
+static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
+static int z_len; /* strlen(z_suffix) */
+
+static long bytes_in; /* number of input bytes */
+static long bytes_out; /* number of output bytes */
+static char ifname[MAX_PATH_LEN]; /* input file name */
+static char ofname[MAX_PATH_LEN]; /* output file name */
+static int ifd; /* input file descriptor */
+static int ofd; /* output file descriptor */
+static unsigned insize; /* valid bytes in inbuf */
+static unsigned outcnt; /* bytes in output buffer */
/* local functions */
char *delFileName;
int tostdout = 0;
int fromstdin = 0;
-
- if (argc == 1)
- usage(gzip_usage);
+ int force = 0;
/* Parse any options */
while (--argc > 0 && **(++argv) == '-') {
if (*((*argv) + 1) == '\0') {
- fromstdin = 1;
tostdout = 1;
}
while (*(++(*argv))) {
case 'c':
tostdout = 1;
break;
+ case 'f':
+ force = 1;
+ break;
+ /* Ignore 1-9 (compression level) options */
+ case '1': case '2': case '3': case '4': case '5':
+ case '6': case '7': case '8': case '9':
+ break;
+ case 'd':
+ exit(gunzip_main(argc, argv));
default:
- usage(gzip_usage);
+ show_usage();
}
}
}
+ if (argc <= 0 ) {
+ fromstdin = 1;
+ tostdout = 1;
+ }
+
+ if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
+ 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.");
foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
if (foreground) {
ifile_size = -1L; /* convention for unknown size */
} else {
/* Open up the input file */
- if (*argv == '\0')
- usage(gzip_usage);
+ if (argc <= 0)
+ show_usage();
strncpy(ifname, *argv, MAX_PATH_LEN);
- /* Open input fille */
+ /* Open input file */
inFileNum = open(ifname, O_RDONLY);
- if (inFileNum < 0) {
- perror(ifname);
- exit(WARNING);
- }
+ if (inFileNum < 0)
+ perror_msg_and_die("%s", ifname);
/* Get the time stamp on the input file. */
- result = stat(ifname, &statBuf);
- if (result < 0) {
- perror(ifname);
- exit(WARNING);
- }
+ if (stat(ifname, &statBuf) < 0)
+ perror_msg_and_die("%s", ifname);
time_stamp = statBuf.st_ctime;
ifile_size = statBuf.st_size;
}
#else
outFileNum = open(ofname, O_RDWR | O_CREAT | O_EXCL);
#endif
- if (outFileNum < 0) {
- perror(ofname);
- exit(WARNING);
- }
+ if (outFileNum < 0)
+ perror_msg_and_die("%s", ofname);
SET_BINARY_MODE(outFileNum);
/* Set permissions on the file */
fchmod(outFileNum, statBuf.st_mode);
else
delFileName = ofname;
- if (unlink(delFileName) < 0) {
- perror(delFileName);
- exit(FALSE);
- }
+ if (unlink(delFileName) < 0)
+ perror_msg_and_die("%s", delFileName);
}
return(exit_code);
#endif
/* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */
if (buf == (char *) 0)
- errorMsg("block vanished");
+ error_msg("block vanished");
copy_block(buf, (unsigned) stored_len, 0); /* without header */
compressed_len = stored_len << 3;
bin_freq += dyn_ltree[n++].Freq;
*file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII;
if (*file_type == BINARY && translate_eol) {
- errorMsg("-l used on binary file");
+ error_msg("-l used on binary file");
}
}
nargv = (char **) calloc(*argcp + 1, sizeof(char *));
if (nargv == NULL)
- errorMsg(memory_exhausted);
+ error_msg(memory_exhausted);
oargv = *argvp;
*argvp = nargv;
/* Copy the program name first */
if (oargc-- < 0)
- errorMsg("argc<=0");
+ error_msg("argc<=0");
*(nargv++) = *(oargv++);
/* Then copy the environment args */
isize += (ulg) len;
return (int) len;
}
+
+/* ===========================================================================
+ * Write the output buffer outbuf[0..outcnt-1] and update bytes_out.
+ * (used for the compressed data only)
+ */
+void flush_outbuf()
+{
+ if (outcnt == 0)
+ return;
+
+ write_buf(ofd, (char *) outbuf, outcnt);
+ bytes_out += (ulg) outcnt;
+ outcnt = 0;
+}
projects / oweals / busybox.git / blobdiff