X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gzip.c;fp=gzip.c;h=48a4849afed434381eb563fdbaaf1fb5578da48d;hb=ad96056bdcf62abd585cdb53768fbabdde75d1b5;hp=b18a0a9103a90c2813fa3261a930ef9b2d7c2f83;hpb=302189d124ed5849c2589ea92e912eb24fdc4ab3;p=debian%2Fgzip

diff --git a/gzip.c b/gzip.c
index b18a0a9..48a4849 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1,5 +1,5 @@
 /* gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
- * Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
  * Copyright (C) 1992-1993 Jean-loup Gailly
  * 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'
@@ -11,7 +11,7 @@
  */
 
 static char  *license_msg[] = {
-"Copyright 2001 Free Software Foundation",
+"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",
@@ -103,6 +103,9 @@ static char rcsid[] = "$Id: gzip.c,v 0.24 1993/06/24 10:52:07 jloup Exp $";
 #    define DIR_OPT "NO_DIR"
 #  endif
 #endif
+#ifndef NO_DIR
+# define NO_DIR 0
+#endif
 
 #ifdef CLOSEDIR_VOID
 # define CLOSEDIR(d) (closedir(d), 0)
@@ -110,6 +113,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 <utime.h>
@@ -234,7 +241,7 @@ 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) */
-int  z_len;           /* strlen(z_suffix) */
+size_t z_len;         /* strlen(z_suffix) */
 
 off_t bytes_in;             /* number of input bytes */
 off_t bytes_out;            /* number of output bytes */
@@ -306,7 +313,7 @@ local void do_exit      OF((int exitcode));
       int main          OF((int argc, char **argv));
 int (*work) OF((int infile, int outfile)) = zip; /* function to call */
 
-#ifndef NO_DIR
+#if ! NO_DIR
 local void treat_dir    OF((char *dir));
 #endif
 #ifdef HAVE_UTIME
@@ -320,17 +327,7 @@ local void usage()
 {
     printf ("usage: %s [-%scdfhlLnN%stvV19] [-S suffix] [file ...]\n",
 	    progname,
-#if O_BINARY
-	    "a",
-#else
-	    "",
-#endif
-#ifdef NO_DIR
-	    ""
-#else
-	    "r"
-#endif
-	    );
+	    O_BINARY ? "a" : "", NO_DIR ? "" : "r");
 }
 
 /* ======================================================================== */
@@ -355,7 +352,7 @@ local void help()
  " -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",
-#ifndef NO_DIR
+#if ! NO_DIR
  " -r --recursive   operate recursively on directories",
 #endif
  " -S .suf  --suffix .suf     use suffix .suf on compressed files",
@@ -539,7 +536,7 @@ int main (argc, argv)
 	case 'q':
 	    quiet = 1; verbose = 0; break;
 	case 'r':
-#ifdef NO_DIR
+#if NO_DIR
 	    fprintf(stderr, "%s: -r not supported on this system\n", progname);
 	    usage();
 	    do_exit(ERROR); break;
@@ -603,7 +600,7 @@ int main (argc, argv)
 #endif
     if ((z_len == 0 && !decompress) || z_len > MAX_SUFFIX) {
         fprintf(stderr, "%s: incorrect suffix '%s'\n",
-                progname, optarg);
+                progname, z_suffix);
         do_exit(ERROR);
     }
     if (do_lzw && !decompress) work = lzw;
@@ -773,7 +770,7 @@ local void treat_file(iname)
 
     /* If the input name is that of a directory, recurse or ignore: */
     if (S_ISDIR(istat.st_mode)) {
-#ifndef NO_DIR
+#if ! NO_DIR
 	if (recursive) {
 	    struct stat st;
 	    st = istat;
@@ -976,11 +973,9 @@ local int do_stat(name, sbuf)
     struct stat *sbuf;
 {
     errno = 0;
-#ifdef HAVE_LSTAT
     if (!to_stdout && !force) {
 	return lstat(name, sbuf);
     }
-#endif
     return stat(name, sbuf);
 }
 
@@ -1543,7 +1538,7 @@ local int name_too_long(name, statb)
 
     tstat = *statb;      /* Just in case OS does not fill all fields */
     name[s-1] = '\0';
-    res = stat(name, &tstat) == 0 && same_file(statb, &tstat);
+    res = lstat(name, &tstat) == 0 && same_file(statb, &tstat);
     name[s-1] = c;
     Trace((stderr, " too_long(%s) => %d\n", name, res));
     return res;
@@ -1633,12 +1628,12 @@ local int check_ofname()
      * instead of silently truncating filenames).
      */
     errno = 0;
-    while (stat(ofname, &ostat) != 0) {
+    while (lstat(ofname, &ostat) != 0) {
         if (errno != ENAMETOOLONG) return 0; /* ofname does not exist */
 	shorten_name(ofname);
     }
 #else
-    if (stat(ofname, &ostat) != 0) return 0;
+    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
@@ -1646,7 +1641,7 @@ local int check_ofname()
      */
     if (!decompress && name_too_long(ofname, &ostat)) {
 	shorten_name(ofname);
-	if (stat(ofname, &ostat) != 0) return 0;
+	if (lstat(ofname, &ostat) != 0) return 0;
     }
 
     /* Check that the input and output files are different (could be
@@ -1753,7 +1748,7 @@ local void copy_stat(ifstat)
     }
 }
 
-#ifndef NO_DIR
+#if ! NO_DIR
 
 /* ========================================================================
  * Recurse through the given directory. This code is taken from ncompress.
@@ -1819,7 +1814,7 @@ local void treat_dir(dir)
     if (CLOSEDIR(dirp) != 0)
 	progerror(dir);
 }
-#endif /* ? NO_DIR */
+#endif /* ! NO_DIR */
 
 /* ========================================================================
  * Free all dynamically allocated variables and exit with the given code.