d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diff reduction against NetBSD and add myself to AUTHORS section of the

Browse Source 
manual page as I wrote the unpack functionality.  No actual executable
code change verified with md5(1).
This commit is contained in:
Xin LI 2010-04-07 22:54:53 +00:00
parent 004e8bae43
commit feeb03b2c8
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/gzip/gzip.1
View File

@ -25,7 +25,7 @@
.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
.Dd June 24, 2009
.Dd April 7, 2010
.Dt GZIP 1
.Os
.Sh NAME
@ -205,14 +205,17 @@ This implementation of
.Nm
was ported based on the
.Nx
.Nm
20090412, and first appeared in
.Nm ,
and first appeared in
.Fx 7.0 .
.Sh AUTHORS
.An -nosplit
This implementation of
.Nm
was written by
.An Matthew R. Green Aq mrg@eterna.com.au .
.An Matthew R. Green Aq mrg@eterna.com.au
with unpack support written by
.An Xin LI Aq delphij@FreeBSD.org .
.Sh BUGS
According to RFC 1952, the recorded file size is stored in a 32-bit
integer and therefore it can not represent files that is bigger than

14
usr.bin/gzip/gzip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gzip.c,v 1.94 2009/04/12 10:31:14 lukem Exp $ */
/* $NetBSD: gzip.c,v 1.97 2009/10/11 09:17:21 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@ -149,10 +149,9 @@ static suffixes_t suffixes[] = {
#undef SUFFIX
};
#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
#define SUFFIX_MAXLEN 30
static const char gzip_version[] = "FreeBSD gzip 20090621";
static const char gzip_version[] = "FreeBSD gzip 20100407";
#ifndef SMALL
static const char gzip_copyright[] = \
@ -206,7 +205,7 @@ static char *infile; /* name of file coming in */
static void maybe_err(const char *fmt, ...) __dead2
__attribute__((__format__(__printf__, 1, 2)));
#ifndef NO_BZIP2_SUPPORT
#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
static void maybe_errx(const char *fmt, ...) __dead2
__attribute__((__format__(__printf__, 1, 2)));
#endif
@ -461,7 +460,7 @@ maybe_err(const char *fmt, ...)
exit(2);
}
#ifndef NO_BZIP2_SUPPORT
#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
/* ... without an errno. */
void
maybe_errx(const char *fmt, ...)
@ -1319,6 +1318,7 @@ file_uncompress(char *file, char *outfile, size_t outsize)
enum filetype method;
int fd, ofd, zfd = -1;
#ifndef SMALL
ssize_t rv;
time_t timestamp = 0;
unsigned char name[PATH_MAX + 1];
#endif
@ -1364,7 +1364,6 @@ file_uncompress(char *file, char *outfile, size_t outsize)
#ifndef SMALL
if (method == FT_GZIP && Nflag) {
unsigned char ts[4]; /* timestamp */
ssize_t rv;
rv = pread(fd, ts, sizeof ts, GZIP_TIMESTAMP);
if (rv >= 0 && rv < (ssize_t)(sizeof ts))
@ -2054,7 +2053,7 @@ static void
display_license(void)
{
fprintf(stderr, "%s (based on NetBSD gzip 20060927)\n", gzip_version);
fprintf(stderr, "%s (based on NetBSD gzip 20091011)\n", gzip_version);
fprintf(stderr, "%s\n", gzip_copyright);
exit(0);
}
@ -2100,4 +2099,3 @@ read_retry(int fd, void *buf, size_t sz)
return sz - left;
}

2
usr.bin/gzip/unbzip2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: unbzip2.c,v 1.12 2009/10/11 05:17:20 mrg Exp $ */
/* $NetBSD: unbzip2.c,v 1.13 2009/12/05 03:23:37 mrg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.