Port to Oracle Solaris Studio 12.4

[debian/gzip] / zip.c

diff --git a/zip.c b/zip.c
index a30a5617edbe19d04eb6d7f6ee1d74f355357052..178bfd0752d55629cfdb51f6be61999a079bb0ba 100644 (file)
--- a/zip.c
+++ b/zip.c
@@ -1,6 +1,6 @@
 /* zip.c -- compress files to the gzip or pkzip format
 
-   Copyright (C) 1997-1999, 2006-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-1999, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Copyright (C) 1992-1993 Jean-loup Gailly
 
    This program is free software; you can redistribute it and/or modify
@@ -22,10 +22,6 @@
 
 #include "tailor.h"
 #include "gzip.h"
-#include "crypt.h"
-
-#include <unistd.h>
-#include <fcntl.h>
 
 local ulg crc;       /* crc on uncompressed file data */
 off_t header_bytes;   /* number of bytes in gzip header */
@@ -76,14 +72,14 @@ int zip(in, out)
     if (save_orig_name) {
         char *p = gzip_base_name (ifname); /* Don't save the directory part. */
         do {
-            put_char(*p);
+            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)
    */
@@ -96,7 +92,7 @@ int zip(in, out)
     /* 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;