gzip: fix bug with any upper case custom ('-S'-specified) suffix

[debian/gzip] / bits.c

diff --git a/bits.c b/bits.c
index fb0408b97a4f7d7002457a3eccd864584b77bb19..374d671eb1416d0101d609157956c98d578c731f 100644 (file)
--- a/bits.c
+++ b/bits.c
@@ -1,11 +1,11 @@
 /* bits.c -- output variable-length bit strings
 
 /* bits.c -- output variable-length bit strings
 

-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2009-2017 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
    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 2, or (at your option)
+   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,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -67,16 +67,11 @@
 #include <config.h>
 #include "tailor.h"
 #include "gzip.h"
 #include <config.h>
 #include "tailor.h"
 #include "gzip.h"

-#include "crypt.h"

 
 #ifdef DEBUG
 #  include <stdio.h>
 #endif
 
 
 #ifdef DEBUG
 #  include <stdio.h>
 #endif
 

-#ifdef RCSID
-static char rcsid[] = "$Id$";
-#endif
-

 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */
 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */


@@ -98,7 +93,7 @@ local int bi_valid;
  * are always zero.
  */
 
  * are always zero.
  */
 

-int (*read_buf) OF((char *buf, unsigned size));
+int (*read_buf) (char *buf, unsigned size);

 /* Current input function. Set to mem_read for in-memory compression */
 
 #ifdef DEBUG
 /* Current input function. Set to mem_read for in-memory compression */
 
 #ifdef DEBUG


@@ -122,7 +117,7 @@ void bi_init (zipfile)
      * for in-memory compression.
      */
     if (zfile != NO_FILE) {
      * for in-memory compression.
      */
     if (zfile != NO_FILE) {

-       read_buf  = file_read;
+        read_buf  = file_read;

     }
 }
 
     }
 }
 


@@ -210,10 +205,6 @@ void copy_block(buf, len, header)
     bits_sent += (off_t)len<<3;
 #endif
     while (len--) {
     bits_sent += (off_t)len<<3;
 #endif
     while (len--) {

-#ifdef CRYPT
-        int t;
-       if (key) zencode(*buf, t);
-#endif
-       put_byte(*buf++);
+        put_byte(*buf++);

     }
 }
     }
 }