try again

[debian/gzip] / zip.c

diff --git a/zip.c b/zip.c
index 12d59c536e7d3dac8a23140175a9d36f16962814..90b614c70e60cacbd9d39756a316e35bc00fa773 100644 (file)
--- a/zip.c
+++ b/zip.c
@@ -1,26 +1,30 @@
 /* zip.c -- compress files to the gzip or pkzip format
- * Copyright (C) 1992-1993 Jean-loup Gailly
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License, see the file COPYING.
- */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: zip.c,v 0.17 1993/06/10 13:29:25 jloup Exp $";
-#endif
+   Copyright (C) 1997-1999, 2006-2007, 2009-2012 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 3, 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.  */
 
 #include <config.h>
 #include <ctype.h>
 
 #include "tailor.h"
 #include "gzip.h"
-#include "crypt.h"
 
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
+#include <unistd.h>
+#include <fcntl.h>
 
 local ulg crc;       /* crc on uncompressed file data */
 off_t header_bytes;   /* number of bytes in gzip header */
@@ -36,6 +40,7 @@ int zip(in, out)
     uch  flags = 0;         /* general purpose bit flags */
     ush  attr = 0;          /* ascii/binary flag */
     ush  deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */
+    ulg  stamp;
 
     ifd = in;
     ofd = out;
@@ -49,11 +54,13 @@ int zip(in, out)
     put_byte(DEFLATED);      /* compression method */
 
     if (save_orig_name) {
-       flags |= ORIG_NAME;
+        flags |= ORIG_NAME;
     }
     put_byte(flags);         /* general flags */
-    put_long(time_stamp == (time_stamp & 0xffffffff)
-            ? (ulg)time_stamp : (ulg)0);
+    stamp = (0 <= time_stamp.tv_sec && time_stamp.tv_sec <= 0xffffffff
+             ? (ulg) time_stamp.tv_sec
+             : (ulg) 0);
+    put_long (stamp);
 
     /* Write deflated file to zip file */
     crc = updcrc(0, 0);
@@ -66,29 +73,29 @@ int zip(in, out)
     put_byte(OS_CODE);            /* OS identifier */
 
     if (save_orig_name) {
-       char *p = base_name(ifname); /* Don't save the directory part. */
-       do {
-           put_char(*p);
-       } while (*p++);
+        char *p = gzip_base_name (ifname); /* Don't save the directory part. */
+        do {
+            put_byte (*p);
+        } while (*p++);
     }
     header_bytes = (off_t)outcnt;
 
     (void)deflate();
 
-#if !defined(NO_SIZE_CHECK) && !defined(RECORD_IO)
+#ifndef NO_SIZE_CHECK
   /* Check input size (but not in VMS -- variable record lengths mess it up)
    * and not on MSDOS -- diet in TSR mode reports an incorrect file size)
    */
     if (ifile_size != -1L && bytes_in != ifile_size) {
-       fprintf(stderr, "%s: %s: file size changed while zipping\n",
-               progname, ifname);
+        fprintf(stderr, "%s: %s: file size changed while zipping\n",
+                program_name, ifname);
     }
 #endif
 
     /* Write the crc and uncompressed size */
     put_long(crc);
     put_long((ulg)bytes_in);
-    header_bytes += 2*sizeof(long);
+    header_bytes += 2*4;
 
     flush_outbuf();
     return OK;
@@ -108,11 +115,11 @@ int file_read(buf, size)
 
     Assert(insize == 0, "inbuf not empty");
 
-    len = read(ifd, buf, size);
+    len = read_buffer (ifd, buf, size);
     if (len == 0) return (int)len;
     if (len == (unsigned)-1) {
-       read_error();
-       return EOF;
+        read_error();
+        return EOF;
     }
 
     crc = updcrc((uch*)buf, len);