zgz: Add -T,--timestamp flag to explicitly set timestamp

diff --git a/debian/changelog b/debian/changelog
index f23b1fa..bbc2b57 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ pristine-tar (0.19) unstable; urgency=low
   * Allow the empty string as an original filename in zgz, rather than
     treating the empty string as a flag to not store an original filename.
   * Fix zgz's usage message to stop identifying the program as gzip.
+  * Add a new -T,--timestamp flag to zgz, to explicitly set the timestamp
+    stored in the gzip file, rather than taking the timestamp of the input
+    file.
 
  -- Josh Triplett <josh@freedesktop.org>  Thu, 27 Nov 2008 19:54:29 -0800
 

diff --git a/debian/copyright b/debian/copyright
index 9ec4512..698af0b 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ License: GPL-2+
 Files: zgz.c
 Copyright: © 1997, 1998, 2003, 2004, 2006 Matthew R. Green
  © 2007 Faidon Liambotis
+ © 2008 Josh Triplett
 License: BSD-3
  On Debian systems, the complete text of the 3 clause BSD license can be
  found in /usr/share/common-licenses/BSD.

diff --git a/zgz.c b/zgz.c
index 236d6a9..f58bfe9 100644 (file)
--- a/zgz.c
+++ b/zgz.c
@@ -1,5 +1,6 @@
 /*
- * Author: Faidon Liambotis <paravoid@debian.org>
+ * Authors: Faidon Liambotis <paravoid@debian.org>
+ *          Josh Triplett <josh@joshtriplett.org>
  *
  * This is a zlib-based gzip that is heavily based on NetBSD's gzip,
  * developed by Matthew R. Green.
@@ -11,6 +12,7 @@
  *
  * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
  * Copyright (c) 2007 Faidon Liambotis
+ * Copyright (c) 2008 Josh Triplett
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -101,10 +103,12 @@ static suffixes_t suffixes[] = {
 static const char      gzip_version[] = "zgz 20071002 based on NetBSD gzip 20060927";
 
 static const char      gzip_copyright[] = \
-" Author: Faidon Liambotis <paravoid@debian.org>\n"
+" Authors: Faidon Liambotis <paravoid@debian.org>\n"
+"          Josh Triplett <josh@joshtriplett.org>\n"
 "\n"
 " Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n"
 " Copyright (c) 2007 Faidon Liambotis\n"
+" Copyright (c) 2008 Josh Triplett\n"
 " * All rights reserved.\n"
 " *\n"
 " * Redistribution and use in source and binary forms, with or without\n"
@@ -138,6 +142,8 @@ static      int     nflag;                  /* don't save name (impiles -m) */
 static int     Nflag;                  /* restore name/timestamp */
 static int     mflag;                  /* undocumented: don't save timestamp */
 static int     qflag;                  /* quiet mode */
+static int     Tflag;                  /* force timestamp */
+static uint32_t        timestamp;      /* forced timestamp */
 static int     xflag = -1;             /* don't set Extra Flags (i.e. compression level)
                                           binary compatibility with an older, buggy version */
 static int     osflag = GZIP_OS_UNIX;  /* Unix or otherwise */
@@ -184,6 +190,7 @@ static const struct option longopts[] = {
        /* new options */
        { "no-timestamp",       no_argument,            0,      'm' },
        { "force-timestamp",    no_argument,            0,      'M' },
+       { "timestamp",          required_argument,      0,      'T' },
        { "osflag",             required_argument,      0,      's' },
        { "original-name",      required_argument,      0,      'o' },
        { "quirk",              required_argument,      0,      'k' },
@@ -223,7 +230,7 @@ main(int argc, char **argv)
                argv++;
        }
 
-#define OPT_LIST "123456789acdfhLNnMmqrVo:k:s:"
+#define OPT_LIST "123456789acdfhLNnMmqrT:Vo:k:s:"
 
        while ((ch = getopt_long(argc, argv, OPT_LIST, longopts, NULL)) != -1) {
                switch (ch) {
@@ -286,6 +293,10 @@ main(int argc, char **argv)
                                usage();
                        }
                        break;
+               case 'T':
+                       timestamp = atoi(optarg);
+                       Tflag = 1;
+                       break;
                case 'r':
                        fprintf(stderr, "%s: recursive is not supported on this version\n", progname);
                        usage();
@@ -698,7 +709,8 @@ file_compress(char *file, char *origname, char *outfile, size_t outsize)
                out = STDOUT_FILENO;
        }
 
-       insize = gz_compress(in, out, &size, origname, (uint32_t)isb.st_mtime);
+       insize = gz_compress(in, out, &size, origname,
+                            Tflag ? timestamp : (uint32_t)isb.st_mtime);
 
        (void)close(in);
 
@@ -755,25 +767,30 @@ handle_stdout(char *origname)
                maybe_warnx("standard output is a terminal -- ignoring");
                return;
        }
-       /* If stdin is a file use it's mtime, otherwise use current time */
-       ret = fstat(STDIN_FILENO, &sb);
-
-       if (ret < 0) {
-               maybe_warn("Can't stat stdin");
-               return;
-       }
 
-       if (S_ISREG(sb.st_mode))
-               mtime = (uint32_t)sb.st_mtime;
+       if (Tflag)
+               mtime = timestamp;
        else {
-               systime = time(NULL);
-               if (systime == -1) {
-                       maybe_warn("time");
+               /* If stdin is a file use it's mtime, otherwise use current time */
+               ret = fstat(STDIN_FILENO, &sb);
+
+               if (ret < 0) {
+                       maybe_warn("Can't stat stdin");
                        return;
-               } 
-               mtime = (uint32_t)systime;
+               }
+
+               if (S_ISREG(sb.st_mode))
+                       mtime = (uint32_t)sb.st_mtime;
+               else {
+                       systime = time(NULL);
+                       if (systime == -1) {
+                               maybe_warn("time");
+                               return;
+                       }
+                       mtime = (uint32_t)systime;
+               }
        }
-                       
+
        usize = gz_compress(STDIN_FILENO, STDOUT_FILENO, &gsize, origname, mtime);
 }
 
@@ -847,7 +864,8 @@ usage(void)
     " -o NAME\n"
     "    --original-name NAME  use NAME as the original file name\n"
     " -k --quirk QUIRK         enable a format quirk (buggy-bsd, ntfs)\n"
-    " -s --osflag              set the OS flag to something different than 03 (Unix)\n");
+    " -s --osflag              set the OS flag to something different than 03 (Unix)\n"
+    " -T --timestamp SECONDS   set the timestamp to the specified number of seconds\n");
        exit(0);
 }
 

diff --git a/zgz.pod b/zgz.pod
index f3d4d5b..f353b95 100644 (file)
--- a/zgz.pod
+++ b/zgz.pod
@@ -22,6 +22,7 @@ reproducing builds of gz files that are bit-identical to the originals.
 =head1 AUTHOR
 
 Matthew R. Green,
-Faidon Liambotis
+Faidon Liambotis,
+Josh Triplett
 
 =cut