X-Git-Url: https://git.cworth.org/git?p=gzip;a=blobdiff_plain;f=gzip.c;h=08b5c5fbd6c8fa80d2be549c9becf36973403422;hp=bfab6e74b96f0e0f7a55a558a8c247b9cd14f914;hb=e7921f54c622e3b32e525f345bc34308821e4ae0;hpb=c9eb602f6f5c10a521e7274640033f6a35deca1d diff --git a/gzip.c b/gzip.c index bfab6e7..08b5c5f 100644 --- a/gzip.c +++ b/gzip.c @@ -1,6 +1,23 @@ /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface - * Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. - * Copyright (C) 1992-1993 Jean-loup Gailly + + Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc. + Copyright (C) 1992-1993 Jean-loup Gailly + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* * The unzip code was written and put in the public domain by Mark Adler. * Portions of the lzw code are derived from the public domain 'compress' * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, @@ -11,16 +28,15 @@ */ static char *license_msg[] = { -"Copyright 2002 Free Software Foundation", -"Copyright 1992-1993 Jean-loup Gailly", -"This program comes with ABSOLUTELY NO WARRANTY.", -"You may redistribute copies of this program", -"under the terms of the GNU General Public License.", -"For more information about these matters, see the file named COPYING.", +"Copyright (C) 2006 Free Software Foundation, Inc.", +"Copyright (C) 1993 Jean-loup Gailly.", +"This is free software. You may redistribute copies of it under the terms of", +"the GNU General Public License .", +"There is NO WARRANTY, to the extent permitted by law.", 0}; /* Compress files with zip algorithm and 'compress' interface. - * See usage() and help() functions below for all options. + * See help() function below for all options. * Outputs: * file.gz: compressed file with same mode, owner, and utimes * or stdout with -c option or if stdin used as input. @@ -32,13 +48,13 @@ static char *license_msg[] = { * example, foo.txt -> foo.tgz (.tgz must be reserved as shorthand for * tar.gz). Similarly, foo.dir and foo.doc would both be mapped to foo.dgz. * I also considered 12345678.txt -> 12345txt.gz but this truncates the name - * too heavily. There is no ideal solution given the MSDOS 8+3 limitation. + * too heavily. There is no ideal solution given the MSDOS 8+3 limitation. * * For the meaning of all compilation flags, see comments in Makefile.in. */ #ifdef RCSID -static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; +static char rcsid[] = "$Id: gzip.c,v 1.11 2006/12/12 00:03:17 eggert Exp $"; #endif #include @@ -52,7 +68,11 @@ static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; #include "gzip.h" #include "lzw.h" #include "revision.h" + +#include "fcntl-safer.h" #include "getopt.h" +#include "stat-time.h" +#include "timespec.h" /* configuration */ @@ -80,32 +100,15 @@ static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; extern int errno; #endif -#ifdef HAVE_DIRENT_H -# include -# define NAMLEN(direct) strlen((direct)->d_name) -# define DIR_OPT "DIRENT" -#else -# define dirent direct -# define NAMLEN(direct) ((direct)->d_namlen) -# ifdef HAVE_SYS_NDIR_H -# include -# define DIR_OPT "SYS_NDIR" -# endif -# ifdef HAVE_SYS_DIR_H -# include -# define DIR_OPT "SYS_DIR" -# endif -# ifdef HAVE_NDIR_H -# include -# define DIR_OPT "NDIR" -# endif -# ifndef DIR_OPT -# define DIR_OPT "NO_DIR" -# endif -#endif #ifndef NO_DIR # define NO_DIR 0 #endif +#if !NO_DIR +# include +# ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) +# endif +#endif #ifdef CLOSEDIR_VOID # define CLOSEDIR(d) (closedir(d), 0) @@ -113,60 +116,10 @@ static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $"; # define CLOSEDIR(d) closedir(d) #endif -#if !defined(HAVE_LSTAT) && !defined(lstat) -# define lstat(name, buf) stat(name, buf) -#endif - -#ifdef HAVE_UTIME -# ifdef HAVE_UTIME_H -# include -# define TIME_OPT "UTIME" -# else -# ifdef HAVE_SYS_UTIME_H -# include -# define TIME_OPT "SYS_UTIME" -# else - struct utimbuf { - time_t actime; - time_t modtime; - }; -# define TIME_OPT "STRUCT_UTIMBUF" -# endif -# endif -#else -# define TIME_OPT "NO_UTIME" -#endif - -#if !defined(S_ISDIR) && defined(S_IFDIR) -# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) -#endif -#if !defined(S_ISREG) && defined(S_IFREG) -# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#endif - -typedef RETSIGTYPE (*sig_type) OF((int)); - -#ifndef O_BINARY -# define O_BINARY 0 /* creation mode for open() */ -#endif - -#ifndef O_CREAT - /* Pure BSD system? */ -# include -# ifndef O_CREAT -# define O_CREAT FCREAT -# endif -# ifndef O_EXCL -# define O_EXCL FEXCL -# endif +#ifndef NO_UTIME +# include #endif -#ifndef S_IRUSR -# define S_IRUSR 0400 -#endif -#ifndef S_IWUSR -# define S_IWUSR 0200 -#endif #define RW_USER (S_IRUSR | S_IWUSR) /* creation mode for open() */ #ifndef MAX_PATH_LEN @@ -193,6 +146,25 @@ typedef RETSIGTYPE (*sig_type) OF((int)); #define OFF_T_MAX (~ (off_t) 0 - OFF_T_MIN) #endif +/* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is + present. */ +#ifndef SA_NOCLDSTOP +# define SA_NOCLDSTOP 0 +# define sigprocmask(how, set, oset) /* empty */ +# define sigset_t int +# if ! HAVE_SIGINTERRUPT +# define siginterrupt(sig, flag) /* empty */ +# endif +#endif + +#ifndef HAVE_WORKING_O_NOFOLLOW +# define HAVE_WORKING_O_NOFOLLOW 0 +#endif + +#ifndef ELOOP +# define ELOOP EINVAL +#endif + /* Separator for file name parts (see shorten_name()) */ #ifdef NO_MULTIPLE_DOTS # define PART_SEP "-" @@ -228,7 +200,7 @@ int quiet = 0; /* be very quiet (-q) */ int do_lzw = 0; /* generate output compatible with old compress (-Z) */ int test = 0; /* test .gz file integrity */ int foreground; /* set if program run in foreground */ -char *progname; /* program name */ +char *program_name; /* program name */ int maxbits = BITS; /* max bits per code for LZW */ int method = DEFLATED;/* compression method */ int level = 6; /* compression level */ @@ -236,20 +208,30 @@ 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 */ -time_t time_stamp; /* original time stamp (modification time) */ +struct timespec time_stamp; /* original time stamp (modification time) */ off_t ifile_size; /* input file size, -1 for devices (debug only) */ char *env; /* contents of GZIP env variable */ char **args = NULL; /* argv pointer if GZIP env variable defined */ char *z_suffix; /* default suffix (can be set with --suffix) */ size_t z_len; /* strlen(z_suffix) */ +/* The set of signals that are caught. */ +static sigset_t caught_signals; + +/* If nonzero then exit with status 1, rather than with the usual + signal status, on receipt of a signal with this value. This + suppresses a "Broken Pipe" message with some shells. */ +static int volatile exiting_signal; + +/* If nonnegative, close this file descriptor and unlink ofname on error. */ +static int volatile remove_ofname_fd = -1; + off_t bytes_in; /* number of input bytes */ off_t bytes_out; /* number of output bytes */ off_t total_in; /* input bytes for all files */ off_t total_out; /* output bytes for all files */ 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 */ @@ -292,7 +274,7 @@ struct option longopts[] = /* local functions */ -local void usage OF((void)); +local void try_help OF((void)) ATTRIBUTE_NORETURN; local void help OF((void)); local void license OF((void)); local void version OF((void)); @@ -300,81 +282,83 @@ local int input_eof OF((void)); local void treat_stdin OF((void)); local void treat_file OF((char *iname)); local int create_outfile OF((void)); -local int do_stat OF((char *name, struct stat *sbuf)); local char *get_suffix OF((char *name)); -local int get_istat OF((char *iname, struct stat *sbuf)); +local int open_input_file OF((char *iname, struct stat *sbuf)); local int make_ofname OF((void)); -local int same_file OF((struct stat *stat1, struct stat *stat2)); -local int name_too_long OF((char *name, struct stat *statb)); local void shorten_name OF((char *name)); local int get_method OF((int in)); local void do_list OF((int ifd, int method)); local int check_ofname OF((void)); local void copy_stat OF((struct stat *ifstat)); -local void do_exit OF((int exitcode)); +local void install_signal_handlers OF((void)); +local void remove_output_file OF((void)); +local RETSIGTYPE abort_gzip_signal OF((int)); +local void do_exit OF((int exitcode)) ATTRIBUTE_NORETURN; int main OF((int argc, char **argv)); int (*work) OF((int infile, int outfile)) = zip; /* function to call */ #if ! NO_DIR -local void treat_dir OF((char *dir)); -#endif -#ifdef HAVE_UTIME -local void reset_times OF((char *name, struct stat *statb)); +local void treat_dir OF((int fd, char *dir)); #endif #define strequ(s1, s2) (strcmp((s1),(s2)) == 0) -/* ======================================================================== */ -local void usage() +static void +try_help () { - printf ("usage: %s [-%scdfhlLnN%stvV19] [-S suffix] [file ...]\n", - progname, - O_BINARY ? "a" : "", NO_DIR ? "" : "r"); + fprintf (stderr, "Try `%s --help' for more information.\n", + program_name); + do_exit (ERROR); } /* ======================================================================== */ local void help() { static char *help_msg[] = { + "Compress or uncompress FILEs (by default, compress FILES in-place).", + "", + "Mandatory arguments to long options are mandatory for short options too.", + "", #if O_BINARY - " -a --ascii ascii text; convert end-of-lines using local conventions", -#endif - " -c --stdout write on standard output, keep original files unchanged", - " -d --decompress decompress", -/* -e --encrypt encrypt */ - " -f --force force overwrite of output file and compress links", - " -h --help give this help", -/* -k --pkzip force output in pkzip format */ - " -l --list list compressed file contents", - " -L --license display software license", + " -a, --ascii ascii text; convert end-of-line using local conventions", +#endif + " -c, --stdout write on standard output, keep original files unchanged", + " -d, --decompress decompress", +/* -e, --encrypt encrypt */ + " -f, --force force overwrite of output file and compress links", + " -h, --help give this help", +/* -k, --pkzip force output in pkzip format */ + " -l, --list list compressed file contents", + " -L, --license display software license", #ifdef UNDOCUMENTED - " -m --no-time do not save or restore the original modification time", - " -M --time save or restore the original modification time", + " -m, --no-time do not save or restore the original modification time", + " -M, --time save or restore the original modification time", #endif - " -n --no-name do not save or restore the original name and time stamp", - " -N --name save or restore the original name and time stamp", - " -q --quiet suppress all warnings", + " -n, --no-name do not save or restore the original name and time stamp", + " -N, --name save or restore the original name and time stamp", + " -q, --quiet suppress all warnings", #if ! NO_DIR - " -r --recursive operate recursively on directories", -#endif - " -S .suf --suffix .suf use suffix .suf on compressed files", - " -t --test test compressed file integrity", - " -v --verbose verbose mode", - " -V --version display version number", - " -1 --fast compress faster", - " -9 --best compress better", + " -r, --recursive operate recursively on directories", +#endif + " -S, --suffix=SUF use suffix SUF on compressed files", + " -t, --test test compressed file integrity", + " -v, --verbose verbose mode", + " -V, --version display version number", + " -1, --fast compress faster", + " -9, --best compress better", #ifdef LZW - " -Z --lzw produce output compatible with old compress", - " -b --bits maxbits max number of bits per code (implies -Z)", + " -Z, --lzw produce output compatible with old compress", + " -b, --bits=BITS max number of bits per code (implies -Z)", #endif " --rsyncable Make rsync-friendly archive", - " file... files to (de)compress. If none given, use standard input.", + "", + "With no FILE, or when FILE is -, read standard input.", + "", "Report bugs to .", 0}; char **p = help_msg; - printf ("%s %s\n(%s)\n", progname, VERSION, REVDATE); - usage(); + printf ("Usage: %s [OPTION]... [FILE]...\n", program_name); while (*p) printf ("%s\n", *p++); } @@ -383,7 +367,7 @@ local void license() { char **p = license_msg; - printf ("%s %s\n(%s)\n", progname, VERSION, REVDATE); + printf ("%s %s\n", program_name, VERSION); while (*p) printf ("%s\n", *p++); } @@ -391,43 +375,6 @@ local void license() local void version() { license (); - printf ("Compilation options:\n%s %s ", DIR_OPT, TIME_OPT); -#ifdef STDC_HEADERS - printf ("STDC_HEADERS "); -#endif -#ifdef HAVE_UNISTD_H - printf ("HAVE_UNISTD_H "); -#endif -#ifdef HAVE_MEMORY_H - printf ("HAVE_MEMORY_H "); -#endif -#ifdef HAVE_STRING_H - printf ("HAVE_STRING_H "); -#endif -#ifdef HAVE_LSTAT - printf ("HAVE_LSTAT "); -#endif -#ifdef NO_MULTIPLE_DOTS - printf ("NO_MULTIPLE_DOTS "); -#endif -#ifdef HAVE_CHOWN - printf ("HAVE_CHOWN "); -#endif -#ifdef PROTO - printf ("PROTO "); -#endif -#ifdef ASMV - printf ("ASMV "); -#endif -#ifdef DEBUG - printf ("DEBUG "); -#endif -#ifdef DYN_ALLOC - printf ("DYN_ALLOC "); -#endif -#ifdef MAXSEG_64K - printf ("MAXSEG_64K"); -#endif printf ("\n"); printf ("Written by Jean-loup Gailly.\n"); } @@ -436,7 +383,7 @@ local void progerror (string) char *string; { int e = errno; - fprintf(stderr, "%s: ", progname); + fprintf (stderr, "%s: ", program_name); errno = e; perror(string); exit_code = ERROR; @@ -447,39 +394,23 @@ int main (argc, argv) int argc; char **argv; { - int file_count; /* number of files to precess */ - int proglen; /* length of progname */ + int file_count; /* number of files to process */ + size_t proglen; /* length of program_name */ int optc; /* current option */ EXPAND(argc, argv); /* wild card expansion if necessary */ - progname = base_name (argv[0]); - proglen = strlen(progname); + program_name = gzip_base_name (argv[0]); + proglen = strlen (program_name); /* Suppress .exe for MSDOS, OS/2 and VMS: */ - if (proglen > 4 && strequ(progname+proglen-4, ".exe")) { - progname[proglen-4] = '\0'; - } + if (4 < proglen && strequ (program_name + proglen - 4, ".exe")) + program_name[proglen - 4] = '\0'; /* Add options in GZIP environment variable if there is one */ env = add_envopt(&argc, &argv, OPTIONS_VAR); if (env != NULL) args = argv; - foreground = signal(SIGINT, SIG_IGN) != SIG_IGN; - if (foreground) { - (void) signal (SIGINT, (sig_type)abort_gzip_signal); - } -#ifdef SIGTERM - if (signal(SIGTERM, SIG_IGN) != SIG_IGN) { - (void) signal(SIGTERM, (sig_type)abort_gzip_signal); - } -#endif -#ifdef SIGHUP - if (signal(SIGHUP, SIG_IGN) != SIG_IGN) { - (void) signal(SIGHUP, (sig_type)abort_gzip_signal); - } -#endif - #ifndef GNU_STANDARD /* For compatibility with old compress, use program name as an option. * If you compile with -DGNU_STANDARD, this program will behave as @@ -488,13 +419,12 @@ int main (argc, argv) * Systems which do not support links can still use -d or -dc. * Ignore an .exe extension for MSDOS, OS/2 and VMS. */ - if ( strncmp(progname, "un", 2) == 0 /* ungzip, uncompress */ - || strncmp(progname, "gun", 3) == 0) { /* gunzip */ + if (strncmp (program_name, "un", 2) == 0 /* ungzip, uncompress */ + || strncmp (program_name, "gun", 3) == 0) /* gunzip */ decompress = 1; - } else if (strequ(progname+1, "cat") /* zcat, pcat, gcat */ - || strequ(progname, "gzcat")) { /* gzcat */ + else if (strequ (program_name + 1, "cat") /* zcat, pcat, gcat */ + || strequ (program_name, "gzcat")) /* gzcat */ decompress = to_stdout = 1; - } #endif z_suffix = Z_SUFFIX; @@ -511,9 +441,8 @@ int main (argc, argv) if (! ('0' <= *optarg && *optarg <= '9')) { fprintf (stderr, "%s: -b operand is not an integer\n", - progname); - usage (); - do_exit (ERROR); + program_name); + try_help (); } break; case 'c': @@ -522,7 +451,7 @@ int main (argc, argv) decompress = 1; break; case 'f': force++; break; - case 'h': case 'H': case '?': + case 'h': case 'H': help(); do_exit(OK); break; case 'l': list = decompress = to_stdout = 1; break; @@ -540,11 +469,11 @@ int main (argc, argv) quiet = 1; verbose = 0; break; case 'r': #if NO_DIR - fprintf(stderr, "%s: -r not supported on this system\n", progname); - usage(); - do_exit(ERROR); break; + fprintf (stderr, "%s: -r not supported on this system\n", + program_name); + try_help (); #else - recursive = 1; break; + recursive = 1; #endif case 'R': rsync = 1; break; @@ -568,9 +497,9 @@ int main (argc, argv) do_lzw = 1; break; #else fprintf(stderr, "%s: -Z not supported in this version\n", - progname); - usage(); - do_exit(ERROR); break; + program_name); + try_help (); + break; #endif case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -578,17 +507,10 @@ int main (argc, argv) break; default: /* Error message already emitted by getopt_long. */ - usage(); - do_exit(ERROR); + try_help (); } } /* loop on all arguments */ -#ifdef SIGPIPE - /* Ignore "Broken Pipe" message with --quiet */ - if (quiet && signal (SIGPIPE, SIG_IGN) != SIG_IGN) - signal (SIGPIPE, (sig_type) abort_gzip_signal); -#endif - /* By default, save name and timestamp on compression but do not * restore them on decompression. */ @@ -601,12 +523,12 @@ int main (argc, argv) #else if (ascii && !quiet) { fprintf(stderr, "%s: option --ascii ignored on this system\n", - progname); + program_name); } #endif if ((z_len == 0 && !decompress) || z_len > MAX_SUFFIX) { fprintf(stderr, "%s: incorrect suffix '%s'\n", - progname, z_suffix); + program_name, z_suffix); do_exit(ERROR); } if (do_lzw && !decompress) work = lzw; @@ -623,6 +545,9 @@ int main (argc, argv) ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); #endif + exiting_signal = quiet ? SIGPIPE : 0; + install_signal_handlers (); + /* And get to work */ if (file_count != 0) { if (to_stdout && !test && !list && (!decompress || !ascii)) { @@ -681,9 +606,9 @@ local void treat_stdin() */ fprintf(stderr, "%s: compressed data not %s a terminal. Use -f to force %scompression.\n", - progname, decompress ? "read from" : "written to", + program_name, decompress ? "read from" : "written to", decompress ? "de" : ""); - fprintf(stderr,"For help, type: %s -h\n", progname); + fprintf (stderr, "For help, type: %s -h\n", program_name); do_exit(ERROR); } @@ -697,7 +622,7 @@ local void treat_stdin() strcpy(ofname, "stdout"); /* Get the time stamp on the input file. */ - time_stamp = 0; /* time unknown by default */ + time_stamp.tv_nsec = -1; /* The time is unknown by default. */ #ifndef NO_STDIN_FSTAT if (list || !no_time) { @@ -708,7 +633,7 @@ local void treat_stdin() # ifdef NO_PIPE_TIMESTAMP if (S_ISREG(istat.st_mode)) # endif - time_stamp = istat.st_mtime; + time_stamp = get_stat_mtime (&istat); #endif /* NO_STDIN_FSTAT */ } ifile_size = -1L; /* convention for unknown size */ @@ -772,39 +697,67 @@ local void treat_file(iname) } /* Check if the input file is present, set ifname and istat: */ - if (get_istat(iname, &istat) != OK) return; + ifd = open_input_file (iname, &istat); + if (ifd < 0) + return; /* If the input name is that of a directory, recurse or ignore: */ if (S_ISDIR(istat.st_mode)) { #if ! NO_DIR if (recursive) { - struct stat st; - st = istat; - treat_dir(iname); + treat_dir (ifd, iname); /* Warning: ifname is now garbage */ -# ifndef NO_UTIME - reset_times (iname, &st); -# endif - } else + return; + } #endif - WARN((stderr,"%s: %s is a directory -- ignored\n", progname, ifname)); + close (ifd); + WARN ((stderr, "%s: %s is a directory -- ignored\n", + program_name, ifname)); return; } if (!S_ISREG(istat.st_mode)) { WARN((stderr, "%s: %s is not a directory or a regular file - ignored\n", - progname, ifname)); + program_name, ifname)); + close (ifd); return; } + + if (istat.st_mode & S_ISUID) + { + WARN ((stderr, "%s: %s is set-user-ID on execution - ignored\n", + program_name, ifname)); + close (ifd); + return; + } + if (istat.st_mode & S_ISGID) + { + WARN ((stderr, "%s: %s is set-group-ID on execution - ignored\n", + program_name, ifname)); + close (ifd); + return; + } + if (istat.st_mode & S_ISVTX) + { + WARN ((stderr, "%s: %s has the sticky bit set - file ignored\n", + program_name, ifname)); + close (ifd); + return; + } + if (istat.st_nlink > 1 && !to_stdout && !force) { WARN((stderr, "%s: %s has %lu other link%c -- unchanged\n", - progname, ifname, (unsigned long) istat.st_nlink - 1, + program_name, ifname, (unsigned long) istat.st_nlink - 1, istat.st_nlink > 2 ? 's' : ' ')); + close (ifd); return; } ifile_size = istat.st_size; - time_stamp = no_time && !list ? 0 : istat.st_mtime; + if (no_time && !list) + time_stamp.tv_nsec = -1; + else + time_stamp = get_stat_mtime (&istat); /* Generate output file name. For -r and (-t or -l), skip files * without a valid gzip suffix (check done in make_ofname). @@ -813,19 +766,10 @@ local void treat_file(iname) strcpy(ofname, "stdout"); } else if (make_ofname() != OK) { + close (ifd); return; } - /* Open the input file and determine compression method. The mode - * parameter is ignored but required by some systems (VMS) and forbidden - * on other systems (MacOS). - */ - ifd = OPEN(ifname, ascii && !decompress ? O_RDONLY : O_RDONLY | O_BINARY, - RW_USER); - if (ifd == -1) { - progerror(ifname); - return; - } clear_bufs(); /* clear input and output buffers */ part_nb = 0; @@ -838,7 +782,8 @@ local void treat_file(iname) } if (list) { do_list(ifd, method); - close(ifd); + if (close (ifd) != 0) + read_error (); return; } @@ -848,13 +793,13 @@ local void treat_file(iname) */ if (to_stdout) { ofd = fileno(stdout); - /* keep remove_ofname as zero */ + /* Keep remove_ofname_fd negative. */ } else { if (create_outfile() != OK) return; if (!decompress && save_orig_name && !verbose && !quiet) { fprintf(stderr, "%s: %s compressed to %s\n", - progname, ifname, ofname); + program_name, ifname, ofname); } } /* Keep the name even if not truncated except with --no-name: */ @@ -880,28 +825,40 @@ local void treat_file(iname) bytes_out = 0; /* required for length check */ } - close(ifd); - if (!to_stdout) { - /* Copy modes, times, and ownership */ - copy_stat(&istat); - if (close(ofd)) - write_error(); - remove_ofname = 0; - - /* It's now safe to remove the input file: */ - if (xunlink (ifname)) { - int e = errno; - WARN((stderr, "%s: ", progname)); - if (!quiet) { - errno = e; - perror(ifname); - } - } - } + if (close (ifd) != 0) + read_error (); + + if (!to_stdout) + { + sigset_t oldset; + int unlink_errno; + + copy_stat (&istat); + if (close (ofd) != 0) + write_error (); + + sigprocmask (SIG_BLOCK, &caught_signals, &oldset); + remove_ofname_fd = -1; + unlink_errno = xunlink (ifname) == 0 ? 0 : errno; + sigprocmask (SIG_SETMASK, &oldset, NULL); + + if (unlink_errno) + { + WARN ((stderr, "%s: ", program_name)); + if (!quiet) + { + errno = unlink_errno; + perror (ifname); + } + } + } + if (method == -1) { - if (!to_stdout) xunlink (ofname); + if (!to_stdout) + remove_output_file (); return; } + /* Display statistics */ if(verbose) { if (test) { @@ -929,70 +886,55 @@ local void treat_file(iname) */ local int create_outfile() { - struct stat ostat; /* stat for ofname */ - int flags = O_WRONLY | O_CREAT | O_EXCL | O_BINARY; + int name_shortened = 0; + int flags = (O_WRONLY | O_CREAT | O_EXCL + | (ascii && decompress ? 0 : O_BINARY)); - if (ascii && decompress) { - flags &= ~O_BINARY; /* force ascii text mode */ - } - for (;;) { - /* Make sure that ofname is not an existing file */ - if (check_ofname() != OK) { - close(ifd); - return ERROR; - } - /* Create the output file */ - remove_ofname = 1; - ofd = OPEN(ofname, flags, RW_USER); - if (ofd == -1) { - progerror(ofname); - close(ifd); - return ERROR; - } + for (;;) + { + int open_errno; + sigset_t oldset; - /* Check for name truncation on new file (1234567890123.gz) */ -#ifdef NO_FSTAT - if (stat(ofname, &ostat) != 0) { -#else - if (fstat(ofd, &ostat) != 0) { + sigprocmask (SIG_BLOCK, &caught_signals, &oldset); + remove_ofname_fd = ofd = OPEN (ofname, flags, RW_USER); + open_errno = errno; + sigprocmask (SIG_SETMASK, &oldset, NULL); + + if (0 <= ofd) + break; + + switch (open_errno) + { +#ifdef ENAMETOOLONG + case ENAMETOOLONG: + shorten_name (ofname); + name_shortened = 1; + break; #endif - progerror(ofname); - close(ifd); close(ofd); - xunlink (ofname); - return ERROR; - } - if (!name_too_long(ofname, &ostat)) return OK; - if (decompress) { - /* name might be too long if an original name was saved */ - WARN((stderr, "%s: %s: warning, name truncated\n", - progname, ofname)); - return OK; + case EEXIST: + if (check_ofname () != OK) + { + close (ifd); + return ERROR; + } + break; + + default: + progerror (ofname); + close (ifd); + return ERROR; } - close(ofd); - xunlink (ofname); -#ifdef NO_MULTIPLE_DOTS - /* Should never happen, see check_ofname() */ - fprintf(stderr, "%s: %s: name too long\n", progname, ofname); - do_exit(ERROR); -#endif - shorten_name(ofname); } -} -/* ======================================================================== - * Use lstat if available, except for -c or -f. Use stat otherwise. - * This allows links when not removing the original file. - */ -local int do_stat(name, sbuf) - char *name; - struct stat *sbuf; -{ - errno = 0; - if (!to_stdout && !force) { - return lstat(name, sbuf); + if (name_shortened && decompress) + { + /* name might be too long if an original name was saved */ + WARN ((stderr, "%s: %s: warning, name truncated\n", + program_name, ofname)); } - return stat(name, sbuf); + + return OK; } /* ======================================================================== @@ -1050,14 +992,54 @@ local char *get_suffix(name) } +/* Open file NAME with the given flags and mode and store its status + into *ST. Return a file descriptor to the newly opened file, or -1 + (setting errno) on failure. */ +static int +open_and_stat (char *name, int flags, mode_t mode, struct stat *st) +{ + int fd; + + /* Refuse to follow symbolic links unless -c or -f. */ + if (!to_stdout && !force) + { + if (HAVE_WORKING_O_NOFOLLOW) + flags |= O_NOFOLLOW; + else + { +#if HAVE_LSTAT || defined lstat + if (lstat (name, st) != 0) + return -1; + else if (S_ISLNK (st->st_mode)) + { + errno = ELOOP; + return -1; + } +#endif + } + } + + fd = OPEN (name, flags, mode); + if (0 <= fd && fstat (fd, st) != 0) + { + int e = errno; + close (fd); + errno = e; + return -1; + } + return fd; +} + + /* ======================================================================== * Set ifname to the input file name (with a suffix appended if necessary) * and istat to its stats. For decompression, if no file exists with the * original name, try adding successively z_suffix, .gz, .z, -z and .Z. * For MSDOS, we try only z_suffix and z. - * Return OK or ERROR. + * Return an open file descriptor or -1. */ -local int get_istat(iname, sbuf) +static int +open_input_file (iname, sbuf) char *iname; struct stat *sbuf; { @@ -1069,6 +1051,9 @@ local int get_istat(iname, sbuf) #ifdef NO_MULTIPLE_DOTS char *dot; /* pointer to ifname extension, or NULL */ #endif + int fd; + int open_flags = (O_RDONLY | O_NONBLOCK | O_NOCTTY + | (ascii && !decompress ? 0 : O_BINARY)); *suf = z_suffix; @@ -1078,11 +1063,13 @@ local int get_istat(iname, sbuf) strcpy(ifname, iname); /* If input file exists, return OK. */ - if (do_stat(ifname, sbuf) == 0) return OK; + fd = open_and_stat (ifname, open_flags, RW_USER, sbuf); + if (0 <= fd) + return fd; if (!decompress || errno != ENOENT) { progerror(ifname); - return ERROR; + return -1; } /* file.ext doesn't exist, try adding a suffix (after removing any * version number for VMS). @@ -1090,7 +1077,7 @@ local int get_istat(iname, sbuf) s = get_suffix(ifname); if (s != NULL) { progerror(ifname); /* ifname already has z suffix and does not exist */ - return ERROR; + return -1; } #ifdef NO_MULTIPLE_DOTS dot = strrchr(ifname, '.'); @@ -1117,7 +1104,14 @@ local int get_istat(iname, sbuf) if (sizeof ifname <= ilen + strlen (s)) goto name_too_long; strcat(ifname, s); - if (do_stat(ifname, sbuf) == 0) return OK; + fd = open_and_stat (ifname, open_flags, RW_USER, sbuf); + if (0 <= fd) + return fd; + if (errno != ENOENT) + { + progerror (ifname); + return -1; + } if (strequ (s0, z_suffix)) z_suffix_errno = errno; } while (*++suf != NULL); @@ -1134,12 +1128,12 @@ local int get_istat(iname, sbuf) strcat(ifname, z_suffix); errno = z_suffix_errno; progerror(ifname); - return ERROR; - + return -1; + name_too_long: - fprintf (stderr, "%s: %s: file name too long\n", progname, iname); + fprintf (stderr, "%s: %s: file name too long\n", program_name, iname); exit_code = ERROR; - return ERROR; + return -1; } /* ======================================================================== @@ -1164,7 +1158,7 @@ local int make_ofname() /* Avoid annoying messages with -r */ if (verbose || (!recursive && !quiet)) { WARN((stderr,"%s: %s: unknown suffix -- ignored\n", - progname, ifname)); + program_name, ifname)); } return WARNING; } @@ -1180,9 +1174,9 @@ local int make_ofname() } else if (suff != NULL) { /* Avoid annoying messages with -r (see treat_dir()) */ if (verbose || (!recursive && !quiet)) { - /* don't use WARN -- it will cause an exit_code of 2 */ - fprintf(stderr, "%s: %s already has %s suffix -- unchanged\n", - progname, ifname, suff); + /* Don't use WARN, as it affects exit status. */ + fprintf (stderr, "%s: %s already has %s suffix -- unchanged\n", + program_name, ifname, suff); } return WARNING; } else { @@ -1201,8 +1195,8 @@ local int make_ofname() strcat(ofname, "gz"); /* enough room */ return OK; } - /* On the Atari and some versions of MSDOS, name_too_long() - * does not work correctly because of a bug in stat(). So we + /* On the Atari and some versions of MSDOS, + * ENAMETOOLONG does not work correctly. So we * must truncate here. */ } else if (strlen(suff)-1 + z_len > MAX_SUFFIX) { @@ -1219,7 +1213,7 @@ local int make_ofname() return OK; name_too_long: - WARN ((stderr, "%s: %s: file name too long\n", progname, ifname)); + WARN ((stderr, "%s: %s: file name too long\n", program_name, ifname)); return WARNING; } @@ -1269,7 +1263,7 @@ local int get_method(in) if (method != DEFLATED) { fprintf(stderr, "%s: %s: unknown method %d -- not supported\n", - progname, ifname, method); + program_name, ifname, method); exit_code = ERROR; return -1; } @@ -1279,21 +1273,21 @@ local int get_method(in) if ((flags & ENCRYPTED) != 0) { fprintf(stderr, "%s: %s is encrypted -- not supported\n", - progname, ifname); + program_name, ifname); exit_code = ERROR; return -1; } if ((flags & CONTINUATION) != 0) { fprintf(stderr, "%s: %s is a a multi-part gzip file -- not supported\n", - progname, ifname); + program_name, ifname); exit_code = ERROR; if (force <= 1) return -1; } if ((flags & RESERVED) != 0) { fprintf(stderr, "%s: %s has flags 0x%x -- not supported\n", - progname, ifname, flags); + program_name, ifname, flags); exit_code = ERROR; if (force <= 1) return -1; } @@ -1301,7 +1295,11 @@ local int get_method(in) stamp |= ((ulg)get_byte()) << 8; stamp |= ((ulg)get_byte()) << 16; stamp |= ((ulg)get_byte()) << 24; - if (stamp != 0 && !no_time) time_stamp = stamp; + if (stamp != 0 && !no_time) + { + time_stamp.tv_sec = stamp; + time_stamp.tv_nsec = 0; + } (void)get_byte(); /* Ignore extra flags for the moment */ (void)get_byte(); /* Ignore OS type for the moment */ @@ -1311,7 +1309,7 @@ local int get_method(in) part |= ((unsigned)get_byte())<<8; if (verbose) { fprintf(stderr,"%s: %s: part number %u\n", - progname, ifname, part); + program_name, ifname, part); } } if ((flags & EXTRA_FIELD) != 0) { @@ -1319,7 +1317,7 @@ local int get_method(in) len |= ((unsigned)get_byte())<<8; if (verbose) { fprintf(stderr,"%s: %s: extra field of %u bytes ignored\n", - progname, ifname, len); + program_name, ifname, len); } while (len--) (void)get_byte(); } @@ -1332,18 +1330,17 @@ local int get_method(in) do {c=get_byte();} while (c != 0); } else { /* Copy the base name. Keep a directory prefix intact. */ - char *p = base_name (ofname); + char *p = gzip_base_name (ofname); char *base = p; - char *base2; for (;;) { *p = (char)get_char(); if (*p++ == '\0') break; if (p >= ofname+sizeof(ofname)) { - error("corrupted input -- file name too large"); + gzip_error ("corrupted input -- file name too large"); } } - base2 = base_name (base); - strcpy(base, base2); + p = gzip_base_name (base); + memmove (base, p, strlen (p) + 1); /* If necessary, adapt the name to local OS conventions: */ if (!list) { MAKE_LEGAL_NAME(base); @@ -1394,7 +1391,8 @@ local int get_method(in) if (method >= 0) return method; if (part_nb == 1) { - fprintf(stderr, "\n%s: %s: not in gzip format\n", progname, ifname); + fprintf (stderr, "\n%s: %s: not in gzip format\n", + program_name, ifname); exit_code = ERROR; return -1; } else { @@ -1407,13 +1405,13 @@ local int get_method(in) { if (verbose) WARN ((stderr, "\n%s: %s: decompression OK, trailing zero bytes ignored\n", - progname, ifname)); + program_name, ifname)); return -3; } } WARN((stderr, "\n%s: %s: decompression OK, trailing garbage ignored\n", - progname, ifname)); + program_name, ifname)); return -2; } } @@ -1436,7 +1434,6 @@ local void do_list(ifd, method) "lzh ", /* 3 */ "", "", "", "", /* 4 to 7 reserved */ "defla"}; /* 8 */ - char *date; int positive_off_t_width = 1; off_t o; @@ -1496,11 +1493,18 @@ local void do_list(ifd, method) } } #endif /* RECORD_IO */ - date = ctime((time_t*)&time_stamp) + 4; /* skip the day of the week */ - date[12] = '\0'; /* suppress the 1/100sec and the year */ - if (verbose) { - printf("%5s %08lx %11s ", methods[method], crc, date); - } + if (verbose) + { + struct tm *tm = localtime (&time_stamp.tv_sec); + printf ("%5s %08lx ", methods[method], crc); + if (tm) + printf ("%s%3d %02d:%02d ", + ("Jan\0Feb\0Mar\0Apr\0May\0Jun\0Jul\0Aug\0Sep\0Oct\0Nov\0Dec" + + 4 * tm->tm_mon), + tm->tm_mday, tm->tm_hour, tm->tm_min); + else + printf ("??? ?? ??:?? "); + } fprint_off(stdout, bytes_in, positive_off_t_width); printf(" "); fprint_off(stdout, bytes_out, positive_off_t_width); @@ -1521,49 +1525,6 @@ local void do_list(ifd, method) printf(" %s\n", ofname); } -/* ======================================================================== - * Return true if the two stat structures correspond to the same file. - */ -local int same_file(stat1, stat2) - struct stat *stat1; - struct stat *stat2; -{ - return stat1->st_ino == stat2->st_ino - && stat1->st_dev == stat2->st_dev -#ifdef NO_ST_INO - /* Can't rely on st_ino and st_dev, use other fields: */ - && stat1->st_mode == stat2->st_mode - && stat1->st_uid == stat2->st_uid - && stat1->st_gid == stat2->st_gid - && stat1->st_size == stat2->st_size - && stat1->st_atime == stat2->st_atime - && stat1->st_mtime == stat2->st_mtime - && stat1->st_ctime == stat2->st_ctime -#endif - ; -} - -/* ======================================================================== - * Return true if a file name is ambiguous because the operating system - * truncates file names. - */ -local int name_too_long(name, statb) - char *name; /* file name to check */ - struct stat *statb; /* stat buf for this file name */ -{ - int s = strlen(name); - char c = name[s-1]; - struct stat tstat; /* stat for truncated name */ - int res; - - tstat = *statb; /* Just in case OS does not fill all fields */ - name[s-1] = '\0'; - res = lstat(name, &tstat) == 0 && same_file(statb, &tstat); - name[s-1] = c; - Trace((stderr, " too_long(%s) => %d\n", name, res)); - return res; -} - /* ======================================================================== * Shorten the given name by one character, or replace a .tar extension * with .tgz. Truncate the last part of the name which is longer than @@ -1584,12 +1545,14 @@ local void shorten_name(name) len = strlen(name); if (decompress) { - if (len <= 1) error("name too short"); + if (len <= 1) + gzip_error ("name too short"); name[len-1] = '\0'; return; } p = get_suffix(name); - if (p == NULL) error("can't recover suffix\n"); + if (! p) + gzip_error ("can't recover suffix\n"); *p = '\0'; save_orig_name = 1; @@ -1619,69 +1582,23 @@ local void shorten_name(name) trunc--; } else { trunc = strrchr(name, PART_SEP[0]); - if (trunc == NULL) error("internal error in shorten_name"); + if (!trunc) + gzip_error ("internal error in shorten_name"); if (trunc[1] == '\0') trunc--; /* force truncation */ } strcpy(trunc, z_suffix); } /* ======================================================================== - * If compressing to a file, check if ofname is not ambiguous - * because the operating system truncates names. Otherwise, generate - * a new ofname and save the original name in the compressed file. - * If the compressed file already exists, ask for confirmation. - * The check for name truncation is made dynamically, because different - * file systems on the same OS might use different truncation rules (on SVR4 - * s5 truncates to 14 chars and ufs does not truncate). - * This function returns -1 if the file must be skipped, and - * updates save_orig_name if necessary. - * IN assertions: save_orig_name is already set if ofname has been - * already truncated because of NO_MULTIPLE_DOTS. The input file has - * already been open and istat is set. + * The compressed file already exists, so ask for confirmation. + * Return ERROR if the file must be skipped. */ local int check_ofname() { - struct stat ostat; /* stat for ofname */ - -#ifdef ENAMETOOLONG - /* Check for strictly conforming Posix systems (which return ENAMETOOLONG - * instead of silently truncating filenames). - */ - errno = 0; - while (lstat(ofname, &ostat) != 0) { - if (errno != ENAMETOOLONG) return 0; /* ofname does not exist */ - shorten_name(ofname); - } -#else - if (lstat(ofname, &ostat) != 0) return 0; -#endif - /* Check for name truncation on existing file. Do this even on systems - * defining ENAMETOOLONG, because on most systems the strict Posix - * behavior is disabled by default (silent name truncation allowed). - */ - if (!decompress && name_too_long(ofname, &ostat)) { - shorten_name(ofname); - if (lstat(ofname, &ostat) != 0) return 0; - } - - /* Check that the input and output files are different (could be - * the same by name truncation or links). - */ - if (same_file(&istat, &ostat)) { - if (strequ(ifname, ofname)) { - fprintf(stderr, "%s: %s: cannot %scompress onto itself\n", - progname, ifname, decompress ? "de" : ""); - } else { - fprintf(stderr, "%s: %s and %s are the same file\n", - progname, ifname, ofname); - } - exit_code = ERROR; - return ERROR; - } /* Ask permission to overwrite the existing file */ if (!force) { int ok = 0; - fprintf(stderr, "%s: %s already exists;", progname, ofname); + fprintf (stderr, "%s: %s already exists;", program_name, ofname); if (foreground && isatty(fileno(stdin))) { fprintf(stderr, " do you wish to overwrite (y or n)? "); fflush(stderr); @@ -1701,33 +1618,6 @@ local int check_ofname() } -#ifndef NO_UTIME -/* ======================================================================== - * Set the access and modification times from the given stat buffer. - */ -local void reset_times (name, statb) - char *name; - struct stat *statb; -{ - struct utimbuf timep; - - /* Copy the time stamp */ - timep.actime = statb->st_atime; - timep.modtime = statb->st_mtime; - - /* Some systems (at least OS/2) do not support utime on directories */ - if (utime(name, &timep) && !S_ISDIR(statb->st_mode)) { - int e = errno; - WARN((stderr, "%s: ", progname)); - if (!quiet) { - errno = e; - perror(ofname); - } - } -} -#endif - - /* ======================================================================== * Copy modes, times, ownership from input file to output file. * IN assertion: to_stdout is false. @@ -1735,27 +1625,58 @@ local void reset_times (name, statb) local void copy_stat(ifstat) struct stat *ifstat; { + mode_t mode = ifstat->st_mode & S_IRWXUGO; + int r; + #ifndef NO_UTIME - if (decompress && time_stamp != 0 && ifstat->st_mtime != time_stamp) { - ifstat->st_mtime = time_stamp; + struct timespec timespec[2]; + timespec[0] = get_stat_atime (ifstat); + timespec[1] = get_stat_mtime (ifstat); + + if (decompress && 0 <= time_stamp.tv_nsec + && ! (timespec[1].tv_sec == time_stamp.tv_sec + && timespec[1].tv_nsec == time_stamp.tv_nsec)) + { + timespec[1] = time_stamp; if (verbose > 1) { fprintf(stderr, "%s: time stamp restored\n", ofname); } - } - reset_times(ofname, ifstat); + } + + if (futimens (ofd, ofname, timespec) != 0) + { + int e = errno; + WARN ((stderr, "%s: ", program_name)); + if (!quiet) + { + errno = e; + perror (ofname); + } + } +#endif + +#ifndef NO_CHOWN +# if HAVE_FCHOWN + fchown (ofd, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ +# elif HAVE_CHOWN + chown(ofname, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ +# endif #endif + /* Copy the protection modes */ - if (fchmod(ofd, ifstat->st_mode & 07777)) { +#if HAVE_FCHMOD + r = fchmod (ofd, mode); +#else + r = chmod (ofname, mode); +#endif + if (r != 0) { int e = errno; - WARN((stderr, "%s: ", progname)); + WARN ((stderr, "%s: ", program_name)); if (!quiet) { errno = e; perror(ofname); } } -#ifndef NO_CHOWN - fchown(ofd, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ -#endif } #if ! NO_DIR @@ -1763,7 +1684,8 @@ local void copy_stat(ifstat) /* ======================================================================== * Recurse through the given directory. This code is taken from ncompress. */ -local void treat_dir(dir) +local void treat_dir (fd, dir) + int fd; char *dir; { struct dirent *dp; @@ -1771,10 +1693,18 @@ local void treat_dir(dir) char nbuf[MAX_PATH_LEN]; int len; +#if HAVE_FDOPENDIR + dirp = fdopendir (fd); +#else + close (fd); dirp = opendir(dir); - +#endif + if (dirp == NULL) { progerror(dir); +#if HAVE_FDOPENDIR + close (fd); +#endif return ; } /* @@ -1792,14 +1722,14 @@ local void treat_dir(dir) ** think it's worth it. -- Dave Mack ** (An other alternative might be two passes to avoid depth-first.) */ - + while ((errno = 0, dp = readdir(dirp)) != NULL) { if (strequ(dp->d_name,".") || strequ(dp->d_name,"..")) { continue; } len = strlen(dir); - if (len + NAMLEN(dp) + 1 < MAX_PATH_LEN - 1) { + if (len + _D_EXACT_NAMLEN (dp) + 1 < MAX_PATH_LEN - 1) { strcpy(nbuf,dir); if (len != 0 /* dir = "" means current dir on Amiga */ #ifdef PATH_SEP2 @@ -1815,7 +1745,7 @@ local void treat_dir(dir) treat_file(nbuf); } else { fprintf(stderr,"%s: %s/%s: pathname too long\n", - progname, dir, dp->d_name); + program_name, dir, dp->d_name); exit_code = ERROR; } } @@ -1826,6 +1756,71 @@ local void treat_dir(dir) } #endif /* ! NO_DIR */ +/* Make sure signals get handled properly. */ + +static void +install_signal_handlers () +{ + static int sig[] = + { + /* SIGINT must be first, as 'foreground' depends on it. */ + SIGINT + +#ifdef SIGHUP + , SIGHUP +#endif +#ifdef SIGPIPE + , SIGPIPE +#else +# define SIGPIPE 0 +#endif +#ifdef SIGTERM + , SIGTERM +#endif +#ifdef SIGXCPU + , SIGXCPU +#endif +#ifdef SIGXFSZ + , SIGXFSZ +#endif + }; + int nsigs = sizeof sig / sizeof sig[0]; + int i; + +#if SA_NOCLDSTOP + struct sigaction act; + + sigemptyset (&caught_signals); + for (i = 0; i < nsigs; i++) + { + sigaction (sig[i], NULL, &act); + if (act.sa_handler != SIG_IGN) + sigaddset (&caught_signals, sig[i]); + } + + act.sa_handler = abort_gzip_signal; + act.sa_mask = caught_signals; + act.sa_flags = 0; + + for (i = 0; i < nsigs; i++) + if (sigismember (&caught_signals, sig[i])) + { + if (i == 0) + foreground = 1; + sigaction (sig[i], &act, NULL); + } +#else + for (i = 0; i < nsigs; i++) + if (signal (sig[i], SIG_IGN) != SIG_IGN) + { + if (i == 0) + foreground = 1; + signal (sig[i], abort_gzip_signal); + siginterrupt (sig[i], 1); + } +#endif +} + /* ======================================================================== * Free all dynamically allocated variables and exit with the given code. */ @@ -1852,31 +1847,47 @@ local void do_exit(exitcode) } /* ======================================================================== - * Close and unlink the output file if appropriate. This routine must be - * async-signal-safe. + * Close and unlink the output file. */ -local void do_remove() { - if (remove_ofname) { - close(ofd); - xunlink (ofname); - } +static void +remove_output_file () +{ + int fd; + sigset_t oldset; + + sigprocmask (SIG_BLOCK, &caught_signals, &oldset); + fd = remove_ofname_fd; + if (0 <= fd) + { + remove_ofname_fd = -1; + close (fd); + xunlink (ofname); + } + sigprocmask (SIG_SETMASK, &oldset, NULL); } /* ======================================================================== * Error handler. */ -RETSIGTYPE abort_gzip() +void +abort_gzip () { - do_remove(); - do_exit(ERROR); + remove_output_file (); + do_exit(ERROR); } /* ======================================================================== * Signal handler. */ -RETSIGTYPE abort_gzip_signal() +static RETSIGTYPE +abort_gzip_signal (sig) + int sig; { - do_remove(); - _exit(ERROR); + if (! SA_NOCLDSTOP) + signal (sig, SIG_IGN); + remove_output_file (); + if (sig == exiting_signal) + _exit (ERROR); + signal (sig, SIG_DFL); + raise (sig); } -