Nabble - Gnu - Gzip

warning clean-up

2009-11-20T12:08:10Z

I've just pushed a bunch of changes:

Here's a summary:

[PATCH 01/10] build: "make stable" emitted an invalid gnupload command
[PATCH 02/10] maint: cfg.mk: remove factored-out ftp host/dir definitions
[PATCH 03/10] maint: tweak formatting of bootstrap.conf
[PATCH 04/10] build: enable many warnings
[PATCH 05/10] build: use gnulib's fdopendir module
[PATCH 06/10] build: avoid warnings from -Wstrict-prototypes
[PATCH 07/10] build: avoid many const-related warnings
[PATCH 08/10] build: util.c: avoid warnings about add_envopt
[PATCH 09/10] build: avoid warnings about unused macros
[PATCH 10/10] build: unlzw.c: avoid warnings about unused macros

Makefile.am | 2 -
b/Makefile.am | 1
b/README-release | 2 -
b/bootstrap.conf | 59 ++++++++++++++++++--------------------
b/cfg.mk | 5 +--
b/configure.ac | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
b/deflate.c | 5 ---
b/gnulib | 3 -
b/gzip.c | 7 ----
b/gzip.h | 6 +--
b/lib/.gitignore | 37 ++++++++++++++++++++++++
b/m4/.gitignore | 3 +
b/unzip.c | 3 -
b/util.c | 15 +++------
bootstrap.conf | 4 +-
cfg.mk | 10 ------
configure.ac | 5 +--
gzip.c | 32 +++++++++-----------
m4/.gitignore | 22 +++++++++++++-
util.c | 18 +++++------
20 files changed, 218 insertions(+), 105 deletions(-)

[PATCH 10/10] build: unlzw.c: avoid warnings about unused macros

2009-11-20T12:06:21Z

From: Jim Meyering <meyering@...>

* configure.ac: Turn off -Wunused-macros.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index d87c5f3..6442ab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ if test "$gl_gcc_warnings" = yes; then
# initial problems in gzip
nw="$nw -Wold-style-definition"
nw="$nw -Wshadow"
+ nw="$nw -Wunused-macros"
# ?? -Wstrict-overflow

gl_MANYWARN_ALL_GCC([ws])
@@ -120,7 +121,6 @@ if test "$gl_gcc_warnings" = yes; then
# Remove the following and save the result in GNULIB_WARN_CFLAGS.
nw=
nw="$nw -Wuninitialized"
- nw="$nw -Wunused-macros"
nw="$nw -Wmissing-prototypes"
nw="$nw -Wold-style-definition"
gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
--
1.6.5.3.433.g11067

[PATCH 09/10] build: avoid warnings about unused macros

2009-11-20T12:06:20Z

From: Jim Meyering <meyering@...>

* unzip.c (LOCTIM): Comment out unused macro.
* deflate.c (EQUAL): Remove definition. Use "0" at sole point of use.
---
deflate.c | 5 +----
unzip.c | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/deflate.c b/deflate.c
index 3ba514d..3041864 100644
--- a/deflate.c
+++ b/deflate.c
@@ -251,9 +251,6 @@ local config configuration_table[10] = {
* meaning.
*/

-#define EQUAL 0
-/* result of memcmp for equal strings */
-
/* ===========================================================================
* Prototypes for local functions.
*/
@@ -500,7 +497,7 @@ local void check_match(start, match, length)
{
/* check that the match is indeed a match */
if (memcmp((char*)window + match,
- (char*)window + start, length) != EQUAL) {
+ (char*)window + start, length) != 0) {
fprintf(stderr,
" start %d, match %d, length %d\n",
start, match, length);
diff --git a/unzip.c b/unzip.c
index ceadbbc..a389e8a 100644
--- a/unzip.c
+++ b/unzip.c
@@ -39,7 +39,7 @@
#define CRPFLG 1 /* bit for encrypted entry */
#define EXTFLG 8 /* bit for extended local header */
#define LOCHOW 8 /* offset of compression method */
-#define LOCTIM 10 /* file mod time (for decryption) */
+/* #define LOCTIM 10 UNUSED file mod time (for decryption) */
#define LOCCRC 14 /* offset of crc */
#define LOCSIZ 18 /* offset of compressed size */
#define LOCLEN 22 /* offset of uncompressed length */
--
1.6.5.3.433.g11067

[PATCH 08/10] build: util.c: avoid warnings about add_envopt

2009-11-20T12:06:19Z

From: Jim Meyering <meyering@...>

* util.c (add_envopt): The parameter "env" was used for two conflicting
purposes. One use required a const char* parameter, while the other
was used as an argument to free, which must not be "const".
Rename the parameter and use a new local variable for the second role.
---
util.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/util.c b/util.c
index 6bd0987..d0d7774 100644
--- a/util.c
+++ b/util.c
@@ -360,20 +360,21 @@ int strcspn(s, reject)
char *add_envopt(
int *argcp, /* pointer to argc */
char ***argvp, /* pointer to argv */
- char const *env) /* name of environment variable */
+ char const *envvar_name) /* name of environment variable */
{
char *p; /* running pointer through env variable */
char **oargv; /* runs through old argv array */
char **nargv; /* runs through new argv array */
int oargc = *argcp; /* old argc */
int nargc = 0; /* number of arguments in env variable */
+ char *env_val;

- env = (char*)getenv(env);
- if (env == NULL) return NULL;
+ env_val = getenv(envvar_name);
+ if (env_val == NULL) return NULL;

- env = xstrdup (env);
+ env_val = xstrdup (env_val);

- for (p = env; *p; nargc++ ) { /* move through env */
+ for (p = env_val; *p; nargc++ ) { /* move through env_val */
p += strspn(p, SEPARATOR); /* skip leading separators */
if (*p == '\0') break;

@@ -381,7 +382,7 @@ char *add_envopt(
if (*p) *p++ = '\0'; /* mark it */
}
if (nargc == 0) {
- free(env);
+ free(env_val);
return NULL;
}
*argcp += nargc;
@@ -398,7 +399,7 @@ char *add_envopt(
*(nargv++) = *(oargv++);

/* Then copy the environment args */
- for (p = env; nargc > 0; nargc--) {
+ for (p = env_val; nargc > 0; nargc--) {
p += strspn(p, SEPARATOR); /* skip separators */
*(nargv++) = p; /* store start */
while (*p++) ; /* skip over word */
@@ -407,7 +408,7 @@ char *add_envopt(
/* Finally copy the old args and add a NULL (usual convention) */
while (oargc--) *(nargv++) = *(oargv++);
*nargv = NULL;
- return env;
+ return env_val;
}

/* ========================================================================
--
1.6.5.3.433.g11067

[PATCH 07/10] build: avoid many const-related warnings

2009-11-20T12:06:18Z

From: Jim Meyering <meyering@...>

* gzip.c: Add "const" to many variables, to avoid compiler warnings.
* util.c (add_envopt): Make 3rd parameter const
(gzip_error): Make sole parameter const.
* gzip.h: Update prototypes.
---
gzip.c | 24 ++++++++++++------------
gzip.h | 6 +++---
util.c | 14 ++++++--------
3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/gzip.c b/gzip.c
index c1280d2..07bebc3 100644
--- a/gzip.c
+++ b/gzip.c
@@ -28,7 +28,7 @@
* See the file algorithm.doc for the compression algorithms and file formats.
*/

-static char *license_msg[] = {
+static char const *const license_msg[] = {
"Copyright (C) 2007 Free Software Foundation, Inc.",
"Copyright (C) 1993 Jean-loup Gailly.",
"This is free software. You may redistribute copies of it under the terms of",
@@ -203,7 +203,7 @@ struct timespec time_stamp; /* original time stamp (modification time) */
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) */
+char const *z_suffix; /* default suffix (can be set with --suffix) */
size_t z_len; /* strlen(z_suffix) */

/* The set of signals that are caught. */
@@ -327,7 +327,7 @@ try_help ()
/* ======================================================================== */
local void help()
{
- static char *help_msg[] = {
+ static char const* const help_msg[] = {
"Compress or uncompress FILEs (by default, compress FILES in-place).",
"",
"Mandatory arguments to long options are mandatory for short options too.",
@@ -368,7 +368,7 @@ local void help()
"",
"Report bugs to <bug-gzip@...>.",
0};
- char **p = help_msg;
+ char const *const *p = help_msg;

printf ("Usage: %s [OPTION]... [FILE]...\n", program_name);
while (*p) printf ("%s\n", *p++);
@@ -377,7 +377,7 @@ local void help()
/* ======================================================================== */
local void license()
{
- char **p = license_msg;
+ char const *const *p = license_msg;

printf ("%s %s\n", program_name, VERSION);
while (*p) printf ("%s\n", *p++);
@@ -970,13 +970,13 @@ local char *get_suffix(name)
{
int nlen, slen;
char suffix[MAX_SUFFIX+3]; /* last chars of name, forced to lower case */
- static char *known_suffixes[] =
+ static char const *known_suffixes[] =
{NULL, ".gz", ".z", ".taz", ".tgz", "-gz", "-z", "_z",
#ifdef MAX_EXT_CHARS
"z",
#endif
NULL};
- char **suf = known_suffixes;
+ char const **suf = known_suffixes;

*suf = z_suffix;
if (strequ(z_suffix, "z")) suf++; /* check long suffixes first */
@@ -1061,9 +1061,9 @@ open_input_file (iname, sbuf)
{
int ilen; /* strlen(ifname) */
int z_suffix_errno = 0;
- static char *suffixes[] = {NULL, ".gz", ".z", "-z", ".Z", NULL};
- char **suf = suffixes;
- char *s;
+ static char const *suffixes[] = {NULL, ".gz", ".z", "-z", ".Z", NULL};
+ char const **suf = suffixes;
+ char const *s;
#ifdef NO_MULTIPLE_DOTS
char *dot; /* pointer to ifname extension, or NULL */
#endif
@@ -1107,7 +1107,7 @@ open_input_file (iname, sbuf)

/* Search for all suffixes */
do {
- char *s0 = s = *suf;
+ char const *s0 = s = *suf;
strcpy (ifname, iname);
#ifdef NO_MULTIPLE_DOTS
if (*s == '.') s++;
@@ -1448,7 +1448,7 @@ local void do_list(ifd, method)
{
ulg crc; /* original crc */
static int first_time = 1;
- static char* methods[MAX_METHODS] = {
+ static char const *const methods[MAX_METHODS] = {
"store", /* 0 */
"compr", /* 1 */
"pack ", /* 2 */
diff --git a/gzip.h b/gzip.h
index c4f890f..1ab89e6 100644
--- a/gzip.h
+++ b/gzip.h
@@ -329,10 +329,10 @@ extern char *strlwr OF((char *s));
extern char *gzip_base_name OF((char *fname));
extern int xunlink OF((char *fname));
extern void make_simple_name OF((char *name));
-extern char *add_envopt OF((int *argcp, char ***argvp, char *env));
-extern void gzip_error OF((char *m)) ATTRIBUTE_NORETURN;
+extern char *add_envopt OF((int *argcp, char ***argvp, char const *env));
+extern void gzip_error OF((char const *m)) ATTRIBUTE_NORETURN;
extern void xalloc_die OF((void)) ATTRIBUTE_NORETURN;
-extern void warning OF((char *m));
+extern void warning OF((char const *m));
extern void read_error OF((void));
extern void write_error OF((void));
extern void display_ratio OF((off_t num, off_t den, FILE *file));
diff --git a/util.c b/util.c
index 40b36fc..6bd0987 100644
--- a/util.c
+++ b/util.c
@@ -357,10 +357,10 @@ int strcspn(s, reject)
*/
#define SEPARATOR " \t" /* separators in env variable */

-char *add_envopt(argcp, argvp, env)
- int *argcp; /* pointer to argc */
- char ***argvp; /* pointer to argv */
- char *env; /* name of environment variable */
+char *add_envopt(
+ int *argcp, /* pointer to argc */
+ char ***argvp, /* pointer to argv */
+ char const *env) /* name of environment variable */
{
char *p; /* running pointer through env variable */
char **oargv; /* runs through old argv array */
@@ -414,8 +414,7 @@ char *add_envopt(argcp, argvp, env)
* Error handlers.
*/
void
-gzip_error (m)
- char *m;
+gzip_error (char const *m)
{
fprintf (stderr, "\n%s: %s: %s\n", program_name, ifname, m);
abort_gzip();
@@ -428,8 +427,7 @@ xalloc_die ()
abort_gzip ();
}

-void warning (m)
- char *m;
+void warning (char const *m)
{
WARN ((stderr, "%s: %s: warning: %s\n", program_name, ifname, m));
}
--
1.6.5.3.433.g11067

[PATCH 06/10] build: avoid warnings from -Wstrict-prototypes

2009-11-20T12:06:17Z

From: Jim Meyering <meyering@...>

* gzip.c (main): Declare using a prototype.
(progerror): Likewise. And make parameter const.
---
gzip.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gzip.c b/gzip.c
index ec3c585..c1280d2 100644
--- a/gzip.c
+++ b/gzip.c
@@ -391,8 +391,7 @@ local void version()
printf ("Written by Jean-loup Gailly.\n");
}

-local void progerror (string)
- char *string;
+local void progerror (char const *string)
{
int e = errno;
fprintf (stderr, "%s: ", program_name);
@@ -402,9 +401,7 @@ local void progerror (string)
}

/* ======================================================================== */
-int main (argc, argv)
- int argc;
- char **argv;
+int main (int argc, char **argv)
{
int file_count; /* number of files to process */
size_t proglen; /* length of program_name */
--
1.6.5.3.433.g11067

[PATCH 05/10] build: use gnulib's fdopendir module

2009-11-20T12:06:16Z

From: Jim Meyering <meyering@...>

* bootstrap.conf (gnulib_modules): Add fdopendir.
* gzip.c (treat_dir): Don't depend on HAVE_FDOPENDIR.
Gnulib now guarantees its availability.
* configure.ac: Don't check for fdopendir here.
---
Makefile.am | 2 +-
bootstrap.conf | 3 ++-
configure.ac | 2 +-
gzip.c | 7 -------
lib/.gitignore | 37 +++++++++++++++++++++++++++++++++++++
m4/.gitignore | 21 +++++++++++++++++++++
6 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 406e344..cfde8e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
SUBDIRS = lib doc
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I$(top_srcdir)/lib
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS) # $(WERROR_CFLAGS)

man_MANS = gunzip.1 gzexe.1 gzip.1 \
zcat.1 zcmp.1 zdiff.1 zforce.1 zgrep.1 zless.1 zmore.1 znew.1
diff --git a/bootstrap.conf b/bootstrap.conf
index 913deab..f0afe13 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -29,14 +29,15 @@ fclose
fcntl
fcntl-safer
fdl
+fdopendir
fprintf-posix
getopt-gnu
git-version-gen
gitlog-to-changelog
gnu-make
gnu-web-doc-update
-gnupload
gnumakefile
+gnupload
lstat
maintainer-makefile
malloc
diff --git a/configure.ac b/configure.ac
index 7ae9863..d87c5f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,7 @@ AC_ISC_POSIX
AC_C_CONST
AC_HEADER_STDC
AC_CHECK_HEADERS_ONCE(fcntl.h limits.h memory.h time.h)
-AC_CHECK_FUNCS_ONCE([chown fchmod fchown fdopendir lstat siginterrupt])
+AC_CHECK_FUNCS_ONCE([chown fchmod fchown lstat siginterrupt])
AC_HEADER_DIRENT
AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
diff --git a/gzip.c b/gzip.c
index b0f792a..ec3c585 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1717,18 +1717,11 @@ local void treat_dir (fd, dir)
char nbuf[MAX_PATH_LEN];
int len;

-#if HAVE_FDOPENDIR
dirp = fdopendir (fd);
-#else
- close (fd);
- dirp = opendir(dir);
-#endif

if (dirp == NULL) {
progerror(dir);
-#if HAVE_FDOPENDIR
close (fd);
-#endif
return ;
}
/*
diff --git a/lib/.gitignore b/lib/.gitignore
index 5dc27b6..e7eba30 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -4,8 +4,13 @@ Makefile.in
alloca.h
alloca.in.h
asnprintf.c
+at-func.c
+basename-lgpl.c
calloc.c
charset.alias
+chdir-long.c
+chdir-long.h
+chown.c
close-hook.c
close-hook.h
close-stream.c
@@ -20,6 +25,11 @@ config.h
config.hin
configmake.h
creat-safer.c
+dirent.h
+dirent.in.h
+dirfd.c
+dirname-lgpl.c
+dirname.h
dup-safer.c
dup2.c
errno.h
@@ -28,6 +38,10 @@ error.c
error.h
exitfail.c
exitfail.h
+fchdir.c
+fchmodat.c
+fchown-stub.c
+fchownat.c
fclose.c
fcntl--.h
fcntl-safer.h
@@ -35,6 +49,7 @@ fcntl.h
fcntl.in.h
fcntl_.h
fd-safer.c
+fdopendir.c
fflush.c
float+.h
float.h
@@ -54,7 +69,9 @@ frexpl.c
fseeko.c
fseterr.c
fseterr.h
+fstatat.c
ftello.c
+getcwd.c
getopt.c
getopt.h
getopt.in.h
@@ -73,6 +90,7 @@ isnanf-nolibm.h
isnanf.c
isnanl-nolibm.h
isnanl.c
+lchown.c
libgzip.a
localcharset.c
localcharset.h
@@ -85,8 +103,17 @@ mbrtowc.c
mbsinit.c
memchr.c
memchr.valgrind
+mempcpy.c
+memrchr.c
+mkdir.c
+mkdirat.c
open-safer.c
open.c
+openat-die.c
+openat-priv.h
+openat-proc.c
+openat.c
+openat.h
perror.c
pipe-safer.c
printf-args.c
@@ -105,6 +132,10 @@ ref-add.sed
ref-add.sin
ref-del.sed
ref-del.sin
+rmdir.c
+same-inode.h
+save-cwd.c
+save-cwd.h
signbitd.c
signbitf.c
signbitl.c
@@ -127,10 +158,12 @@ stdio_.h
stdlib.h
stdlib.in.h
stdlib_.h
+strdup.c
streq.h
strerror.c
string.h
string.in.h
+stripslash.c
sys
sys_stat.h
sys_stat.in.h
@@ -147,6 +180,8 @@ unistd-safer.h
unistd.h
unistd.in.h
unistd_.h
+unlink.c
+unlinkat.c
utimens.c
utimens.h
vasnprintf.c
@@ -161,6 +196,8 @@ wctype.in.h
wctype_.h
xalloc-die.c
xalloc.h
+xgetcwd.c
+xgetcwd.h
xmalloc.c
xsize.h
yesno.c
diff --git a/m4/.gitignore b/m4/.gitignore
index 765c33e..701b2ad 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -2,13 +2,20 @@
absolute-header.m4
alloca.m4
calloc.m4
+chdir-long.m4
+chown.m4
clock_time.m4
close-stream.m4
close.m4
closein.m4
closeout.m4
codeset.m4
+d-ino.m4
+dirent_h.m4
+dirfd.m4
+dirname.m4
dos.m4
+double-slash-root.m4
dup2.m4
errno_h.m4
error.m4
@@ -17,9 +24,11 @@ exponentd.m4
exponentf.m4
exponentl.m4
extensions.m4
+fchdir.m4
fclose.m4
fcntl-safer.m4
fcntl_h.m4
+fdopendir.m4
fflush.m4
float_h.m4
fpending.m4
@@ -31,6 +40,9 @@ frexp.m4
frexpl.m4
fseeko.m4
ftello.m4
+getcwd-abort-bug.m4
+getcwd-path-max.m4
+getcwd.m4
getopt.m4
getpagesize.m4
gettime.m4
@@ -48,6 +60,7 @@ inttypes_h.m4
isnand.m4
isnanf.m4
isnanl.m4
+lchown.m4
ldexpl.m4
localcharset.m4
locale-fr.m4
@@ -63,6 +76,9 @@ mbrtowc.m4
mbsinit.m4
mbstate_t.m4
memchr.m4
+mempcpy.m4
+memrchr.m4
+mkdir.m4
mmap-anon.m4
mode_t.m4
multiarch.m4
@@ -76,6 +92,8 @@ printf-posix-rpl.m4
printf.m4
quotearg.m4
realloc.m4
+rmdir.m4
+save-cwd.m4
signbit.m4
size_max.m4
stat-time.m4
@@ -86,6 +104,7 @@ stdint.m4
stdint_h.m4
stdio_h.m4
stdlib_h.m4
+strdup.m4
strerror.m4
string_h.m4
sys_stat_h.m4
@@ -94,6 +113,7 @@ time_h.m4
timespec.m4
unistd-safer.m4
unistd_h.m4
+unlink.m4
utimbuf.m4
utimens.m4
utimes.m4
@@ -105,5 +125,6 @@ wchar_t.m4
wctype.m4
wint_t.m4
xalloc.m4
+xgetcwd.m4
xsize.m4
yesno.m4
--
1.6.5.3.433.g11067

[PATCH 04/10] build: enable many warnings

2009-11-20T12:06:15Z

From: Jim Meyering <meyering@...>

* configure.ac: Add support for --enable-gcc-warnings.
* bootstrap.conf (gnulib_modules): Add manywarnings.
* Makefile.am (AM_CFLAGS): Add (WARN_CFLAGS) # $(WERROR_CFLAGS)
---
Makefile.am | 1 +
bootstrap.conf | 1 +
configure.ac | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
m4/.gitignore | 2 +
4 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 59cc615..406e344 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
SUBDIRS = lib doc
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I$(top_srcdir)/lib
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)

man_MANS = gunzip.1 gzexe.1 gzip.1 \
zcat.1 zcmp.1 zdiff.1 zforce.1 zgrep.1 zless.1 zmore.1 znew.1
diff --git a/bootstrap.conf b/bootstrap.conf
index 5f1e653..913deab 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -40,6 +40,7 @@ gnumakefile
lstat
maintainer-makefile
malloc
+manywarnings
perror
printf-posix
realloc
diff --git a/configure.ac b/configure.ac
index c568c02..7ae9863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,90 @@ AC_SYS_LARGEFILE

gl_INIT

+AC_ARG_ENABLE([gcc-warnings],
+ [AS_HELP_STRING([--enable-gcc-warnings],
+ [turn on lots of GCC warnings (for developers)])],
+ [case $enableval in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
+ esac
+ gl_gcc_warnings=$enableval],
+ [gl_gcc_warnings=no]
+)
+
+if test "$gl_gcc_warnings" = yes; then
+ gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
+ AC_SUBST([WERROR_CFLAGS])
+
+ nw=
+ # This, $nw, is the list of warnings we disable.
+ nw="$nw -Wdeclaration-after-statement" # too useful to forbid
+ nw="$nw -Waggregate-return" # anachronistic
+ nw="$nw -Wlong-long" # C90 is anachronistic (lib/gethrxtime.h)
+ nw="$nw -Wc++-compat" # We don't care about C++ compilers
+ nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib
+ nw="$nw -Wtraditional" # Warns on #elif which we use often
+ nw="$nw -Wcast-qual" # Too many warnings for now
+ nw="$nw -Wconversion" # Too many warnings for now
+ nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
+ nw="$nw -Wsign-conversion" # Too many warnings for now
+ nw="$nw -Wtraditional-conversion" # Too many warnings for now
+ nw="$nw -Wunreachable-code" # Too many warnings for now
+ nw="$nw -Wpadded" # Our structs are not padded
+ nw="$nw -Wredundant-decls" # openat.h declares e.g., mkdirat
+ nw="$nw -Wlogical-op" # any use of fwrite provokes this
+ nw="$nw -Wformat-nonliteral" # who.c and pinky.c strftime uses
+ nw="$nw -Wvla" # warnings in gettext.h
+ nw="$nw -Wnested-externs" # use of XARGMATCH/verify_function__
+ nw="$nw -Wswitch-enum" # Too many warnings for now
+ nw="$nw -Wswitch-default" # Too many warnings for now
+ nw="$nw -Wstack-protector" # not worth working around
+ # things I might fix soon:
+ nw="$nw -Wfloat-equal" # sort.c, seq.c
+ nw="$nw -Wmissing-format-attribute" # copy.c
+ nw="$nw -Wunsafe-loop-optimizations" # a few src/*.c
+ nw="$nw -Winline" # system.h's readdir_ignoring_dot_and_dotdot
+ nw="$nw -Wstrict-overflow" # expr.c, pr.c, tr.c, factor.c
+ # initial problems in gzip
+ nw="$nw -Wold-style-definition"
+ nw="$nw -Wshadow"
+ # ?? -Wstrict-overflow
+
+ gl_MANYWARN_ALL_GCC([ws])
+ gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
+ for w in $ws; do
+ gl_WARN_ADD([$w])
+ done
+ gl_WARN_ADD([-Wno-missing-field-initializers]) # We need this one
+ gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now
+ gl_WARN_ADD([-Wno-pointer-sign]) # Too many warnings for now
+ gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
+
+ # In spite of excluding -Wlogical-op above, it is enabled, as of
+ # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
+ gl_WARN_ADD([-Wno-logical-op])
+
+ gl_WARN_ADD([-fdiagnostics-show-option])
+ gl_WARN_ADD([-funit-at-a-time])
+
+ AC_SUBST([WARN_CFLAGS])
+
+ AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.])
+ AC_DEFINE([_FORTIFY_SOURCE], [2],
+ [enable compile-time and run-time bounds-checking, and some warnings])
+ AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+
+ # We use a slightly smaller set of warning options for lib/.
+ # Remove the following and save the result in GNULIB_WARN_CFLAGS.
+ nw=
+ nw="$nw -Wuninitialized"
+ nw="$nw -Wunused-macros"
+ nw="$nw -Wmissing-prototypes"
+ nw="$nw -Wold-style-definition"
+ gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
+ AC_SUBST([GNULIB_WARN_CFLAGS])
+fi
+
# cc -E produces incorrect asm files on SVR4, so postprocess it.
ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
AC_SUBST([ASCPPPOST])
diff --git a/m4/.gitignore b/m4/.gitignore
index 84d782c..765c33e 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -57,6 +57,7 @@ longlong.m4
lseek.m4
lstat.m4
malloc.m4
+manywarnings.m4
math_h.m4
mbrtowc.m4
mbsinit.m4
@@ -98,6 +99,7 @@ utimens.m4
utimes.m4
vasnprintf.m4
vfprintf-posix.m4
+warnings.m4
wchar.m4
wchar_t.m4
wctype.m4
--
1.6.5.3.433.g11067

[PATCH 03/10] maint: tweak formatting of bootstrap.conf

2009-11-20T12:06:14Z

From: Jim Meyering <meyering@...>

* bootstrap.conf (gnulib_modules): Unindent list.
---
bootstrap.conf | 58 ++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 9db4015..5f1e653 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -21,35 +21,35 @@ IMPORT_FROM_GETTEXT=no

# gnulib modules used by this package.
gnulib_modules='
- announce-gen
- calloc
- close
- closein
- fclose
- fcntl
- fcntl-safer
- fdl
- fprintf-posix
- getopt-gnu
- git-version-gen
- gitlog-to-changelog
- gnu-make
- gnu-web-doc-update
- gnupload
- gnumakefile
- lstat
- maintainer-makefile
- malloc
- perror
- printf-posix
- realloc
- stat-time
- sys_stat
- time
- update-copyright
- utimens
- xalloc
- yesno
+announce-gen
+calloc
+close
+closein
+fclose
+fcntl
+fcntl-safer
+fdl
+fprintf-posix
+getopt-gnu
+git-version-gen
+gitlog-to-changelog
+gnu-make
+gnu-web-doc-update
+gnupload
+gnumakefile
+lstat
+maintainer-makefile
+malloc
+perror
+printf-posix
+realloc
+stat-time
+sys_stat
+time
+update-copyright
+utimens
+xalloc
+yesno
'

# Additional gnulib-tool options to use. Use "\newline" to break lines.
--
1.6.5.3.433.g11067

[PATCH 02/10] maint: cfg.mk: remove factored-out ftp host/dir definitions

2009-11-20T12:06:13Z

From: Jim Meyering <meyering@...>

* cfg.mk (gnu_ftp_host-alpha, gnu_ftp_host-beta gnu_ftp_host-stable):
(gnu_rel_host, url_dir_list): Remove definitions. The defaults,
now provided by maint.mk, are the same.
* gnulib: Update for latest, including those maint.mk additions.
---
cfg.mk | 10 ----------
gnulib | 2 +-
2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index d7a0e65..d6197e8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,19 +14,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for stable releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-stable = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
# Used in maint.mk's web-manual rule
manual_title = gzip: the data compression program

-url_dir_list = \
- ftp://$(gnu_rel_host)/gnu/$(PACKAGE)
-
# The GnuPG ID of the key used to sign the tarballs.
gpg_key_ID = B9AB9A16

diff --git a/gnulib b/gnulib
index b3602e8..481f709 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit b3602e85d8c625e8ffc08855b67c0ae11169a5f3
+Subproject commit 481f709ceba803288289da8e11a52d309d0fc9a1
--
1.6.5.3.433.g11067

[PATCH 01/10] build: "make stable" emitted an invalid gnupload command

2009-11-20T12:06:12Z

From: Jim Meyering <meyering@...>

* cfg.mk (gnu_ftp_host-stable): Rename from gnu_ftp_host-major.
* README-release: Change another s/major/stable/.
---
README-release | 2 +-
cfg.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README-release b/README-release
index 6e84bcf..eea2512 100644
--- a/README-release
+++ b/README-release
@@ -44,7 +44,7 @@ Here are most of the steps we (maintainers) follow when making a release.

Once all the builds and tests have passed,

-* Run the gnupload command that was suggested by your "make major" run above.
+* Run the gnupload command that was suggested by your "make stable" run above.

* Wait a few minutes (maybe up to 30?) and then use the release URLs to
download all tarball/signature pairs and use gpg --verify to ensure
diff --git a/cfg.mk b/cfg.mk
index 2704393..d7a0e65 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -15,10 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for major releases.
+# Use ftp.gnu.org for stable releases.
gnu_ftp_host-alpha = alpha.gnu.org
gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
+gnu_ftp_host-stable = ftp.gnu.org
gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))

# Used in maint.mk's web-manual rule
--
1.6.5.3.433.g11067

Re: gzip 1.3.14 beta - djgpp makefile error fixed (?)

2009-11-15T11:19:13Z

Allan wrote:

> Following up on a thread regarding gzip 1.3.13, I was getting the error
> message " no rule to make target - getopt.h". I have got past this error
> but still cannot build due to my lack of expertise, apparently broken
> djgpp installation and possibly missing gnu libraries. I did change the
> cflag line (as suggested in a reply) to add to the include path for the
> compilation step but the real problem was in the list of targets at the
> bottom of the makefile. Instead of simply `getopt.h' I changed it to
> `lib/getopt.h' and that solves the problem. The big qualification to
> this is that I had to run the configure script, which creates a new
> `makefile'. You have to run the new `makefile' just to create `getopt.h'
> in the `lib' subdirectory. I also got a warning compiling `config.h'
> about a redundant declaration which I fixed by simply commenting it out
> of `config.h' . There is a a bug in my DJGPP 2.024 beta installation
> ever since I updated to GCC 4.41 where I get assembler errors most of
> the time (see below).

Thanks for the report.
This failure is because no one has yet ported gnulib's freadahead.c for djgpp.
I've Cc'd the gnulib list.

> Here is some of the command line window output:
>
> checking for ANSI C header files... (cached) yes
> checking for dirent.h that defines DIR... yes
> checking for library containing opendir... none required
> checking return type of signal handlers... void
> checking for size_t... (cached) yes
> checking for off_t... yes
> configure: creating ./config.status
> config.status: creating Makefile
> config.status: creating doc/Makefile
> config.status: creating lib/Makefile
> config.status: creating lib/config.h
> config.status: executing depfiles commands
> bash-2.05b$ exit
> exit
>
> D:\GZIP-1~1.14>make -f makefile
> Making all in lib
> make.exe[1]: Entering directory `d:/gzip-1.3.14/lib'
> GEN alloca.h
> GEN configmake.h
> GEN errno.h
> GEN fcntl.h
> GEN getopt.h
> GEN math.h
> GEN stdint.h
> GEN stdio.h
> GEN stdlib.h
> GEN string.h
> GEN sys/stat.h
> GEN sys/time.h
> GEN time.h
> GEN unistd.h
> GEN wchar.h
> GEN wctype.h
> d:/djgpp204/bin/make.exe all-recursive
> make.exe[2]: Entering directory `d:/gzip-1.3.14/lib'
> make.exe[3]: Entering directory `d:/gzip-1.3.14/lib'
> CC close-hook.o
> CC freadahead.o
> freadahead.c:83:3: error: #error "Please port gnulib freadahead.c to your platfo
> rm! Look at the definition of fflush, fread, ungetc on your system, then report
> this to bug-gnulib."
> make.exe[3]: *** [freadahead.o] Error 1
> make.exe[3]: Leaving directory `d:/gzip-1.3.14/lib'
> make.exe[2]: *** [all-recursive] Error 1
> make.exe[2]: Leaving directory `d:/gzip-1.3.14/lib'
> make.exe[1]: *** [all] Error 2
> make.exe[1]: Leaving directory `d:/gzip-1.3.14/lib'
> make.exe: *** [all-recursive] Error 1
>
> ...(snip)
> Additionally,
> (snip)...
>
> D:\GZIP-1~1.14>make -f msdos/makefile.djg
> gcc -c -O2 -finline-functions -fomit-frame-pointer -I./lib gzip.c
> d:/djgpp204/tmp/ccebBP1e.s: Assembler messages:
> d:/djgpp204/tmp/ccebBP1e.s:4292: Error: junk at end of line, first unrecognized
> character is `,'
> d:/djgpp204/tmp/ccebBP1e.s:4477: Error: junk at end of line, first unrecognized
> character is `,'
> d:/djgpp204/tmp/ccebBP1e.s:4478: Error: junk at end of line, first unrecognized
> character is `,'
> make.exe: *** [gzip.o] Error 1
> ...(snip)
>
> As I have already mentioned I stopped getting a warning about a
> redundant declaration of a variable after editing `config.h' to comment
> it out.

gzip 1.3.14 beta - djgpp makefile error fixed (?)

2009-11-15T05:48:09Z

Following up on a thread regarding gzip 1.3.13, I was getting the error
message " no rule to make target - getopt.h". I have got past this error
but still cannot build due to my lack of expertise, apparently broken
djgpp installation and possibly missing gnu libraries. I did change the
cflag line (as suggested in a reply) to add to the include path for the
compilation step but the real problem was in the list of targets at the
bottom of the makefile. Instead of simply `getopt.h' I changed it to
`lib/getopt.h' and that solves the problem. The big qualification to
this is that I had to run the configure script, which creates a new
`makefile'. You have to run the new `makefile' just to create `getopt.h'
in the `lib' subdirectory. I also got a warning compiling `config.h'
about a redundant declaration which I fixed by simply commenting it out
of `config.h' . There is a a bug in my DJGPP 2.024 beta installation
ever since I updated to GCC 4.41 where I get assembler errors most of
the time (see below).

Here is some of the command line window output:

checking for ANSI C header files... (cached) yes
checking for dirent.h that defines DIR... yes
checking for library containing opendir... none required
checking return type of signal handlers... void
checking for size_t... (cached) yes
checking for off_t... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating doc/Makefile
config.status: creating lib/Makefile
config.status: creating lib/config.h
config.status: executing depfiles commands
bash-2.05b$ exit
exit

D:\GZIP-1~1.14>make -f makefile
Making all in lib
make.exe[1]: Entering directory `d:/gzip-1.3.14/lib'
GEN alloca.h
GEN configmake.h
GEN errno.h
GEN fcntl.h
GEN getopt.h
GEN math.h
GEN stdint.h
GEN stdio.h
GEN stdlib.h
GEN string.h
GEN sys/stat.h
GEN sys/time.h
GEN time.h
GEN unistd.h
GEN wchar.h
GEN wctype.h
d:/djgpp204/bin/make.exe all-recursive
make.exe[2]: Entering directory `d:/gzip-1.3.14/lib'
make.exe[3]: Entering directory `d:/gzip-1.3.14/lib'
CC close-hook.o
CC freadahead.o
freadahead.c:83:3: error: #error "Please port gnulib freadahead.c to your platfo
rm! Look at the definition of fflush, fread, ungetc on your system, then report
this to bug-gnulib."
make.exe[3]: *** [freadahead.o] Error 1
make.exe[3]: Leaving directory `d:/gzip-1.3.14/lib'
make.exe[2]: *** [all-recursive] Error 1
make.exe[2]: Leaving directory `d:/gzip-1.3.14/lib'
make.exe[1]: *** [all] Error 2
make.exe[1]: Leaving directory `d:/gzip-1.3.14/lib'
make.exe: *** [all-recursive] Error 1

...(snip)
Additionally,
(snip)...

D:\GZIP-1~1.14>make -f msdos/makefile.djg
gcc -c -O2 -finline-functions -fomit-frame-pointer -I./lib gzip.c
d:/djgpp204/tmp/ccebBP1e.s: Assembler messages:
d:/djgpp204/tmp/ccebBP1e.s:4292: Error: junk at end of line, first unrecognized
character is `,'
d:/djgpp204/tmp/ccebBP1e.s:4477: Error: junk at end of line, first unrecognized
character is `,'
d:/djgpp204/tmp/ccebBP1e.s:4478: Error: junk at end of line, first unrecognized
character is `,'
make.exe: *** [gzip.o] Error 1
...(snip)

As I have already mentioned I stopped getting a warning about a
redundant declaration of a variable after editing `config.h' to comment
it out.

--
Allan J. Mui

Makefile.djg (7K) Download Attachment
config.h (36K) Download Attachment

set binary mode on stdin and stdout for Cygwin

2009-11-10T17:31:05Z

Hello,

I found that Cygwin distributes a modified version of gzip that fixes a binary mode issue reproduced with the attached script.

http://mirrors.kernel.org/sourceware/cygwin/release/gzip/

I could not find a version-controlled repository with this patch. The one at Sourceforge does not have it,

http://cygwin-ports.svn.sourceforge.net/viewvc/cygwin-ports/ports/branches/cygwin-1.5/archive/gzip/

http://cygwin-ports.svn.sourceforge.net/viewvc/cygwin-ports/ports/trunk/archive/gzip/

Cheers.
diff -ur gzip-1.3.12/tailor.h /usr/src/gzip-1.3.12-2/tailor.h
--- gzip-1.3.12/tailor.h 2009-11-10 19:21:45.942127500 -0500
+++ /usr/src/gzip-1.3.12-2/tailor.h 2007-07-23 17:12:59.001000000 -0400
@@ -256,6 +256,9 @@
# define OS_CODE 0x0a
#endif

+#ifdef __CYGWIN__
+# define SET_BINARY_MODE(fd) setmode(fd, O_BINARY)
+#endif

/* Common defaults */

text-mode.sh (6K) Download Attachment

Re: Zutils vs single compressor utilities

2009-11-07T01:11:49Z

Antonio Diaz Diaz wrote:

> Jim Meyering wrote:
>> However, I have a profound aversion to using a shell script
>> for any task that I require to be executed in a robust manner.
>>
>> As such, my medium-term goal is to prototype a perl-based tool
>> using IO:Compress that can do the job more efficiently and more
>> robustly than bourne shell-based code can.
>
> Are you sure a runtime dependency of the gzip package on perl is worth
> the trouble?
>
> In any case the coordination issue remains open.
>
> If your future perl-based tools are for gzip files only, like the
> current ones, then I think it is better to rename them to gzdiff, etc.

IO::Compress is multi-format.

> If your future perl-based tools are multi-format, then I think it is
> better to package them independently of compressors. Meanwhile, I
> think it is better to rename the current gzip-only scripts to gzdiff,
> etc.
>
> What do you think?

Let's see how things stand in a month or two.

Re: Zutils vs single compressor utilities

2009-11-04T11:09:46Z

Jim Meyering wrote:
> However, I have a profound aversion to using a shell script
> for any task that I require to be executed in a robust manner.
>
> As such, my medium-term goal is to prototype a perl-based tool
> using IO:Compress that can do the job more efficiently and more
> robustly than bourne shell-based code can.

Are you sure a runtime dependency of the gzip package on perl is worth
the trouble?

In any case the coordination issue remains open.

If your future perl-based tools are for gzip files only, like the
current ones, then I think it is better to rename them to gzdiff, etc.

If your future perl-based tools are multi-format, then I think it is
better to package them independently of compressors. Meanwhile, I think
it is better to rename the current gzip-only scripts to gzdiff, etc.

What do you think?

Regards,
Antonio.

Re: Zutils vs single compressor utilities

2009-11-03T13:14:32Z

Antonio Diaz Diaz wrote:
> As nobody responded to
> http://lists.gnu.org/archive/html/bug-gzip/2009-08/msg00000.html, I am
> sending this message again.
...
> I am writing you because the most obvious names for such utilities are
> the names of the utilities already distributed with gzip. I hope we
> can cooperate to avoid name clashes in distributions. I think the best
> way is gzip, bzip2 and lzip stop distributing their respective
> utilities and distributions provide the zutils port/package to replace
> those utilities.

Thanks for working on that.
However, I have a profound aversion to using a shell script
for any task that I require to be executed in a robust manner.

As such, my medium-term goal is to prototype a perl-based tool
using IO:Compress that can do the job more efficiently and more
robustly than bourne shell-based code can.

Zutils vs single compressor utilities

2009-11-02T09:36:03Z

Hello,

As nobody responded to
http://lists.gnu.org/archive/html/bug-gzip/2009-08/msg00000.html, I am
sending this message again.

Vincent Lefevre (maintainer of the MPFR package) suggested that
utilities like zdiff, bzdiff, lzdiff, etc, should be provided
independently of compressors. So I have written a package named zutils
where I include such utilities with support for gzip, bzip2, lzip, xz
and uncompressed files. (Support for other compressors may be added later).

I am writing you because the most obvious names for such utilities are
the names of the utilities already distributed with gzip. I hope we can
cooperate to avoid name clashes in distributions. I think the best way
is gzip, bzip2 and lzip stop distributing their respective utilities and
distributions provide the zutils port/package to replace those utilities.

Alternatively, gzip utilities could be renamed to gzcat, gzdiff, etc.

The zutils package has been offered to GNU and is waiting approval, but
it seems coordination with the gzip maintainer is the main pending issue.

With zutils you can do:
zdiff file1.lz file2.gz
zdiff file1.bz2 file2
or
zgrep "string" file1 file2.lz file3.gz file4.bz2

Zutils homepage is http://www.nongnu.org/zutils/zutils.html

Best regards,
Antonio.

decompress _Z file

2009-11-01T03:24:49Z

Hello Sir;

Please I need ur help

I have a file end with "_Z" without any extention

I am using Windows XP (no unix at all)

I know that the file contains compressed radar video data

So I tried many many programs to decmpress(as: Winrar, winzip,Bitzipper, 7-Zip ... , it all fail).

How can I use gzip in Windows XP?

How can u help me to decompress this file?

wait for reply

Thanks

_________________________________________________________________
Windows Live: Keep your friends up to date with what you do online.
http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/social-network-basics.aspx?ocid=PID23461::T:WLMTAGL:ON:WL:en-xm:SI_SB_1:092010

Re: gzip-1.3.14 released [beta]

2009-10-30T13:14:46Z

Mike Frysinger wrote:

> On Friday 30 October 2009 15:15:28 Jim Meyering wrote:
>> This is to announce a beta release of gzip.
>>
>> http://www.gnu.org/software/gzip/
>>
>> Actually I'm convinced that this is production quality software, but there
>> has been so little feedback, I'm going to err on the side of caution and
>> call it "beta". Besides, there were a few portability problems with the
>> last beta release, and this release will serve to ensure that they've
>> been fixed.
>
> i havent heard any complaints for the last ~month that gzip-1.3.13 has been in
> Gentoo ...

Thanks. That helps.

Re: gzip-1.3.14 released [beta]

2009-10-30T12:39:32Z

On Friday 30 October 2009 15:15:28 Jim Meyering wrote:
> This is to announce a beta release of gzip.
>
> http://www.gnu.org/software/gzip/
>
> Actually I'm convinced that this is production quality software, but there
> has been so little feedback, I'm going to err on the side of caution and
> call it "beta". Besides, there were a few portability problems with the
> last beta release, and this release will serve to ensure that they've
> been fixed.

i havent heard any complaints for the last ~month that gzip-1.3.13 has been in
Gentoo ...
-mike

signature.asc (853 bytes) Download Attachment

gzip-1.3.14 released [beta]

2009-10-30T12:15:28Z

This is to announce a beta release of gzip.

http://www.gnu.org/software/gzip/

Actually I'm convinced that this is production quality software, but there
has been so little feedback, I'm going to err on the side of caution and
call it "beta". Besides, there were a few portability problems with the
last beta release, and this release will serve to ensure that they've
been fixed.

There have been a few bug fixes (nothing major, see NEWS below),
and we've inherited a few portability fixes from gnulib.

Distro maintainers: please send any pending patches to the bug-gzip
mailing list (if possible in git format-patch format, per instructions
in http://git.sv.gnu.org/cgit/coreutils.git/plain/HACKING) and I'll try
to take them off your hands.

Here are the compressed sources:
ftp://alpha.gnu.org/gnu/gzip/gzip-1.3.14.tar.gz (828KB)
ftp://alpha.gnu.org/gnu/gzip/gzip-1.3.14.tar.xz (556KB)

Here are the GPG detached signatures[*]:
ftp://alpha.gnu.org/gnu/gzip/gzip-1.3.14.tar.gz.sig
ftp://alpha.gnu.org/gnu/gzip/gzip-1.3.14.tar.xz.sig

[*] You can use either of the above signature files to verify that
the corresponding file (without the .sig suffix) is intact. First,
be sure to download both the .sig file and the corresponding tarball.
Then, run a command like this:

gpg --verify gzip-1.3.14.tar.gz.sig

If that command fails because you don't have the required public key,
then run this command to import it:

gpg --keyserver keys.gnupg.net --recv-keys B9AB9A16

and rerun the `gpg --verify' command.

This release was bootstrapped with the following tools:
Autoconf 2.64.69-81c80
Automake 1.11a
Gnulib v0.0-2793-gb3602e8

NEWS

* Noteworthy changes in release 1.3.14 (2009-10-30) [beta]

** Bug fixes

gzip no longer fails when there is exactly one trailing NUL byte
gzip has always accepted trailing NUL bytes. Note the plural.

zdiff would exit with status 2 (indicating an error) rather than 1 to
indicate differences when both inputs were compressed and different.

zdiff would fail to print differences in two compressed inputs

zgrep -f - didn't work

attachment0 (859 bytes) Download Attachment

Re: gzip 1.3.13 - djgpp makefile error - djgpp 2.04 beta

2009-10-28T06:28:14Z

Allan Mui wrote:
> When I tried to compile the new version of gzip using djgpp 2.04 beta on
> Windows XP Home SP3 at first I encountered two errors in the makefile that
> are easy to fix : replace leading spaces with "tab". Then I encountered

Thanks. I've fixed that upstream with the patch below.

> this error which I can't fix myself since it seems that a header file is
> missing :
> (from command window)...
> D:\gzip-1.3.13>make -f msdos\makefile.djg install
> make.exe: *** No rule to make target `getopt.h', needed by `gzip.o'. Stop.
>
> ...(end of command window output.)
> Do I need to include another external source in order to compile? Could
> this makefile be out-of-date?

getopt.h is included in the tarball, but it is in the lib/
directory, so you may have to add "-I lib" to tell the compiler
to look there. Changing the CFLAGS definition in Makefile.djg
like this might do it:

CFLAGS = -O2 -finline-functions -fomit-frame-pointer -I$(srcdir)/../lib

If that works, please let us know by replying to this list.

From 3eb232f4b9d15ad37799c5a4a350d0be22c13d5e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@...>
Date: Wed, 28 Oct 2009 14:17:18 +0100
Subject: [PATCH] msdos: fix syntax in Makefile.djg

* msdos/Makefile.djg (gzip): Change each of two leading 8-space
sequences to a TAB. Reported by Allan Mui.
---
msdos/Makefile.djg | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msdos/Makefile.djg b/msdos/Makefile.djg
index f13b6f0..30eb39c 100644
--- a/msdos/Makefile.djg
+++ b/msdos/Makefile.djg
@@ -166,8 +166,8 @@ gzip$X: gzip
aout2exe gzip

gzip: $(OBJ1) $(OBJ2)
- echo $(OBJ1) > gzip.rsp
- echo $(OBJ2) $(LIBS) >> gzip.rsp
+ echo $(OBJ1) > gzip.rsp
+ echo $(OBJ2) $(LIBS) >> gzip.rsp
$(CC) $(LDFLAGS) -o $@ @gzip.rsp
del gzip.rsp

--
1.6.5.2.344.ga473e

gzip 1.3.13 - djgpp makefile error - djgpp 2.04 beta

2009-10-25T21:43:50Z

When I tried to compile the new version of gzip using djgpp 2.04 beta on
Windows XP Home SP3 at first I encountered two errors in the makefile that
are easy to fix : replace leading spaces with "tab". Then I encountered
this error which I can't fix myself since it seems that a header file is
missing :
(from command window)...
D:\gzip-1.3.13>make -f msdos\makefile.djg install
make.exe: *** No rule to make target `getopt.h', needed by `gzip.o'. Stop.

...(end of command window output.)
Do I need to include another external source in order to compile? Could
this makefile be out-of-date?
Thanks for your attention.

Allan J. Mui AIEEE <http://home.earthlink.net/~mu8ja0i/>
<http://aqm1h-5zpv2g.spaces.live.com/>
GNU GPG public key ID # : "9a02eca5" .
For fingerprint verification please visit either of the two web pages
listed above.

Re: default prefix not honored, gzip 1.3.13, possibly before?

2009-10-20T04:24:12Z

Jim Meyering wrote:

> Zube wrote:
>> A newly installed CentOS 5.3 x86_64 machine, with a mostly unpopulated
>> /usr/local. gzip has never been installed under /usr/local, the
>> only gzip that exists is the local system one (/usr/bin/gzip, a link
>> to /bin/gzip).
>>
>> I run:
>>
>> ./configure
>> gmake
>> gmake install
>>
>> and it drops the install in /usr/bin. Starting on line 19611 of the
>> configure script, the prefix is changed based on where gzip is
>> currently installed. This is surprising and annoying behavior.
>> The configure script is explicit:
>>
>> ./configure --help
>>
>> ***
>>
>> Installation directories:
>> --prefix=PREFIX install architecture-independent files in PREFIX
>> [/usr/local]
>>
>> By default, `make install' will install all the files in
>> `/usr/local/bin', `/usr/local/lib' etc.
>>
>> ***
>>
>> Thanks to this errant behavior (off the top of my head, I know of no
>> other GNU program that does this), I'm going to have a bit of manual
>> undo to do. I can force the build to do what I want with:
>>
>> ./configure --prefix=/usr/local
>>
>> but dear me, I shouldn't have to.
>>
>> Could you please either document this behavior and change the output of
>> ./configure --help or remove the check completely? It makes no sense
>> to change the default install location based on where gzip is found.
>
> Thanks for the report.
> That is indeed surprising, and IMHO undesirable.
> However, the logs suggest that gzip's installation process has been
> working that way (using AC_PREFIX_PROGRAM(gzip), now in configure.ac)
> for more than 10 years, so removing that "feature" would probably cause
> more harm than good.
>
> The only alternative I can imagine would be to make configure
> fail if --prefix=/something is not specified. And I'm sure some
> would object to that, too. So maybe the status quo is best.

On second thought (and upon a prod from Karl Berry, thanks ;-),
I've gone ahead and made the change after all.
The existing behavior is just too non-intuitive.

From 7ef3730c1f88b398d9633eed877a81d46bc5f16b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@...>
Date: Tue, 20 Oct 2009 13:21:21 +0200
Subject: [PATCH] build: do not use AC_PREFIX_PROGRAM

* configure.ac: Do not use "AC_PREFIX_PROGRAM(gzip)".
It would induce behavior that is so surprising that it is probably
universally considered to be buggy, these days. Reported by Zube
in http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/273
---
configure.ac | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 174a59e..c568c02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,5 @@ AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_OFF_T

-AC_PREFIX_PROGRAM(gzip)
-
AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile])
AC_OUTPUT
--
1.6.5.1.281.g7c7f7

Re: default prefix not honored, gzip 1.3.13, possibly before?

2009-10-14T13:31:28Z

Zube wrote:

> A newly installed CentOS 5.3 x86_64 machine, with a mostly unpopulated
> /usr/local. gzip has never been installed under /usr/local, the
> only gzip that exists is the local system one (/usr/bin/gzip, a link
> to /bin/gzip).
>
> I run:
>
> ./configure
> gmake
> gmake install
>
> and it drops the install in /usr/bin. Starting on line 19611 of the
> configure script, the prefix is changed based on where gzip is
> currently installed. This is surprising and annoying behavior.
> The configure script is explicit:
>
> ./configure --help
>
> ***
>
> Installation directories:
> --prefix=PREFIX install architecture-independent files in PREFIX
> [/usr/local]
>
> By default, `make install' will install all the files in
> `/usr/local/bin', `/usr/local/lib' etc.
>
> ***
>
> Thanks to this errant behavior (off the top of my head, I know of no
> other GNU program that does this), I'm going to have a bit of manual
> undo to do. I can force the build to do what I want with:
>
> ./configure --prefix=/usr/local
>
> but dear me, I shouldn't have to.
>
> Could you please either document this behavior and change the output of
> ./configure --help or remove the check completely? It makes no sense
> to change the default install location based on where gzip is found.

Thanks for the report.
That is indeed surprising, and IMHO undesirable.
However, the logs suggest that gzip's installation process has been
working that way (using AC_PREFIX_PROGRAM(gzip), now in configure.ac)
for more than 10 years, so removing that "feature" would probably cause
more harm than good.

The only alternative I can imagine would be to make configure
fail if --prefix=/something is not specified. And I'm sure some
would object to that, too. So maybe the status quo is best.

Extract a .Z file using GZIP.exe

2009-10-13T01:40:26Z

How can you extract a UNIX .z file using c# for example "test.txt.Z"

I have the following code "process.start("GZip.exe","-d PathName");" How do i set the filepath for the folllowing code sample.

I am soo confussed, i want to extract the above file to the same directory in which it resides, any advice and good examples would be great.

Re: Bad email address in http://www.gnu.org/software/gzip/

2009-10-12T15:55:03Z

The address <gzip@...> giver for Jean-loup Gailly is not

Thanks for the report. There's no reason to give addresses for
individuals in that context, so I removed them.

Best,
Karl

lib/vasnprintf.c line 2387 etc etc

2009-10-12T13:07:42Z

during make of gzip 1.3.13 the following issues are seen on Solaris 8
x86 with Sun Studio 11 C compiler and all recent patches :

$ make
Making all in lib
gmake[1]: Entering directory `/build/gzip/i386/SunOS5.8/generic/lib'
GEN configmake.h
GEN fcntl.h
GEN getopt.h
GEN math.h
GEN stdbool.h
GEN stdint.h
GEN stdio.h
GEN stdlib.h
GEN string.h
GEN sys/stat.h
GEN time.h
GEN unistd.h
GEN wchar.h
gmake all-recursive
gmake[2]: Entering directory `/build/gzip/i386/SunOS5.8/generic/lib'
gmake[3]: Entering directory `/build/gzip/i386/SunOS5.8/generic/lib'
CC close-hook.o
CC freadahead.o
CC freading.o
CC fseterr.o
CC localcharset.o
CC printf-frexp.o
CC printf-frexpl.o
CC xalloc-die.o
CC asnprintf.o
CC close-stream.o
CC closein.o
CC closeout.o
CC creat-safer.o
CC dup-safer.o
CC error.o
CC exitfail.o
CC fd-safer.o
CC fprintf.o
CC fpurge.o
CC frexpl.o
CC getopt.o
CC getopt1.o
CC isnanf.o
CC isnanl.o
CC lstat.o
CC mbrtowc.o
CC mbsinit.o
CC open.o
CC open-safer.o
CC pipe-safer.o
CC printf.o
CC printf-args.o
CC printf-parse.o
CC quotearg.o
CC signbitd.o
CC signbitf.o
CC signbitl.o
CC stat.o
CC strerror.o
CC utimens.o
CC vasnprintf.o
"../../../../gzip-1.3.13/lib/vasnprintf.c", line 2387: warning:
argument #3 is incompatible with prototype:
prototype: pointer to struct __mbstate_t {array[6] of int
__filler} : "/usr/include/iso/wchar_iso.h", line 194
argument : pointer to int
"../../../../gzip-1.3.13/lib/vasnprintf.c", line 2432: warning:
argument #3 is incompatible with prototype:
prototype: pointer to struct __mbstate_t {array[6] of int
__filler} : "/usr/include/iso/wchar_iso.h", line 194
argument : pointer to int
"../../../../gzip-1.3.13/lib/vasnprintf.c", line 2563: warning:
argument #3 is incompatible with prototype:
prototype: pointer to struct __mbstate_t {array[6] of int
__filler} : "/usr/include/iso/wchar_iso.h", line 194
argument : pointer to int
"../../../../gzip-1.3.13/lib/vasnprintf.c", line 2592: warning:
argument #3 is incompatible with prototype:
prototype: pointer to struct __mbstate_t {array[6] of int
__filler} : "/usr/include/iso/wchar_iso.h", line 194
argument : pointer to int
CC vfprintf.o
CC xmalloc.o
CC yesno.o
AR libgzip.a
GEN charset.alias
GEN ref-add.sed
GEN ref-del.sed
gmake[3]: Leaving directory `/build/gzip/i386/SunOS5.8/generic/lib'
gmake[2]: Leaving directory `/build/gzip/i386/SunOS5.8/generic/lib'
gmake[1]: Leaving directory `/build/gzip/i386/SunOS5.8/generic/lib'
Making all in doc
gmake[1]: Entering directory `/build/gzip/i386/SunOS5.8/generic/doc'
gmake[1]: Nothing to be done for `all'.
gmake[1]: Leaving directory `/build/gzip/i386/SunOS5.8/generic/doc'
gmake[1]: Entering directory `/build/gzip/i386/SunOS5.8/generic'
CC bits.o
CC crypt.o
CC deflate.o
CC gzip.o
CC inflate.o
CC lzw.o
CC trees.o
CC unlzh.o
CC unlzw.o
CC unpack.o
CC unzip.o
CC util.o
CC zip.o
CCLD gzip
Undefined first referenced
symbol in file
__printf__ gzip.o
ld: fatal: Symbol referencing errors. No output written to gzip
gmake[1]: *** [gzip] Error 1
gmake[1]: Leaving directory `/build/gzip/i386/SunOS5.8/generic'
gmake: *** [all-recursive] Error 1

Looks like some issue related the the use of GNU C keyword
__attribute__ in code that should probably be standard K&R C or even
ISO/IEC 9899:1999.

Not sure how to fix this but some clean up work needs to be done ..
comments like :

/* In GNU libc we want do not want to use the common name `error' directly.
Instead make it a weak alias. */
extern void __error (int status, int errnum, const char *message, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
extern void __error_at_line (int status, int errnum, const char *file_name,
unsigned int line_number, const char *message,
...)
__attribute__ ((__format__ (__printf__, 5, 6)));;

The double ;; at the end there and the double negative comment causes
me to think that perhaps this code has never been looked at by anyone?

Paul

default prefix not honored, gzip 1.3.13, possibly before?

2009-10-12T07:24:10Z

A newly installed CentOS 5.3 x86_64 machine, with a mostly unpopulated
/usr/local. gzip has never been installed under /usr/local, the
only gzip that exists is the local system one (/usr/bin/gzip, a link
to /bin/gzip).

I run:

./configure
gmake
gmake install

and it drops the install in /usr/bin. Starting on line 19611 of the
configure script, the prefix is changed based on where gzip is
currently installed. This is surprising and annoying behavior.
The configure script is explicit:

./configure --help

***

Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[/usr/local]

By default, `make install' will install all the files in
`/usr/local/bin', `/usr/local/lib' etc.

***

Thanks to this errant behavior (off the top of my head, I know of no
other GNU program that does this), I'm going to have a bit of manual
undo to do. I can force the build to do what I want with:

./configure --prefix=/usr/local

but dear me, I shouldn't have to.

Could you please either document this behavior and change the output of
./configure --help or remove the check completely? It makes no sense
to change the default install location based on where gzip is found.

Cheers,
Zube

Bad email address in http://www.gnu.org/software/gzip/

2009-10-11T11:20:46Z

The address <gzip@...> giver for Jean-loup Gailly is not
routeable:

> 199.232.76.166 does not like recipient.
> Remote host said: 550-Callout verification failed:
> 550 550 Unrouteable address

--
Dakkar - <Mobilis in mobile>
GPG public key fingerprint = A071 E618 DD2C 5901 9574
6FE2 40EA 9883 7519 3F88
key id = 0x75193F88

Mal: "Okay, help me find our man; he's supposed to be older. Kind of
stocky, wears a red sash crossways."

Kaylee: "Why does he do that?"

Mal: "Maybe he won the Miss Persephone pageant. Just help me look."
--Episode #4, "Shindig"

signature.asc (205 bytes) Download Attachment

Re: Rare issue in ignoring padding

2009-10-10T02:41:46Z

Daniel Barkalow wrote:

> The code to ignore trailing zeros from:
>
> * gzip.c (get_method): Don't complain about trailing zeros at
> the end of a gzipped file, as they're commonly appended to fill
> out a block (e.g. by GNU tar).
>
> has a rare bug: if there is exactly one trailing zero (because, for
> example, your compressed tar file was one byte short of a block), gzip
> gets only the first byte of the magic, and it's zero, but then it hits the
> end of the file on the second byte of the magic.
>
> I think this should affect only that case, and make it not fail:

Thank you!
I've applied your patch (small enough to get by without a copyright assignment)

http://git.sv.gnu.org/cgit/gzip.git/commit/?id=118a107f2d3ae5267b

and added tests to exercise that bit of code:

http://git.sv.gnu.org/cgit/gzip.git/commit/?id=8842154f6e88c37af3

From 118a107f2d3ae5267b42e1aaac58a8b5ce9d1925 Mon Sep 17 00:00:00 2001
From: Daniel Barkalow <barkalow@...>
Date: Sat, 10 Oct 2009 11:35:13 +0200
Subject: [PATCH 1/2] gzip: don't fail when there is exactly one trailing NUL byte

* gzip.c (get_method): Require the second byte of magic only if
the first byte was nonzero.
---
gzip.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gzip.c b/gzip.c
index 8543128..b0f792a 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1266,8 +1266,13 @@ local int get_method(in)
/* If try_byte returned EOF, magic[1] == (char) EOF. */
} else {
magic[0] = (char)get_byte();
- magic[1] = (char)get_byte();
- imagic1 = 0; /* avoid lint warning */
+ if (magic[0]) {
+ magic[1] = (char)get_byte();
+ imagic1 = 0; /* avoid lint warning */
+ } else {
+ imagic1 = try_byte ();
+ magic[1] = (char) imagic1;
+ }
}
method = -1; /* unknown yet */
part_nb++; /* number of parts in gzip file */
--
1.6.5.rc3.227.g2ff1c

From 8842154f6e88c37af3b62a4b5d11fdcb10aeb395 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@...>
Date: Sat, 10 Oct 2009 11:29:33 +0200
Subject: [PATCH 2/2] gzip: add tests for today's bug fix

* tests/trailing-nul: New file. Test for today's fix.
* Makefile.am (TESTS): Add new script.
* NEWS (Bug fixes): Mention it.
---
Makefile.am | 6 ++++--
NEWS | 3 +++
tests/trailing-nul | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 2 deletions(-)
create mode 100755 tests/trailing-nul

diff --git a/Makefile.am b/Makefile.am
index 206d5bf..3bca0ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,9 +100,11 @@ check-local: $(FILES_TO_CHECK) $(bin_PROGRAMS) gzip.doc.gz
test "`cat $$k | ./gzip -dc $$k - $$k`" = aaa && rm $$k
@echo 'Test succeeded.'

-TESTS = \
- tests/zdiff \
+TESTS = \
+ tests/trailing-nul \
+ tests/zdiff \
tests/zgrep-f
+
EXTRA_DIST += $(TESTS)

install-exec-hook: remove-installed-links
diff --git a/NEWS b/NEWS
index 5071241..5aeee71 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ GNU gzip NEWS -*- outline -*-

** Bug fixes

+ gzip no longer fails when there is exactly one trailing NUL byte
+ gzip has always accepted trailing NUL bytes. Note the plural.
+
zdiff would exit with status 2 (indicating an error) rather than 1 to
indicate differences when both inputs were compressed and different.

diff --git a/tests/trailing-nul b/tests/trailing-nul
new file mode 100755
index 0000000..08b6c02
--- /dev/null
+++ b/tests/trailing-nul
@@ -0,0 +1,42 @@
+#!/bin/sh
+# gzip accepts trailing NUL bytes; don't fail if there is exactly one.
+# Before gzip-1.4, this would fail.
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# 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 of the License, 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, see <http://www.gnu.org/licenses/>.
+# limit so don't run it by default.
+
+if test "$VERBOSE" = yes; then
+ set -x
+ gzip --version
+fi
+
+. $srcdir/tests/test-lib.sh
+
+(echo 0 | gzip; printf '\0') > 0.gz || framework_failure
+(echo 00 | gzip; printf '\0\0') > 00.gz || framework_failure
+(echo 1 | gzip; printf '\1') > 1.gz || framework_failure
+
+fail=0
+
+for i in 0 00 1; do
+ gzip -d $i.gz; ret=$?
+ test $ret -eq $i || fail=1
+ test $ret = 1 && continue
+ echo $i > exp || fail=1
+ compare $i exp || fail=1
+done
+
+Exit $fail
--
1.6.5.rc3.227.g2ff1c

FYI, zgrep -f - vs. portability

2009-10-10T00:51:10Z

I've applied Carl's patch, and then adjusted it
so that zgrep is more portable, but anything that
pokes around in /proc/$$/fd can't claim much in the
way of portability, so it's sure to fail elsewhere.
If someone can propose a better way (patches welcome!),
or point out a system on which this approach does not work,
please speak up. I tested on recent Linux and Solaris 10.

From 5b54db4546b84ec97ff57a62f8ddb98faacf77f2 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@...>
Date: Fri, 9 Oct 2009 17:32:48 +0200
Subject: [PATCH 1/3] zgrep: handle "-f -" the same way that it works with grep

Before this change, echo needle|zgrep -f - haystack.gz would not work.
* zgrep.in: When the pattern comes from stdin, redirect it to a
different file descriptor, since we're about to use stdin.
---
zgrep.in | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/zgrep.in b/zgrep.in
index 590aea2..d30ec25 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -3,7 +3,7 @@
# zgrep -- a wrapper around a grep program that decompresses files as needed
# Adapted from a version sent by Charles Levert <charles@...>

-# Copyright (C) 1998, 2001, 2002, 2006, 2007 Free Software Foundation
+# Copyright (C) 1998, 2001, 2002, 2006, 2007, 2009 Free Software Foundation
# Copyright (C) 1993 Jean-loup Gailly

# This program is free software; you can redistribute it and/or modify
@@ -52,6 +52,7 @@ escape='
'
operands=
have_pat=0
+pat_on_stdin=0
files_with_matches=0
files_without_matches=0
no_filename=0
@@ -97,6 +98,23 @@ while test $# -ne 0; do
printf >&2 '%s: %s: option not supported\n' "$0" "$option"
exit 2;;
(-[ef]* | --file | --file=* | --reg*)
+ # The pattern is coming from a file rather than the command-line.
+ # If the file is actually stdin then we need to do a little
+ # magic, (since we use stdin to pass the gzip output to grep).
+ # So find a free fd and change the argument to then use this
+ # file descriptor for the pattern.
+ case $optarg in
+ (" '-'" | " '/dev/stdin'" | " '/dev/fd/0'")
+ pat_on_stdin=1
+ # Start search from 6 since the script already uses 3 and 5
+ for fd in $(seq 6 254); do
+ if test ! -e /dev/fd/$fd; then
+ pat_fd=$fd
+ break;
+ fi
+ done
+ optarg=/dev/fd/$pat_fd;
+ esac
have_pat=1;;
(--h | --he | --hel | --help)
echo "$usage" || exit 2
@@ -151,6 +169,9 @@ do
# Fail if gzip or grep (or sed) fails.
gzip_status=$(
exec 5>&1
+ if test $pat_on_stdin -eq 1; then
+ eval "exec $pat_fd<&0"
+ fi
(gzip -cdfq -- "$i" 5>&-; echo $? >&5) 3>&- |
if test $files_with_matches -eq 1; then
eval "$grep" >/dev/null && { printf '%s\n' "$i" || exit 2; }
--
1.6.5.rc3.227.g2ff1c

From beb6a3e7a74a0415826752b25d418d2b54f3d49f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@...>
Date: Fri, 9 Oct 2009 20:03:09 +0200
Subject: [PATCH 2/3] zgrep: portability improvements; exercise "-f -"

* zgrep.in: Adjust loop not to use seq; it's not portable enough.
Fail if we don't find a free file descriptor.
(exists): New function; Use it in place of less portable "test -e".
Testing for existence of /dev/fd/$fd doesn't work on Solaris 10,
since all 256 always exist (as char devices), but testing for
/proc/$$/fd/$fd does work, so do that instead.
* Makefile.am (TESTS): Add tests/zgrep-f.
* tests/zgrep-f: New test; exercise this bug.
* NEWS (Bug fixes): Mention it.
---
Makefile.am | 3 ++-
NEWS | 2 ++
tests/zgrep-f | 38 ++++++++++++++++++++++++++++++++++++++
zgrep.in | 20 +++++++++++++++-----
4 files changed, 57 insertions(+), 6 deletions(-)
create mode 100644 tests/zgrep-f

diff --git a/Makefile.am b/Makefile.am
index af75eba..206d5bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,7 +101,8 @@ check-local: $(FILES_TO_CHECK) $(bin_PROGRAMS) gzip.doc.gz
@echo 'Test succeeded.'

TESTS = \
- tests/zdiff
+ tests/zdiff \
+ tests/zgrep-f
EXTRA_DIST += $(TESTS)

install-exec-hook: remove-installed-links
diff --git a/NEWS b/NEWS
index 20e09d8..5071241 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ GNU gzip NEWS -*- outline -*-

zdiff would fail to print differences in two compressed inputs

+ zgrep -f - didn't work
+

* Noteworthy changes in release 1.3.13 (2009-09-30) [stable]

diff --git a/tests/zgrep-f b/tests/zgrep-f
new file mode 100644
index 0000000..9184b9c
--- /dev/null
+++ b/tests/zgrep-f
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Ensure that zgrep -f - works like grep -f -
+# Before gzip-1.4, it would fail.
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+
+# 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 of the License, 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, see <http://www.gnu.org/licenses/>.
+# limit so don't run it by default.
+
+if test "$VERBOSE" = yes; then
+ set -x
+ zgrep --version
+fi
+
+. $srcdir/tests/test-lib.sh
+
+echo needle > n || framework_failure
+echo needle > haystack || framework_failure
+gzip haystack || framework_failure
+
+
+fail=0
+zgrep -f - haystack.gz < n > out 2>&1 || fail=1
+
+compare out n || fail=1
+
+Exit $fail
diff --git a/zgrep.in b/zgrep.in
index d30ec25..aced372 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -106,12 +106,22 @@ while test $# -ne 0; do
case $optarg in
(" '-'" | " '/dev/stdin'" | " '/dev/fd/0'")
pat_on_stdin=1
+ eval 'test -e .' 2>/dev/null \
+ && eval 'exists(){ test -e "$@"; }' \
+ || eval 'exists(){ test -r "$@" || test -w "$@"; }'
# Start search from 6 since the script already uses 3 and 5
- for fd in $(seq 6 254); do
- if test ! -e /dev/fd/$fd; then
- pat_fd=$fd
- break;
- fi
+ fd=6
+ pat_fd=
+ while : ; do
+ if ! exists /proc/$$/fd/$fd; then
+ pat_fd=$fd
+ break;
+ fi
+ fd=$(expr $fd + 1)
+ if test $fd = 255; then
+ printf >&2 '%s: no free file descriptor\n' "$0"
+ exit 2
+ fi
done
optarg=/dev/fd/$pat_fd;
esac
--
1.6.5.rc3.227.g2ff1c

From 1a085b1446a23bead55437a131fade8e26051fe5 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@...>
Date: Fri, 9 Oct 2009 20:12:30 +0200
Subject: [PATCH 3/3] build: enable automake color- and parallel-test options

* configure.ac (AM_INIT_AUTOMAKE): Enable color-tests and parallel-tests.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b127d2..174a59e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([gzip],
AC_CONFIG_SRCDIR(gzip.c)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
-AM_INIT_AUTOMAKE([1.11 dist-xz])
+AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.

AC_PROG_CC_STDC
--
1.6.5.rc3.227.g2ff1c

Rare issue in ignoring padding

2009-10-09T15:22:32Z

The code to ignore trailing zeros from:

* gzip.c (get_method): Don't complain about trailing zeros at
the end of a gzipped file, as they're commonly appended to fill
out a block (e.g. by GNU tar).

has a rare bug: if there is exactly one trailing zero (because, for
example, your compressed tar file was one byte short of a block), gzip
gets only the first byte of the magic, and it's zero, but then it hits the
end of the file on the second byte of the magic.

I think this should affect only that case, and make it not fail:

--- gzip.c~ 2009-09-26 14:56:02.000000000 -0400
+++ gzip.c 2009-10-09 18:17:39.000000000 -0400
@@ -1266,8 +1266,13 @@
/* If try_byte returned EOF, magic[1] == (char) EOF. */
} else {
magic[0] = (char)get_byte();
- magic[1] = (char)get_byte();
- imagic1 = 0; /* avoid lint warning */
+ if (magic[0]) {
+ magic[1] = (char)get_byte();
+ imagic1 = 0; /* avoid lint warning */
+ } else {
+ imagic1 = try_byte ();
+ magic[1] = (char) imagic1;
+ }
}
method = -1; /* unknown yet */
part_nb++; /* number of parts in gzip file */

Re: Incorrect zdiff behaviour

2009-10-09T04:58:21Z

On Fri, 09 Oct 2009 12:42:30 +0200, Jim Meyering <jim@...> wrote:

> Here are fixes for both:

Many thanks, Jim.

Regards,

Matt.