Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Minor in-passing crapectomy.

Browse Source
This commit is contained in:
Rob Landley 2004-12-17 05:23:36 +00:00
parent 861f0145d3
commit ec4f3d95e7
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
archival/gzip.c
View File

@ -51,12 +51,6 @@
#include <time.h> #include <time.h>
#include "busybox.h" #include "busybox.h"
#define memzero(s, n) memset ((void *)(s), 0, (n))
#ifndef RETSIGTYPE
# define RETSIGTYPE void
#endif
typedef unsigned char uch; typedef unsigned char uch;
typedef unsigned short ush; typedef unsigned short ush;
typedef unsigned long ulg; typedef unsigned long ulg;
@ -214,9 +208,6 @@ typedef int file_t; /* Do not use stdio */
static int zip(int in, int out); static int zip(int in, int out);
static int file_read(char *buf, unsigned size); static int file_read(char *buf, unsigned size);
/* from gzip.c */
static RETSIGTYPE abort_gzip(void);
/* from deflate.c */ /* from deflate.c */
static void lm_init(ush * flags); static void lm_init(ush * flags);
static ulg deflate(void); static ulg deflate(void);
@ -335,7 +326,7 @@ static void put_short(ush w)
/* ======================================================================== /* ========================================================================
* Signal and error handler. * Signal and error handler.
*/ */
static void abort_gzip() static void abort_gzip(int ignored)
{ {
exit(ERROR); exit(ERROR);
} }
@ -350,13 +341,6 @@ static void clear_bufs(void)
bytes_in = 0L; bytes_in = 0L;
} }
static void write_bb_error_msg(void)
{
fputc('\n', stderr);
bb_perror_nomsg();
abort_gzip();
}
/* =========================================================================== /* ===========================================================================
* Does the same as write(), but also handles partial pipe writes and checks * Does the same as write(), but also handles partial pipe writes and checks
* for error return. * for error return.
@ -366,9 +350,7 @@ static void write_buf(int fd, void *buf, unsigned cnt)
unsigned n; unsigned n;
while ((n = write(fd, buf, cnt)) != cnt) { while ((n = write(fd, buf, cnt)) != cnt) {
if (n == (unsigned) (-1)) { if (n == (unsigned) (-1)) bb_error_msg_and_die("can't write");
write_bb_error_msg();
}
cnt -= n; cnt -= n;
buf = (void *) ((char *) buf + n); buf = (void *) ((char *) buf + n);
} }
@ -846,7 +828,7 @@ static void lm_init(ush * flags)
register unsigned j; register unsigned j;
/* Initialize the hash table. */ /* Initialize the hash table. */
memzero((char *) head, HASH_SIZE * sizeof(*head)); memset(head, 0, HASH_SIZE * sizeof(*head));
/* prev will be initialized on the fly */ /* prev will be initialized on the fly */
*flags |= SLOW; *flags |= SLOW;
@ -1188,8 +1170,6 @@ static ulg deflate()
typedef struct dirent dir_type; typedef struct dirent dir_type;
typedef RETSIGTYPE(*sig_type) (int);
/* ======================================================================== */ /* ======================================================================== */
int gzip_main(int argc, char **argv) int gzip_main(int argc, char **argv)
{ {
@ -1235,16 +1215,16 @@ int gzip_main(int argc, char **argv)
foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; foreground = signal(SIGINT, SIG_IGN) != SIG_IGN;
if (foreground) { if (foreground) {
(void) signal(SIGINT, (sig_type) abort_gzip); (void) signal(SIGINT, abort_gzip);
} }
#ifdef SIGTERM #ifdef SIGTERM
if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
(void) signal(SIGTERM, (sig_type) abort_gzip); (void) signal(SIGTERM, abort_gzip);
} }
#endif #endif
#ifdef SIGHUP #ifdef SIGHUP
if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
(void) signal(SIGHUP, (sig_type) abort_gzip); (void) signal(SIGHUP, abort_gzip);
} }
#endif #endif