projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gzip --no-name: avoid spurious warning
[debian/gzip]
/
gzip.c
diff --git
a/gzip.c
b/gzip.c
index d66530a70bdce1d19a2687658e9ef0b9f19a1e18..0fca5a3b129851e7077ae05457e42e8ebc85fcc6 100644
(file)
--- a/
gzip.c
+++ b/
gzip.c
@@
-43,7
+43,7
@@
static char const *const license_msg[] = {
* or stdout with -c option or if stdin used as input.
* If the output file name had to be truncated, the original name is kept
* in the compressed file.
* or stdout with -c option or if stdin used as input.
* If the output file name had to be truncated, the original name is kept
* in the compressed file.
- * On MSDOS, file.tmp -> file.tmz.
On VMS, file.tmp -> file.tmp-gz.
+ * On MSDOS, file.tmp -> file.tmz.
*
* Using gz on MSDOS would create too many file name conflicts. For
* example, foo.txt -> foo.tgz (.tgz must be reserved as shorthand for
*
* Using gz on MSDOS would create too many file name conflicts. For
* example, foo.txt -> foo.tgz (.tgz must be reserved as shorthand for
@@
-63,7
+63,6
@@
static char const *const license_msg[] = {
#include <sys/stat.h>
#include <errno.h>
#include <sys/stat.h>
#include <errno.h>
-#include "closein.h"
#include "tailor.h"
#include "gzip.h"
#include "intprops.h"
#include "tailor.h"
#include "gzip.h"
#include "intprops.h"
@@
-72,6
+71,7
@@
static char const *const license_msg[] = {
#include "timespec.h"
#include "dirname.h"
#include "timespec.h"
#include "dirname.h"
+#include "dosname.h"
#include "fcntl--.h"
#include "getopt.h"
#include "ignore-value.h"
#include "fcntl--.h"
#include "getopt.h"
#include "ignore-value.h"
@@
-206,6
+206,8
@@
static int volatile exiting_signal;
/* If nonnegative, close this file descriptor and unlink ofname on error. */
static int volatile remove_ofname_fd = -1;
/* If nonnegative, close this file descriptor and unlink ofname on error. */
static int volatile remove_ofname_fd = -1;
+static bool stdin_was_read;
+
off_t bytes_in; /* number of input bytes */
off_t bytes_out; /* number of output bytes */
static off_t total_in; /* input bytes for all files */
off_t bytes_in; /* number of input bytes */
off_t bytes_out; /* number of output bytes */
static off_t total_in; /* input bytes for all files */
@@
-317,6
+319,7
@@
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 void remove_output_file (void);
local RETSIGTYPE abort_gzip_signal (int);
local void do_exit (int exitcode) ATTRIBUTE_NORETURN;
+static void finish_out (void);
int main (int argc, char **argv);
static int (*work) (int infile, int outfile) = zip; /* function to call */
int main (int argc, char **argv);
static int (*work) (int infile, int outfile) = zip; /* function to call */
@@
-427,9
+430,7
@@
int main (int argc, char **argv)
program_name = gzip_base_name (argv[0]);
proglen = strlen (program_name);
program_name = gzip_base_name (argv[0]);
proglen = strlen (program_name);
- atexit (close_stdin);
-
- /* Suppress .exe for MSDOS, OS/2 and VMS: */
+ /* Suppress .exe for MSDOS and OS/2: */
if (4 < proglen && strequ (program_name + proglen - 4, ".exe"))
program_name[proglen - 4] = '\0';
if (4 < proglen && strequ (program_name + proglen - 4, ".exe"))
program_name[proglen - 4] = '\0';
@@
-447,7
+448,7
@@
int main (int argc, char **argv)
* gzip even if it is invoked under the name gunzip or zcat.
*
* Systems which do not support links can still use -d or -dc.
* gzip even if it is invoked under the name gunzip or zcat.
*
* Systems which do not support links can still use -d or -dc.
- * Ignore an .exe extension for MSDOS
, OS/2 and VMS
.
+ * Ignore an .exe extension for MSDOS
and OS/2
.
*/
if (strncmp (program_name, "un", 2) == 0 /* ungzip, uncompress */
|| strncmp (program_name, "gun", 3) == 0) /* gunzip */
*/
if (strncmp (program_name, "un", 2) == 0 /* ungzip, uncompress */
|| strncmp (program_name, "gun", 3) == 0) /* gunzip */
@@
-527,13
+528,13
@@
int main (int argc, char **argv)
case 'f':
force++; break;
case 'h': case 'H':
case 'f':
force++; break;
case 'h': case 'H':
- help
(); do_exit(OK
); break;
+ help
(); finish_out (
); break;
case 'k':
keep = 1; break;
case 'l':
list = decompress = to_stdout = 1; break;
case 'L':
case 'k':
keep = 1; break;
case 'l':
list = decompress = to_stdout = 1; break;
case 'L':
- license
(); do_exit(OK
); break;
+ license
(); finish_out (
); break;
case 'm': /* undocumented, may change later */
no_time = 1; break;
case 'M': /* undocumented, may change later */
case 'm': /* undocumented, may change later */
no_time = 1; break;
case 'M': /* undocumented, may change later */
@@
-580,7
+581,7
@@
int main (int argc, char **argv)
case 'v' + ENV_OPTION:
verbose++; quiet = 0; break;
case 'V':
case 'v' + ENV_OPTION:
verbose++; quiet = 0; break;
case 'V':
- version
(); do_exit(OK
); break;
+ version
(); finish_out (
); break;
case 'Z':
#ifdef LZW
do_lzw = 1; break;
case 'Z':
#ifdef LZW
do_lzw = 1; break;
@@
-664,12
+665,22
@@
int main (int argc, char **argv)
} else { /* Standard input */
treat_stdin();
}
} else { /* Standard input */
treat_stdin();
}
- if (list && !quiet && file_count > 1) {
- do_list(-1, -1); /* print totals */
- }
+ if (stdin_was_read && close (STDIN_FILENO) != 0)
+ {
+ strcpy (ifname, "stdin");
+ read_error ();
+ }
+ if (list)
+ {
+ /* Output any totals, and check for output errors. */
+ if (!quiet && 1 < file_count)
+ do_list (-1, -1);
+ if (fflush (stdout) != 0)
+ write_error ();
+ }
if (to_stdout
&& ((synchronous
if (to_stdout
&& ((synchronous
- &&
(fdatasync (STDOUT_FILENO) != 0 && errno != EINVAL)
)
+ &&
fdatasync (STDOUT_FILENO) != 0 && errno != EINVAL
)
|| close (STDOUT_FILENO) != 0)
&& errno != EBADF)
write_error ();
|| close (STDOUT_FILENO) != 0)
&& errno != EBADF)
write_error ();
@@
-757,6
+768,7
@@
local void treat_stdin()
to_stdout = 1;
part_nb = 0;
ifd = STDIN_FILENO;
to_stdout = 1;
part_nb = 0;
ifd = STDIN_FILENO;
+ stdin_was_read = true;
if (decompress) {
method = get_method(ifd);
if (decompress) {
method = get_method(ifd);
@@
-1138,8
+1150,6
@@
local int create_outfile()
* also accepted suffixes. For Unix, we do not want to accept any
* .??z suffix as indicating a compressed file; some people use .xyz
* to denote volume data.
* also accepted suffixes. For Unix, we do not want to accept any
* .??z suffix as indicating a compressed file; some people use .xyz
* to denote volume data.
- * On systems allowing multiple versions of the same file (such as VMS),
- * this function removes any version suffix in the given name.
*/
local char *get_suffix(name)
char *name;
*/
local char *get_suffix(name)
char *name;
@@
-1171,13
+1181,6
@@
local char *get_suffix(name)
: 0] = z_suffix;
suf = known_suffixes + suffix_of_builtin;
: 0] = z_suffix;
suf = known_suffixes + suffix_of_builtin;
-#ifdef SUFFIX_SEP
- /* strip a version number from the file name */
- {
- char *v = strrchr(name, SUFFIX_SEP);
- if (v != NULL) *v = '\0';
- }
-#endif
nlen = strlen(name);
if (nlen <= MAX_SUFFIX+2) {
strcpy(suffix, name);
nlen = strlen(name);
if (nlen <= MAX_SUFFIX+2) {
strcpy(suffix, name);
@@
-1188,7
+1191,7
@@
local char *get_suffix(name)
slen = strlen(suffix);
do {
int s = strlen(*suf);
slen = strlen(suffix);
do {
int s = strlen(*suf);
- if (slen > s &&
suffix[slen-s-1] != PATH_SEP
+ if (slen > s &&
! ISSLASH (suffix[slen - s - 1])
&& strequ(suffix + slen - s, *suf)) {
return name+nlen-s;
}
&& strequ(suffix + slen - s, *suf)) {
return name+nlen-s;
}
@@
-1215,7
+1218,7
@@
open_and_stat (char *name, int flags, struct stat *st)
flags |= O_NOFOLLOW;
else
{
flags |= O_NOFOLLOW;
else
{
-#if
HAVE_LSTAT || defined lstat
+#if
def S_ISLNK
if (lstat (name, st) != 0)
return -1;
else if (S_ISLNK (st->st_mode))
if (lstat (name, st) != 0)
return -1;
else if (S_ISLNK (st->st_mode))
@@
-1290,9
+1293,7
@@
open_input_file (iname, sbuf)
progerror(ifname);
return -1;
}
progerror(ifname);
return -1;
}
- /* file.ext doesn't exist, try adding a suffix (after removing any
- * version number for VMS).
- */
+ /* File.ext doesn't exist. Try adding a suffix. */
s = get_suffix(ifname);
if (s != NULL) {
progerror(ifname); /* ifname already has z suffix and does not exist */
s = get_suffix(ifname);
if (s != NULL) {
progerror(ifname); /* ifname already has z suffix and does not exist */
@@
-1499,7
+1500,7
@@
local int get_method(in)
method = -1; /* unknown yet */
part_nb++; /* number of parts in gzip file */
header_bytes = 0;
method = -1; /* unknown yet */
part_nb++; /* number of parts in gzip file */
header_bytes = 0;
- last_member =
RECORD_IO
;
+ last_member =
0
;
/* assume multiple members in gzip file except for record oriented I/O */
if (memcmp(magic, GZIP_MAGIC, 2) == 0
/* assume multiple members in gzip file except for record oriented I/O */
if (memcmp(magic, GZIP_MAGIC, 2) == 0
@@
-1536,8
+1537,15
@@
local int get_method(in)
stamp |= ((ulg)get_byte()) << 24;
if (stamp != 0 && !no_time)
{
stamp |= ((ulg)get_byte()) << 24;
if (stamp != 0 && !no_time)
{
- time_stamp.tv_sec = stamp;
- time_stamp.tv_nsec = 0;
+ if (stamp <= TYPE_MAXIMUM (time_t))
+ {
+ time_stamp.tv_sec = stamp;
+ time_stamp.tv_nsec = 0;
+ }
+ else
+ WARN ((stderr,
+ "%s: %s: MTIME %lu out of range for this platform\n",
+ program_name, ifname, stamp));
}
magic[8] = get_byte (); /* Ignore extra flags. */
}
magic[8] = get_byte (); /* Ignore extra flags. */
@@
-1742,7
+1750,7
@@
local void do_list(ifd, method)
bytes_out = -1L;
bytes_in = ifile_size;
bytes_out = -1L;
bytes_in = ifile_size;
- if (
!RECORD_IO &&
method == DEFLATED && !last_member) {
+ if (method == DEFLATED && !last_member) {
/* Get the crc and uncompressed size for gzip'ed (not zip'ed) files.
* If the lseek fails, we could use read() to get to the end, but
* --list is used to get quick results.
/* Get the crc and uncompressed size for gzip'ed (not zip'ed) files.
* If the lseek fails, we could use read() to get to the end, but
* --list is used to get quick results.
@@
-1834,8
+1842,7
@@
local void shorten_name(name)
* 1234.678.012.gz -> 123.678.012.gz
*/
do {
* 1234.678.012.gz -> 123.678.012.gz
*/
do {
- p = strrchr(name, PATH_SEP);
- p = p ? p+1 : name;
+ p = last_component (name);
while (*p) {
plen = strcspn(p, PART_SEP);
p += plen;
while (*p) {
plen = strcspn(p, PART_SEP);
p += plen;
@@
-2002,16
+2009,8
@@
local void treat_dir (fd, dir)
continue;
if (len + entrylen < MAX_PATH_LEN - 2) {
strcpy(nbuf,dir);
continue;
if (len + entrylen < MAX_PATH_LEN - 2) {
strcpy(nbuf,dir);
- if (len != 0 /* dir = "" means current dir on Amiga */
-#ifdef PATH_SEP2
- && dir[len-1] != PATH_SEP2
-#endif
-#ifdef PATH_SEP3
- && dir[len-1] != PATH_SEP3
-#endif
- ) {
- nbuf[len++] = PATH_SEP;
- }
+ if (*last_component (nbuf) && !ISSLASH (nbuf[len - 1]))
+ nbuf[len++] = '/';
strcpy (nbuf + len, entry);
treat_file(nbuf);
} else {
strcpy (nbuf + len, entry);
treat_file(nbuf);
} else {
@@
-2091,6
+2090,14
@@
local void do_exit(exitcode)
exit(exitcode);
}
exit(exitcode);
}
+static void
+finish_out (void)
+{
+ if (fclose (stdout) != 0)
+ write_error ();
+ do_exit (OK);
+}
+
/* ========================================================================
* Close and unlink the output file.
*/
/* ========================================================================
* Close and unlink the output file.
*/