/* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
- Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2016 Free Software
+ Copyright (C) 1999, 2001-2002, 2006-2007, 2009-2017 Free Software
Foundation, Inc.
Copyright (C) 1992-1993 Jean-loup Gailly
*/
static char const *const license_msg[] = {
-"Copyright (C) 2016 Free Software Foundation, Inc.",
+"Copyright (C) 2017 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 <http://www.gnu.org/licenses/gpl.html>.",
+"the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.",
"There is NO WARRANTY, to the extent permitted by law.",
0};
#include "ignore-value.h"
#include "stat-time.h"
#include "version.h"
+#include "xalloc.h"
#include "yesno.h"
/* configuration */
int save_orig_name; /* set if original name must be saved */
static int last_member; /* set for .zip and .Z files */
static int part_nb; /* number of parts in .gz file */
- struct timespec time_stamp; /* original time stamp (modification time) */
off_t ifile_size; /* input file size, -1 for devices (debug only) */
static char *env; /* contents of GZIP env variable */
static char const *z_suffix; /* default suffix (can be set with --suffix) */
static size_t z_len; /* strlen(z_suffix) */
+/* The original timestamp (modification time). If the original is
+ unknown, TIME_STAMP.tv_nsec is negative. If the original is
+ greater than struct timespec range, TIME_STAMP is the maximal
+ struct timespec value; this can happen on hosts with 32-bit signed
+ time_t because the gzip format's MTIME is 32-bit unsigned.
+ The original cannot be less than struct timespec range. */
+struct timespec time_stamp;
+
/* The set of signals that are caught. */
static sigset_t caught_signals;
{"recursive", 0, 0, 'r'}, /* recurse through directories */
{"suffix", 1, 0, 'S'}, /* use given suffix instead of .gz */
{"test", 0, 0, 't'}, /* test compressed file integrity */
- {"no-time", 0, 0, 'T'}, /* don't save or restore the time stamp */
{"verbose", 0, 0, 'v'}, /* verbose mode */
{"version", 0, 0, 'V'}, /* display version number */
{"fast", 0, 0, '1'}, /* compress faster */
/* local functions */
-local void try_help (void) ATTRIBUTE_NORETURN;
+local noreturn void try_help (void);
local void help (void);
local void license (void);
local void version (void);
local void install_signal_handlers (void);
local void remove_output_file (void);
local RETSIGTYPE abort_gzip_signal (int);
-local void do_exit (int exitcode) ATTRIBUTE_NORETURN;
+local noreturn void do_exit (int exitcode);
static void finish_out (void);
int main (int argc, char **argv);
static int (*work) (int infile, int outfile) = zip; /* function to call */
" -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 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",
+ " -n, --no-name do not save or restore the original name and timestamp",
+ " -N, --name save or restore the original name and timestamp",
" -q, --quiet suppress all warnings",
#if ! NO_DIR
" -r, --recursive operate recursively on directories",
case '4' + ENV_OPTION: case '5' + ENV_OPTION: case '6' + ENV_OPTION:
case '7' + ENV_OPTION: case '8' + ENV_OPTION: case '9' + ENV_OPTION:
optc -= ENV_OPTION;
- /* Fall through. */
+ FALLTHROUGH;
case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
level = optc - '0';
strcpy(ifname, "stdin");
strcpy(ofname, "stdout");
- /* Get the file's time stamp and size. */
+ /* Get the file's timestamp and size. */
if (fstat (STDIN_FILENO, &istat) != 0)
{
progerror ("standard input");
break;
}
}
+
+ char *z_lower = xstrdup(z_suffix);
+ strlwr(z_lower);
known_suffixes[suffix_of_builtin
? sizeof known_suffixes / sizeof *known_suffixes - 2
- : 0] = z_suffix;
+ : 0] = z_lower;
suf = known_suffixes + suffix_of_builtin;
nlen = strlen(name);
}
strlwr(suffix);
slen = strlen(suffix);
+ char *match = NULL;
do {
int s = strlen(*suf);
if (slen > s && ! ISSLASH (suffix[slen - s - 1])
&& strequ(suffix + slen - s, *suf)) {
- return name+nlen-s;
+ match = name+nlen-s;
+ break;
}
} while (*++suf != NULL);
+ free(z_lower);
- return NULL;
+ return match;
}
* original name was given and to_stdout is not set.
* Return the compression method, -1 for error, -2 for warning.
* Set inptr to the offset of the next byte to be processed.
- * Updates time_stamp if there is one and --no-time is not used.
+ * Updates time_stamp if there is one and neither -m nor -n is used.
* This function may be called repeatedly for an input file consisting
* of several contiguous gzip'ed members.
* IN assertions: there is at least one remaining compressed member.
uch magic[10]; /* magic header */
int imagic0; /* first magic byte or EOF */
int imagic1; /* like magic[1], but can represent EOF */
- ulg stamp; /* time stamp */
+ ulg stamp; /* timestamp */
/* If --force and --stdout, zcat == cat, so do not complain about
* premature end of file: use try_byte instead of get_byte.
time_stamp.tv_nsec = 0;
}
else
- WARN ((stderr,
- "%s: %s: MTIME %lu out of range for this platform\n",
- program_name, ifname, stamp));
+ {
+ WARN ((stderr,
+ "%s: %s: MTIME %lu out of range for this platform\n",
+ program_name, ifname, stamp));
+ time_stamp.tv_sec = TYPE_MAXIMUM (time_t);
+ time_stamp.tv_nsec = TIMESPEC_RESOLUTION - 1;
+ }
}
magic[8] = get_byte (); /* Ignore extra flags. */
int r;
#ifndef NO_UTIME
+ bool restoring;
struct timespec timespec[2];
timespec[0] = get_stat_atime (ifstat);
timespec[1] = get_stat_mtime (ifstat);
+ restoring = (decompress && 0 <= time_stamp.tv_nsec
+ && ! (timespec[1].tv_sec == time_stamp.tv_sec
+ && timespec[1].tv_nsec == time_stamp.tv_nsec));
+ if (restoring)
+ timespec[1] = time_stamp;
- if (decompress && 0 <= time_stamp.tv_nsec
- && ! (timespec[1].tv_sec == time_stamp.tv_sec
- && timespec[1].tv_nsec == time_stamp.tv_nsec))
+ if (fdutimens (ofd, ofname, timespec) == 0)
{
- timespec[1] = time_stamp;
- if (verbose > 1) {
- fprintf(stderr, "%s: time stamp restored\n", ofname);
+ if (restoring && 1 < verbose) {
+ fprintf(stderr, "%s: timestamp restored\n", ofname);
}
}
-
- if (fdutimens (ofd, ofname, timespec) != 0)
+ else
{
int e = errno;
WARN ((stderr, "%s: ", program_name));
projects / debian / gzip / blobdiff