From 00337e45cbde0be25dd3e61cbd0bd3a55c65ab01 Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 3 Jul 2014 22:38:26 +0000 Subject: [PATCH] file_cmds-242.tar.gz --- chmod/chmod.c | 3 +- chown/chown.c | 3 +- cksum/cksum.c | 3 +- compress/compress.c | 3 +- dd/args.c | 3 +- dd/conv.c | 3 +- dd/conv_tab.c | 3 +- dd/dd.c | 5 +- dd/misc.c | 3 +- dd/position.c | 3 +- df/df.c | 10 +- df/vfslist.c | 3 +- du/du.c | 3 +- file_cmds.xcodeproj/project.pbxproj | 617 +++++++++- gzip/gzexe | 179 +++ gzip/gzexe.1 | 73 ++ gzip/gzip.1 | 232 ++++ gzip/gzip.c | 2242 +++++++++++++++++++++++++++++++++++ gzip/gzip.plist | 29 + gzip/gzip.xcconfig | 49 + gzip/install_scripts.sh | 22 + gzip/unbzip2.c | 141 +++ gzip/unpack.c | 329 +++++ gzip/unxz.c | 153 +++ gzip/zdiff | 142 +++ gzip/zdiff.1 | 142 +++ gzip/zforce | 55 + gzip/zforce.1 | 53 + gzip/zmore | 81 ++ gzip/zmore.1 | 94 ++ gzip/znew | 137 +++ gzip/znew.1 | 71 ++ gzip/zuncompress.c | 396 +++++++ install/xinstall.c | 5 +- ipcrm/ipcrm.c | 3 +- ln/ln.c | 10 +- ls/ls.c | 79 +- ls/ls.h | 11 +- ls/print.c | 80 +- mkdir/mkdir.c | 3 +- mtree/commoncrypto.c | 16 +- mtree/compare.c | 8 +- mtree/create.c | 8 +- mtree/spec.c | 2 +- mtree/specspec.c | 10 +- mtree/verify.c | 3 + mv/mv.c | 5 +- pax/ar_io.c | 3 +- pax/ar_subs.c | 45 +- pax/buf_subs.c | 3 +- pax/cache.c | 3 +- pax/cpio.c | 3 +- pax/extern.h | 4 +- pax/file_subs.c | 7 +- pax/ftree.c | 3 +- pax/gen_subs.c | 3 +- pax/getoldopt.c | 3 +- pax/options.c | 50 +- pax/pat_rep.c | 3 +- pax/pax.c | 7 +- pax/pax_format.c | 7 +- pax/sel_subs.c | 4 +- pax/tables.c | 3 +- pax/tar.c | 3 +- pax/tty_subs.c | 3 +- rm/rm.c | 5 +- rmdir/rmdir.c | 3 +- stat/stat.c | 2 +- touch/touch.c | 4 +- 69 files changed, 5502 insertions(+), 197 deletions(-) create mode 100644 gzip/gzexe create mode 100644 gzip/gzexe.1 create mode 100644 gzip/gzip.1 create mode 100644 gzip/gzip.c create mode 100644 gzip/gzip.plist create mode 100644 gzip/gzip.xcconfig create mode 100644 gzip/install_scripts.sh create mode 100644 gzip/unbzip2.c create mode 100644 gzip/unpack.c create mode 100644 gzip/unxz.c create mode 100644 gzip/zdiff create mode 100644 gzip/zdiff.1 create mode 100644 gzip/zforce create mode 100644 gzip/zforce.1 create mode 100644 gzip/zmore create mode 100644 gzip/zmore.1 create mode 100644 gzip/znew create mode 100644 gzip/znew.1 create mode 100644 gzip/zuncompress.c diff --git a/chmod/chmod.c b/chmod/chmod.c index a4ab035..442815d 100644 --- a/chmod/chmod.c +++ b/chmod/chmod.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char const copyright[] = +__used static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/chown/chown.c b/chown/chown.c index 7a7e528..74f1759 100644 --- a/chown/chown.c +++ b/chown/chown.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/cksum/cksum.c b/cksum/cksum.c index 998c158..ae6a7ed 100644 --- a/cksum/cksum.c +++ b/cksum/cksum.c @@ -34,8 +34,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1991, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/compress/compress.c b/compress/compress.c index 8db68e6..0732fa4 100644 --- a/compress/compress.c +++ b/compress/compress.c @@ -27,8 +27,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif diff --git a/dd/args.c b/dd/args.c index 646dffd..463bd46 100644 --- a/dd/args.c +++ b/dd/args.c @@ -35,11 +35,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/args.c,v 1.31 2002/02/22 20:51:00 markm Exp $"; #endif /* not lint */ diff --git a/dd/conv.c b/dd/conv.c index cb80edc..59c7b01 100644 --- a/dd/conv.c +++ b/dd/conv.c @@ -35,11 +35,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/conv.c,v 1.16 2002/02/02 06:24:12 imp Exp $"; #endif /* not lint */ diff --git a/dd/conv_tab.c b/dd/conv_tab.c index ebc3736..a9f091e 100644 --- a/dd/conv_tab.c +++ b/dd/conv_tab.c @@ -35,11 +35,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/conv_tab.c,v 1.10 1999/09/12 16:51:53 green Exp $"; #endif /* not lint */ diff --git a/dd/dd.c b/dd/dd.c index 125acd7..5731186 100644 --- a/dd/dd.c +++ b/dd/dd.c @@ -35,8 +35,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char const copyright[] = +__used static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -45,7 +46,7 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/dd.c,v 1.36 2002/03/07 14:00:33 markm Exp $"; #endif /* not lint */ diff --git a/dd/misc.c b/dd/misc.c index d70d320..b220334 100644 --- a/dd/misc.c +++ b/dd/misc.c @@ -35,11 +35,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/misc.c,v 1.23 2002/02/02 06:24:12 imp Exp $"; #endif /* not lint */ diff --git a/dd/position.c b/dd/position.c index 1fc13f8..c110cd3 100644 --- a/dd/position.c +++ b/dd/position.c @@ -35,11 +35,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/dd/position.c,v 1.20 2002/02/02 06:24:12 imp Exp $"; #endif /* not lint */ diff --git a/df/df.c b/df/df.c index b7321f2..142bbf1 100644 --- a/df/df.c +++ b/df/df.c @@ -36,8 +36,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -46,7 +47,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; #else -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/df/df.c,v 1.23.2.9 2002/07/01 00:14:24 iedowse Exp $"; #endif #endif /* not lint */ @@ -578,9 +579,9 @@ makenetvfslist(void) mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM; miblen=sizeof(maxvfsconf); - if (sysctl(mib, (unsigned int)(sizeof(mib) / sizeof(mib[0])), + if (sysctl(mib, 3, &maxvfsconf, &miblen, NULL, 0)) { - warnx("sysctl failed"); + warn("sysctl failed"); return (NULL); } @@ -607,6 +608,7 @@ makenetvfslist(void) if (!(vfc.vfc_flags & MNT_LOCAL)) { listptr[cnt++] = strdup(vfc.vfc_name); if (listptr[cnt-1] == NULL) { + free(listptr); warnx("malloc failed"); return (NULL); } diff --git a/df/vfslist.c b/df/vfslist.c index 4f96c77..36b789b 100644 --- a/df/vfslist.c +++ b/df/vfslist.c @@ -31,11 +31,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static char sccsid[] = "@(#)vfslist.c 8.1 (Berkeley) 5/8/95"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/sbin/mount/vfslist.c,v 1.4 1999/08/28 00:13:27 peter Exp $"; #endif /* not lint */ diff --git a/du/du.c b/du/du.c index 706dea9..c49d901 100644 --- a/du/du.c +++ b/du/du.c @@ -34,8 +34,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/file_cmds.xcodeproj/project.pbxproj b/file_cmds.xcodeproj/project.pbxproj index 4298ee4..e115549 100644 --- a/file_cmds.xcodeproj/project.pbxproj +++ b/file_cmds.xcodeproj/project.pbxproj @@ -100,6 +100,7 @@ FC8A8C9214B655FD001B97AD /* PBXTargetDependency */, FC8A8C9414B655FD001B97AD /* PBXTargetDependency */, FC8A8C9614B655FD001B97AD /* PBXTargetDependency */, + FDAD94AA1808BDAA00B4D5A0 /* PBXTargetDependency */, FC8A8C9814B655FD001B97AD /* PBXTargetDependency */, FC8A8C9A14B655FD001B97AD /* PBXTargetDependency */, FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */, @@ -139,6 +140,48 @@ name = uncompress; productName = readlink; }; + FDFF0C501811BA2F00BFC477 /* eOS */ = { + isa = PBXAggregateTarget; + buildConfigurationList = FDFF0C931811BA2F00BFC477 /* Build configuration list for PBXAggregateTarget "eOS" */; + buildPhases = ( + ); + dependencies = ( + FDFF0C511811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C531811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C551811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C571811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C591811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C5B1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C5D1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C5F1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C611811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C631811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C671811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C691811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C6B1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C6D1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C6F1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C711811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C731811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C751811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C771811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C791811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C7B1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C7D1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C7F1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C811811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C831811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C851811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C871811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C891811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C8B1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C8D1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C8F1811BA2F00BFC477 /* PBXTargetDependency */, + FDFF0C911811BA2F00BFC477 /* PBXTargetDependency */, + ); + name = eOS; + productName = executables; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -246,6 +289,11 @@ FC8A8CD014B65F9B001B97AD /* uncompress.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FCB1BDEB14B6460C0070FACB /* uncompress.1 */; }; FC8A8CD114B66E10001B97AD /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = FCB1BDDC14B6460C0070FACB /* crc.c */; }; FC8A8CD414B67D60001B97AD /* chown.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FCB1BDD614B6460C0070FACB /* chown.8 */; }; + FDAD949F1808BBB900B4D5A0 /* gzip.c in Sources */ = {isa = PBXBuildFile; fileRef = FDAD94831808BB3A00B4D5A0 /* gzip.c */; }; + FDAD94A21808BC9100B4D5A0 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAD94A11808BC9100B4D5A0 /* libbz2.dylib */; }; + FDAD94A41808BC9700B4D5A0 /* liblzma.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAD94A31808BC9700B4D5A0 /* liblzma.dylib */; }; + FDAD94A61808BC9B00B4D5A0 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAD94A51808BC9B00B4D5A0 /* libz.dylib */; }; + FDAD94A81808BD0600B4D5A0 /* gzip.1 in Install Man Page */ = {isa = PBXBuildFile; fileRef = FDAD94821808BB3A00B4D5A0 /* gzip.1 */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -515,6 +563,237 @@ remoteGlobalIDString = FC8A8CC814B65F92001B97AD; remoteInfo = uncompress; }; + FDAD94A91808BDAA00B4D5A0 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FDAD94961808BB6D00B4D5A0; + remoteInfo = gzip; + }; + FDFF0C521811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FCB1BDB714B645D10070FACB; + remoteInfo = chflags; + }; + FDFF0C541811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C5B14B652E1001B97AD; + remoteInfo = chgrp; + }; + FDFF0C561811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B0B14B648D7001B97AD; + remoteInfo = chmod; + }; + FDFF0C581811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B1414B648E0001B97AD; + remoteInfo = chown; + }; + FDFF0C5A1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B1C14B648E3001B97AD; + remoteInfo = cksum; + }; + FDFF0C5C1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B2414B648E5001B97AD; + remoteInfo = compress; + }; + FDFF0C5E1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B2C14B648E7001B97AD; + remoteInfo = cp; + }; + FDFF0C601811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B3414B648EA001B97AD; + remoteInfo = dd; + }; + FDFF0C621811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B3C14B648EA001B97AD; + remoteInfo = df; + }; + FDFF0C641811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B4414B648EB001B97AD; + remoteInfo = du; + }; + FDFF0C681811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B4C14B648EB001B97AD; + remoteInfo = install; + }; + FDFF0C6A1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B5414B648EB001B97AD; + remoteInfo = ipcrm; + }; + FDFF0C6C1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B5C14B648EC001B97AD; + remoteInfo = ipcs; + }; + FDFF0C6E1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C7314B6554E001B97AD; + remoteInfo = link; + }; + FDFF0C701811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B6414B648EC001B97AD; + remoteInfo = ln; + }; + FDFF0C721811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B6C14B648ED001B97AD; + remoteInfo = ls; + }; + FDFF0C741811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B7414B648ED001B97AD; + remoteInfo = mkdir; + }; + FDFF0C761811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B7C14B648ED001B97AD; + remoteInfo = mkfifo; + }; + FDFF0C781811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B8414B648ED001B97AD; + remoteInfo = mknod; + }; + FDFF0C7A1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B8C14B648ED001B97AD; + remoteInfo = mtree; + }; + FDFF0C7C1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B9414B648EE001B97AD; + remoteInfo = mv; + }; + FDFF0C7E1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8B9C14B648EE001B97AD; + remoteInfo = pathchk; + }; + FDFF0C801811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8BA414B648EE001B97AD; + remoteInfo = pax; + }; + FDFF0C821811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C4614B64DCD001B97AD; + remoteInfo = readlink; + }; + FDFF0C841811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8BAC14B648EF001B97AD; + remoteInfo = rm; + }; + FDFF0C861811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8BB414B648EF001B97AD; + remoteInfo = rmdir; + }; + FDFF0C881811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C3C14B64A9D001B97AD; + remoteInfo = shar; + }; + FDFF0C8A1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8BC414B648EF001B97AD; + remoteInfo = stat; + }; + FDFF0C8C1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C6714B6536D001B97AD; + remoteInfo = sum; + }; + FDFF0C8E1811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8BCC14B648F0001B97AD; + remoteInfo = touch; + }; + FDFF0C901811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8CC814B65F92001B97AD; + remoteInfo = uncompress; + }; + FDFF0C921811BA2F00BFC477 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCB1BDAF14B645D00070FACB /* Project object */; + proxyType = 1; + remoteGlobalIDString = FC8A8C5014B650CF001B97AD; + remoteInfo = unlink; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -850,6 +1129,17 @@ ); runOnlyForDeploymentPostprocessing = 1; }; + FDAD94951808BB6D00B4D5A0 /* Install Man Page */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "$(GZIP_PREFIX)/share/man/man1"; + dstSubfolderSpec = 0; + files = ( + FDAD94A81808BD0600B4D5A0 /* gzip.1 in Install Man Page */, + ); + name = "Install Man Page"; + runOnlyForDeploymentPostprocessing = 1; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -1018,6 +1308,29 @@ FCB1BE8514B6460C0070FACB /* stat.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = stat.c; sourceTree = ""; }; FCB1BE8814B6460C0070FACB /* touch.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = touch.1; sourceTree = ""; }; FCB1BE8914B6460C0070FACB /* touch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = touch.c; sourceTree = ""; }; + FDAD94801808BB3A00B4D5A0 /* gzexe */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = gzexe; sourceTree = ""; }; + FDAD94811808BB3A00B4D5A0 /* gzexe.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = gzexe.1; sourceTree = ""; }; + FDAD94821808BB3A00B4D5A0 /* gzip.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = gzip.1; sourceTree = ""; }; + FDAD94831808BB3A00B4D5A0 /* gzip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gzip.c; sourceTree = ""; }; + FDAD94841808BB3A00B4D5A0 /* gzip.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = gzip.plist; sourceTree = ""; }; + FDAD94851808BB3A00B4D5A0 /* gzip.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = gzip.xcconfig; sourceTree = ""; }; + FDAD94861808BB3A00B4D5A0 /* install_scripts.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = install_scripts.sh; sourceTree = ""; }; + FDAD94871808BB3A00B4D5A0 /* unbzip2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = unbzip2.c; sourceTree = ""; }; + FDAD94881808BB3A00B4D5A0 /* unpack.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = unpack.c; sourceTree = ""; }; + FDAD94891808BB3A00B4D5A0 /* unxz.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = unxz.c; sourceTree = ""; }; + FDAD948A1808BB3A00B4D5A0 /* zdiff */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = zdiff; sourceTree = ""; }; + FDAD948B1808BB3A00B4D5A0 /* zdiff.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = zdiff.1; sourceTree = ""; }; + FDAD948C1808BB3A00B4D5A0 /* zforce */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = zforce; sourceTree = ""; }; + FDAD948D1808BB3A00B4D5A0 /* zforce.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = zforce.1; sourceTree = ""; }; + FDAD948E1808BB3A00B4D5A0 /* zmore */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = zmore; sourceTree = ""; }; + FDAD948F1808BB3A00B4D5A0 /* zmore.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = zmore.1; sourceTree = ""; }; + FDAD94901808BB3A00B4D5A0 /* znew */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = znew; sourceTree = ""; }; + FDAD94911808BB3A00B4D5A0 /* znew.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = znew.1; sourceTree = ""; }; + FDAD94921808BB3A00B4D5A0 /* zuncompress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zuncompress.c; sourceTree = ""; }; + FDAD94971808BB6D00B4D5A0 /* gzip */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gzip; sourceTree = BUILT_PRODUCTS_DIR; }; + FDAD94A11808BC9100B4D5A0 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; + FDAD94A31808BC9700B4D5A0 /* liblzma.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblzma.dylib; path = usr/lib/liblzma.dylib; sourceTree = SDKROOT; }; + FDAD94A51808BC9B00B4D5A0 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1199,6 +1512,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FDAD94941808BB6D00B4D5A0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FDAD94A21808BC9100B4D5A0 /* libbz2.dylib in Frameworks */, + FDAD94A41808BC9700B4D5A0 /* liblzma.dylib in Frameworks */, + FDAD94A61808BC9B00B4D5A0 /* libz.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -1215,6 +1538,7 @@ FCB1BDF814B6460C0070FACB /* dd */, FCB1BE0314B6460C0070FACB /* df */, FCB1BE0814B6460C0070FACB /* du */, + FDAD947F1808BB3A00B4D5A0 /* gzip */, FCB1BE0C14B6460C0070FACB /* install */, FCB1BE1114B6460C0070FACB /* ipcrm */, FCB1BE1514B6460C0070FACB /* ipcs */, @@ -1233,6 +1557,7 @@ FCB1BE7E14B6460C0070FACB /* shar */, FCB1BE8214B6460C0070FACB /* stat */, FCB1BE8614B6460C0070FACB /* touch */, + FDAD94A71808BCB700B4D5A0 /* Libraries */, FCB1BDB914B645D10070FACB /* Products */, ); indentWidth = 8; @@ -1268,6 +1593,7 @@ FC8A8BBA14B648EF001B97AD /* rmdir */, FC8A8BCA14B648EF001B97AD /* stat */, FC8A8BD214B648F0001B97AD /* touch */, + FDAD94971808BB6D00B4D5A0 /* gzip */, ); name = Products; sourceTree = ""; @@ -1624,6 +1950,42 @@ path = touch; sourceTree = ""; }; + FDAD947F1808BB3A00B4D5A0 /* gzip */ = { + isa = PBXGroup; + children = ( + FDAD94801808BB3A00B4D5A0 /* gzexe */, + FDAD94811808BB3A00B4D5A0 /* gzexe.1 */, + FDAD94821808BB3A00B4D5A0 /* gzip.1 */, + FDAD94831808BB3A00B4D5A0 /* gzip.c */, + FDAD94841808BB3A00B4D5A0 /* gzip.plist */, + FDAD94851808BB3A00B4D5A0 /* gzip.xcconfig */, + FDAD94861808BB3A00B4D5A0 /* install_scripts.sh */, + FDAD94871808BB3A00B4D5A0 /* unbzip2.c */, + FDAD94881808BB3A00B4D5A0 /* unpack.c */, + FDAD94891808BB3A00B4D5A0 /* unxz.c */, + FDAD948A1808BB3A00B4D5A0 /* zdiff */, + FDAD948B1808BB3A00B4D5A0 /* zdiff.1 */, + FDAD948C1808BB3A00B4D5A0 /* zforce */, + FDAD948D1808BB3A00B4D5A0 /* zforce.1 */, + FDAD948E1808BB3A00B4D5A0 /* zmore */, + FDAD948F1808BB3A00B4D5A0 /* zmore.1 */, + FDAD94901808BB3A00B4D5A0 /* znew */, + FDAD94911808BB3A00B4D5A0 /* znew.1 */, + FDAD94921808BB3A00B4D5A0 /* zuncompress.c */, + ); + path = gzip; + sourceTree = ""; + }; + FDAD94A71808BCB700B4D5A0 /* Libraries */ = { + isa = PBXGroup; + children = ( + FDAD94A11808BC9100B4D5A0 /* libbz2.dylib */, + FDAD94A31808BC9700B4D5A0 /* liblzma.dylib */, + FDAD94A51808BC9B00B4D5A0 /* libz.dylib */, + ); + name = Libraries; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -2042,6 +2404,7 @@ buildPhases = ( FCB1BDB414B645D10070FACB /* Sources */, FCB1BDB514B645D10070FACB /* Frameworks */, + 590112FE18284E58006881A1 /* ShellScript */, FCB1BDB614B645D10070FACB /* CopyFiles */, ); buildRules = ( @@ -2053,13 +2416,31 @@ productReference = FCB1BDB814B645D10070FACB /* chflags */; productType = "com.apple.product-type.tool"; }; + FDAD94961808BB6D00B4D5A0 /* gzip */ = { + isa = PBXNativeTarget; + buildConfigurationList = FDAD949D1808BB6D00B4D5A0 /* Build configuration list for PBXNativeTarget "gzip" */; + buildPhases = ( + FDAD94931808BB6D00B4D5A0 /* Sources */, + FDAD94941808BB6D00B4D5A0 /* Frameworks */, + FDAD94951808BB6D00B4D5A0 /* Install Man Page */, + FDAD94A01808BBF100B4D5A0 /* Install Scripts */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = gzip; + productName = gzip; + productReference = FDAD94971808BB6D00B4D5A0 /* gzip */; + productType = "com.apple.product-type.tool"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ FCB1BDAF14B645D00070FACB /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0440; + LastUpgradeCheck = 0600; ORGANIZATIONNAME = "Apple Inc."; }; buildConfigurationList = FCB1BDB214B645D00070FACB /* Build configuration list for PBXProject "file_cmds" */; @@ -2075,6 +2456,7 @@ projectRoot = ""; targets = ( FC8A8C8014B655ED001B97AD /* executables */, + FDFF0C501811BA2F00BFC477 /* eOS */, FCB1BDB714B645D10070FACB /* chflags */, FC8A8C5B14B652E1001B97AD /* chgrp */, FC8A8B0B14B648D7001B97AD /* chmod */, @@ -2085,6 +2467,7 @@ FC8A8B3414B648EA001B97AD /* dd */, FC8A8B3C14B648EA001B97AD /* df */, FC8A8B4414B648EB001B97AD /* du */, + FDAD94961808BB6D00B4D5A0 /* gzip */, FC8A8B4C14B648EB001B97AD /* install */, FC8A8B5414B648EB001B97AD /* ipcrm */, FC8A8B5C14B648EC001B97AD /* ipcs */, @@ -2112,6 +2495,20 @@ /* End PBXProject section */ /* Begin PBXShellScriptBuildPhase section */ + 590112FE18284E58006881A1 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 8; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = "/bin/sh -ex"; + shellScript = "install -d -g ${GROUP} -o ${USER} -m 0755 ${INSTALL_DIR}\ninstall -d -g ${GROUP} -o ${USER} -m 0755 ${DSTROOT}/usr/share\ninstall -d -g ${GROUP} -o ${USER} -m 0755 ${DSTROOT}/usr/share/man\ninstall -d -g ${GROUP} -o ${USER} -m 0755 ${DSTROOT}/usr/share/man/man{1,7,8}"; + showEnvVarsInLog = 0; + }; FC8A8C4C14B64DF9001B97AD /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; @@ -2222,6 +2619,20 @@ shellScript = ". \"$PROJECT_DIR\"/xcodescripts/hardlink.sh"; showEnvVarsInLog = 0; }; + FDAD94A01808BBF100B4D5A0 /* Install Scripts */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 8; + files = ( + ); + inputPaths = ( + ); + name = "Install Scripts"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = ". ${SRCROOT}/gzip/install_scripts.sh"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2467,6 +2878,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FDAD94931808BB6D00B4D5A0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + FDAD949F1808BBB900B4D5A0 /* gzip.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -2660,6 +3079,171 @@ target = FC8A8CC814B65F92001B97AD /* uncompress */; targetProxy = FC8A8CD214B67BFD001B97AD /* PBXContainerItemProxy */; }; + FDAD94AA1808BDAA00B4D5A0 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FDAD94961808BB6D00B4D5A0 /* gzip */; + targetProxy = FDAD94A91808BDAA00B4D5A0 /* PBXContainerItemProxy */; + }; + FDFF0C511811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FCB1BDB714B645D10070FACB /* chflags */; + targetProxy = FDFF0C521811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C531811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C5B14B652E1001B97AD /* chgrp */; + targetProxy = FDFF0C541811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C551811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B0B14B648D7001B97AD /* chmod */; + targetProxy = FDFF0C561811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C571811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B1414B648E0001B97AD /* chown */; + targetProxy = FDFF0C581811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C591811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B1C14B648E3001B97AD /* cksum */; + targetProxy = FDFF0C5A1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C5B1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B2414B648E5001B97AD /* compress */; + targetProxy = FDFF0C5C1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C5D1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B2C14B648E7001B97AD /* cp */; + targetProxy = FDFF0C5E1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C5F1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B3414B648EA001B97AD /* dd */; + targetProxy = FDFF0C601811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C611811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B3C14B648EA001B97AD /* df */; + targetProxy = FDFF0C621811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C631811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B4414B648EB001B97AD /* du */; + targetProxy = FDFF0C641811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C671811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B4C14B648EB001B97AD /* install */; + targetProxy = FDFF0C681811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C691811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B5414B648EB001B97AD /* ipcrm */; + targetProxy = FDFF0C6A1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C6B1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B5C14B648EC001B97AD /* ipcs */; + targetProxy = FDFF0C6C1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C6D1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C7314B6554E001B97AD /* link */; + targetProxy = FDFF0C6E1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C6F1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B6414B648EC001B97AD /* ln */; + targetProxy = FDFF0C701811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C711811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B6C14B648ED001B97AD /* ls */; + targetProxy = FDFF0C721811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C731811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B7414B648ED001B97AD /* mkdir */; + targetProxy = FDFF0C741811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C751811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B7C14B648ED001B97AD /* mkfifo */; + targetProxy = FDFF0C761811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C771811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B8414B648ED001B97AD /* mknod */; + targetProxy = FDFF0C781811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C791811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B8C14B648ED001B97AD /* mtree */; + targetProxy = FDFF0C7A1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C7B1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B9414B648EE001B97AD /* mv */; + targetProxy = FDFF0C7C1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C7D1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8B9C14B648EE001B97AD /* pathchk */; + targetProxy = FDFF0C7E1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C7F1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8BA414B648EE001B97AD /* pax */; + targetProxy = FDFF0C801811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C811811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C4614B64DCD001B97AD /* readlink */; + targetProxy = FDFF0C821811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C831811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8BAC14B648EF001B97AD /* rm */; + targetProxy = FDFF0C841811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C851811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8BB414B648EF001B97AD /* rmdir */; + targetProxy = FDFF0C861811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C871811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C3C14B64A9D001B97AD /* shar */; + targetProxy = FDFF0C881811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C891811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8BC414B648EF001B97AD /* stat */; + targetProxy = FDFF0C8A1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C8B1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C6714B6536D001B97AD /* sum */; + targetProxy = FDFF0C8C1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C8D1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8BCC14B648F0001B97AD /* touch */; + targetProxy = FDFF0C8E1811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C8F1811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8CC814B65F92001B97AD /* uncompress */; + targetProxy = FDFF0C901811BA2F00BFC477 /* PBXContainerItemProxy */; + }; + FDFF0C911811BA2F00BFC477 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = FC8A8C5014B650CF001B97AD /* unlink */; + targetProxy = FDFF0C921811BA2F00BFC477 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -2905,7 +3489,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = "$(RC_ProjectSourceVersion)"; DEAD_CODE_STRIPPING = YES; @@ -2937,6 +3520,20 @@ }; name = Release; }; + FDAD949E1808BB6D00B4D5A0 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = FDAD94851808BB3A00B4D5A0 /* gzip.xcconfig */; + buildSettings = { + }; + name = Release; + }; + FDFF0C941811BA2F00BFC477 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -3212,6 +3809,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + FDAD949D1808BB6D00B4D5A0 /* Build configuration list for PBXNativeTarget "gzip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FDAD949E1808BB6D00B4D5A0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + FDFF0C931811BA2F00BFC477 /* Build configuration list for PBXAggregateTarget "eOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FDFF0C941811BA2F00BFC477 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = FCB1BDAF14B645D00070FACB /* Project object */; diff --git a/gzip/gzexe b/gzip/gzexe new file mode 100644 index 0000000..5809133 --- /dev/null +++ b/gzip/gzexe @@ -0,0 +1,179 @@ +#!/bin/sh - +# +# $NetBSD: gzexe,v 1.3 2004/05/01 08:22:41 wiz Exp $ +# $OpenBSD: gzexe,v 1.3 2003/08/05 18:22:17 deraadt Exp $ +# +#- +# Copyright (c) 2003 Otto Moerbeek +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# $FreeBSD: src/usr.bin/gzip/gzexe,v 1.1 2007/01/26 10:19:07 delphij Exp $ + +# The number of lines plus one in the on-the-fly decompression script +lines=19 + +# A simple string to recognize already compressed files +magic="# compressed by gzexe" + +# Write the decompression script to stdout +header () { + # first section needs variable expansion, second not + cat <<- EOF + #!/bin/sh - + $magic + lines=$lines + EOF + cat <<- 'EOF' + prog=`/usr/bin/basename "$0"` + tmp=`/usr/bin/mktemp -d /tmp/gzexeXXXXXXXXXX` || { + /bin/echo "$prog: cannot create tmp dir"; exit 1 + } + trap '/bin/rm -rf "$tmp"' 0 + if /usr/bin/tail +$lines "$0" | + /usr/bin/gzip -dc > "$tmp/$prog" 2> /dev/null; then + /bin/chmod u+x "$tmp/$prog" + "$tmp/$prog" ${1+"$@"} + ret=$? + else + /bin/echo "$prog: cannot decompress $0" + ret=1 + fi + exit $ret + EOF +} + +# Test if a file is compressed by checking the magic line +compressed () { + test "X`sed -n 2p "$1" 2> /dev/null`" = "X$magic" +} + +# Decompress a file +decompress () { + tmp=`mktemp /tmp/gzexeXXXXXXXXXX` || { + echo "$prog: cannot create tmp file" + return 1 + } + if ! cp "$1" "$tmp"; then + echo "$prog: cannot copy $1 to $tmp" + rm -f "$tmp" + return 1 + fi + if ! tail +$lines "$tmp" | gzip -vdc > "$1"; then + echo "$prog: cannot decompress $1" + cp "$tmp" "$1" + rm -f "$tmp" + return 1 + fi +} + +# Perform some sanity checks on the file +check () { + if test ! -e "$1"; then + echo "$prog: cannot compress non-existing file $1" + return 1 + fi + + if test ! -f "$1"; then + echo "$prog: cannot compress non-regular file $1" + return 1 + fi + + case `basename "$1"` in + sh | mktemp | rm | echo | tail | gzip | chmod) + echo "$prog: cannot compress $1, I depend on it" + return 1 + esac + + if test ! -x "$1"; then + echo "$prog: cannot compress $1, it is not executable" + return 1 + fi + + if test -u "$1" -o -g "$1"; then + echo "$prog: cannot compress $1, it has an s bit set" + return 1 + fi +} + +# Compress a file +compress () { + tmp=`mktemp /tmp/gzexeXXXXXXXXXX` || { + echo "$prog: cannot create tmp file" + return 1 + } + if ! cp "$1" "$tmp"; then + echo "$prog: cannot copy $1 to $tmp" + rm -f "$tmp" + return 1 + fi + if ! cp "$1" "$1"~; then + echo "$prog: cannot create backup copy $1~" + rm -f "$1"~ "$tmp" + return 1 + fi + + # Use cp to overwrite the existing file preserving mode and owner + # if possible. If the file is not writable, this will produce an + # error. + + if header "$1" > "$tmp" && gzip -vc "$1" >> "$tmp"; then + if ! cp "$tmp" "$1"; then + echo "$prog: cannot copy $tmp to $1" + rm -f "$tmp" + return 1 + fi + else + echo "$prog: cannot compress $1" + rm -f "$1"~ "$tmp" + return 1 + fi +} + +# Is the -d flag specified? +dflag= + +# Return value +rc=0 + +if test "X$1" = X-d; then + dflag=1 + shift +fi + +prog=`basename "$0"` +USAGE="usage: $prog [-d] file ..." +if test $# -eq 0; then + echo $USAGE + exit 1 +fi + +while test $# -ne 0; do + if test $dflag; then + if ! compressed "$1"; then + echo "$prog: $1 is not compressed" + rc=1; + elif ! decompress "$1"; then + rc=$? + fi + else + if compressed "$1"; then + echo "$prog: $1 is already compressed" + rc=1; + elif ! check "$1" || ! compress "$1"; then + rc=$? + fi + fi + shift +done +exit $rc diff --git a/gzip/gzexe.1 b/gzip/gzexe.1 new file mode 100644 index 0000000..0c514c4 --- /dev/null +++ b/gzip/gzexe.1 @@ -0,0 +1,73 @@ +.\" $NetBSD: gzexe.1,v 1.3 2003/12/28 12:49:41 wiz Exp $ +.\" $OpenBSD: gzexe.1,v 1.1 2003/07/31 07:32:47 otto Exp $ +.\" +.\" Copyright (c) 2003 Otto Moerbeek +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $FreeBSD: src/usr.bin/gzip/gzexe.1,v 1.1 2007/01/26 10:19:07 delphij Exp $ +.Dd January 26, 2007 +.Dt GZEXE 1 +.Os +.Sh NAME +.Nm gzexe +.Nd create auto-decompressing executables +.Sh SYNOPSIS +.Nm gzexe +.Op Fl d +.Ar +.Sh DESCRIPTION +The +.Nm +utility uses +.Xr gzip 1 +to compress executables, producing executables that decompress on-the-fly +when executed. +This saves disk space, at the cost of slower execution times. +The original executables are saved by copying each of them to a file with +the same name with a +.Sq ~ +suffix appended. +After verifying that the compressed executables work as expected, the backup +files can be removed. +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl d +Decompress executables previously compressed by +.Nm . +.El +.Pp +The +.Nm +program refuses to compress non-regular or non-executable files, +files with a setuid or setgid bit set, files that are already +compressed using +.Nm +or programs it needs to perform on-the-fly decompression: +.Xr sh 1 , +.Xr mktemp 1 , +.Xr rm 1 , +.Xr echo 1 , +.Xr tail 1 , +.Xr gzip 1 , +and +.Xr chmod 1 . +.Sh SEE ALSO +.Xr gzip 1 +.Sh CAVEATS +The +.Nm +utility replaces files by overwriting them with the generated +compressed executable. +To be able to do this, it is required that the original files are writable. diff --git a/gzip/gzip.1 b/gzip/gzip.1 new file mode 100644 index 0000000..0157563 --- /dev/null +++ b/gzip/gzip.1 @@ -0,0 +1,232 @@ +.\" $NetBSD: gzip.1,v 1.21 2011/06/19 02:22:36 christos Exp $ +.\" +.\" Copyright (c) 1997, 2003, 2004 Matthew R. Green +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD: src/usr.bin/gzip/gzip.1,v 1.11 2011/10/10 06:37:32 delphij Exp $ +.Dd October 9, 2011 +.Dt GZIP 1 +.Os +.Sh NAME +.Nm gzip +.Nd compression/decompression tool using Lempel-Ziv coding (LZ77) +.Sh SYNOPSIS +.Nm +.Op Fl cdfhkLlNnqrtVv +.Op Fl S Ar suffix +.Ar file +.Oo +.Ar file Oo ... +.Oc +.Oc +.Nm gunzip +.Op Fl cfhkLNqrtVv +.Op Fl S Ar suffix +.Ar file +.Oo +.Ar file Oo ... +.Oc +.Oc +.Nm zcat +.Op Fl fhV +.Ar file +.Oo +.Ar file Oo ... +.Oc +.Oc +.Sh DESCRIPTION +The +.Nm +program compresses and decompresses files using Lempel-Ziv coding +(LZ77). +If no +.Ar files +are specified, +.Nm +will compress from standard input, or decompress to standard output. +When in compression mode, each +.Ar file +will be replaced with another file with the suffix, set by the +.Fl S Ar suffix +option, added, if possible. +.Pp +In decompression mode, each +.Ar file +will be checked for existence, as will the file with the suffix +added. +Each +.Ar file +argument must contain a separate complete archive; +when multiple +.Ar files +are indicated, each is decompressed in turn. +.Pp +In the case of +.Nm gzcat +the resulting data is then concatenated in the manner of +.Xr cat 1 . +.Pp +If invoked as +.Nm gunzip +then the +.Fl d +option is enabled. +If invoked as +.Nm zcat +or +.Nm gzcat +then both the +.Fl c +and +.Fl d +options are enabled. +When invoked as +.Nm zcat , +.Dq .Z +will be appended to all filenames that do not have that suffix. +.Pp +This version of +.Nm +is also capable of decompressing files compressed using +.Xr compress 1 +or +.Xr bzip2 1 . +.Sh OPTIONS +The following options are available: +.Bl -tag -width XXrXXXrecursiveX +.It Fl 1 , -fast +.It Fl 2 , 3 , 4 , 5 , 6 , 7 , 8 +.It Fl 9 , -best +These options change the compression level used, with the +.Fl 1 +option being the fastest, with less compression, and the +.Fl 9 +option being the slowest, with optimal compression. +The default compression level is 6. +.It Fl c , -stdout , -to-stdout +This option specifies that output will go to the standard output +stream, leaving files intact. +.It Fl d , -decompress , -uncompress +This option selects decompression rather than compression. +.It Fl f , -force +This option turns on force mode. +This allows files with multiple links, symbolic links to regular files, +overwriting of pre-existing files, reading from or writing to a terminal, +and when combined with the +.Fl c +option, allowing non-compressed data to pass through unchanged. +.It Fl h , -help +This option prints a usage summary and exits. +.It Fl k , -keep +Keep (don't delete) input files during compression +or decompression. +.It Fl L , -license +This option prints +.Nm +license. +.It Fl l , -list +This option displays information about the file's compressed and +uncompressed size, ratio, uncompressed name. +With the +.Fl v +option, it also displays the compression method, CRC, date and time +embedded in the file. +.It Fl N , -name +This option causes the stored filename in the input file to be used +as the output file. +.It Fl n , -no-name +This option stops the filename and timestamp from being stored in +the output file. +.It Fl q , -quiet +With this option, no warnings or errors are printed. +.It Fl r , -recursive +This option is used to +.Nm +the files in a directory tree individually, using the +.Xr fts 3 +library. +.It Fl S Ar suffix , Fl -suffix Ar suffix +This option changes the default suffix from .gz to +.Ar suffix . +.It Fl t , -test +This option will test compressed files for integrity. +.It Fl V , -version +This option prints the version of the +.Nm +program. +.It Fl v , -verbose +This option turns on verbose mode, which prints the compression +ratio for each file compressed. +.El +.Sh ENVIRONMENT +If the environment variable +.Ev GZIP +is set, it is parsed as a white-space separated list of options +handled before any options on the command line. +Options on the command line will override anything in +.Ev GZIP . +.Sh SEE ALSO +.Xr bzip2 1 , +.Xr compress 1 , +.Xr xz 1 , +.Xr fts 3 , +.Xr zlib 3 , +.Xr compat 5 +.Sh HISTORY +The +.Nm +program was originally written by Jean-loup Gailly, licensed under +the GNU Public Licence. +Matthew R. Green wrote a simple front end for +.Nx 1.3 +distribution media, based on the freely re-distributable zlib library. +It was enhanced to be mostly feature-compatible with the original +GNU +.Nm +program for +.Nx 2.0 . +.Pp +This implementation of +.Nm +was ported based on the +.Nx +.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 +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, therefore, it can not represent files larger than 4GB. +This limitation also applies to +.Fl l +option of +.Nm +utility. diff --git a/gzip/gzip.c b/gzip/gzip.c new file mode 100644 index 0000000..e25262c --- /dev/null +++ b/gzip/gzip.c @@ -0,0 +1,2242 @@ +/* $NetBSD: gzip.c,v 1.105 2011/08/30 23:06:00 joerg Exp $ */ + +/*- + * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\ + Matthew R. Green. All rights reserved."); +__FBSDID("$FreeBSD: src/usr.bin/gzip/gzip.c,v 1.25 2011/10/10 06:37:32 delphij Exp $"); +#endif /* not lint */ + +/* + * gzip.c -- GPL free gzip using zlib. + * + * RFC 1950 covers the zlib format + * RFC 1951 covers the deflate format + * RFC 1952 covers the gzip format + * + * TODO: + * - use mmap where possible + * - make bzip2/compress -v/-t/-l support work as well as possible + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __APPLE__ +#include +#include +#include +#endif /* __APPLE__ */ + +/* what type of file are we dealing with */ +enum filetype { + FT_GZIP, +#ifndef NO_BZIP2_SUPPORT + FT_BZIP2, +#endif +#ifndef NO_COMPRESS_SUPPORT + FT_Z, +#endif +#ifndef NO_PACK_SUPPORT + FT_PACK, +#endif +#ifndef NO_XZ_SUPPORT + FT_XZ, +#endif + FT_LAST, + FT_UNKNOWN +}; + +#ifndef NO_BZIP2_SUPPORT +#include + +#define BZ2_SUFFIX ".bz2" +#define BZIP2_MAGIC "\102\132\150" +#endif + +#ifndef NO_COMPRESS_SUPPORT +#define Z_SUFFIX ".Z" +#define Z_MAGIC "\037\235" +#endif + +#ifndef NO_PACK_SUPPORT +#define PACK_MAGIC "\037\036" +#endif + +#ifndef NO_XZ_SUPPORT +#include +#define XZ_SUFFIX ".xz" +#define XZ_MAGIC "\3757zXZ" +#endif + +#define GZ_SUFFIX ".gz" + +#define BUFLEN (64 * 1024) + +#define GZIP_MAGIC0 0x1F +#define GZIP_MAGIC1 0x8B +#define GZIP_OMAGIC1 0x9E + +#define GZIP_TIMESTAMP (off_t)4 +#define GZIP_ORIGNAME (off_t)10 + +#define HEAD_CRC 0x02 +#define EXTRA_FIELD 0x04 +#define ORIG_NAME 0x08 +#define COMMENT 0x10 + +#define OS_CODE 3 /* Unix */ + +typedef struct { + const char *zipped; + int ziplen; + const char *normal; /* for unzip - must not be longer than zipped */ +} suffixes_t; +static suffixes_t suffixes[] = { +#define SUFFIX(Z, N) {Z, sizeof Z - 1, N} + SUFFIX(GZ_SUFFIX, ""), /* Overwritten by -S .xxx */ +#ifndef SMALL + SUFFIX(GZ_SUFFIX, ""), + SUFFIX(".z", ""), + SUFFIX("-gz", ""), + SUFFIX("-z", ""), + SUFFIX("_z", ""), + SUFFIX(".taz", ".tar"), + SUFFIX(".tgz", ".tar"), +#ifndef NO_BZIP2_SUPPORT + SUFFIX(BZ2_SUFFIX, ""), + SUFFIX(".tbz", ".tar"), + SUFFIX(".tbz2", ".tar"), +#endif +#ifndef NO_COMPRESS_SUPPORT + SUFFIX(Z_SUFFIX, ""), +#endif +#ifndef NO_XZ_SUPPORT + SUFFIX(XZ_SUFFIX, ""), +#endif + SUFFIX(GZ_SUFFIX, ""), /* Overwritten by -S "" */ +#endif /* SMALL */ +#undef SUFFIX +}; +#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0]) +#define SUFFIX_MAXLEN 30 + +#ifdef __APPLE__ +static const char gzip_version[] = "Apple gzip " GZIP_APPLE_VERSION; +#else +static const char gzip_version[] = "FreeBSD gzip 20111009"; +#endif + +#ifndef SMALL +static const char gzip_copyright[] = \ +" Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green\n" +" All rights reserved.\n" +"\n" +" Redistribution and use in source and binary forms, with or without\n" +" modification, are permitted provided that the following conditions\n" +" are met:\n" +" 1. Redistributions of source code must retain the above copyright\n" +" notice, this list of conditions and the following disclaimer.\n" +" 2. Redistributions in binary form must reproduce the above copyright\n" +" notice, this list of conditions and the following disclaimer in the\n" +" documentation and/or other materials provided with the distribution.\n" +"\n" +" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n" +" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n" +" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n" +" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n" +" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n" +" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n" +" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\n" +" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n" +" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n" +" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n" +" SUCH DAMAGE."; +#endif + +static int cflag; /* stdout mode */ +static int dflag; /* decompress mode */ +static int lflag; /* list mode */ +static int numflag = 6; /* gzip -1..-9 value */ + +#ifndef SMALL +static int fflag; /* force mode */ +static int kflag; /* don't delete input files */ +static int nflag; /* don't save name/timestamp */ +static int Nflag; /* don't restore name/timestamp */ +static int qflag; /* quiet mode */ +static int rflag; /* recursive mode */ +static int tflag; /* test */ +static int vflag; /* verbose mode */ +static const char *remove_file = NULL; /* file to be removed upon SIGINT */ +#else +#define qflag 0 +#define tflag 0 +#endif + +static int exit_value = 0; /* exit value */ + +static char *infile; /* name of file coming in */ + +#ifdef __APPLE__ +static bool zcat; +#endif + +static void maybe_err(const char *fmt, ...) __printflike(1, 2) __dead2; +#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \ + !defined(NO_XZ_SUPPORT) +static void maybe_errx(const char *fmt, ...) __printflike(1, 2) __dead2; +#endif +static void maybe_warn(const char *fmt, ...) __printflike(1, 2); +static void maybe_warnx(const char *fmt, ...) __printflike(1, 2); +static enum filetype file_gettype(u_char *); +#ifdef SMALL +#define gz_compress(if, of, sz, fn, tm) gz_compress(if, of, sz) +#endif +static off_t gz_compress(int, int, off_t *, const char *, uint32_t); +static off_t gz_uncompress(int, int, char *, size_t, off_t *, const char *); +static off_t file_compress(char *, char *, size_t); +static off_t file_uncompress(char *, char *, size_t); +static void handle_pathname(char *); +static void handle_file(char *, struct stat *); +static void handle_stdin(void); +static void handle_stdout(void); +static void print_ratio(off_t, off_t, FILE *); +static void print_list(int fd, off_t, const char *, time_t); +static void usage(void) __dead2; +static void display_version(void) __dead2; +#ifndef SMALL +static void display_license(void); +static void sigint_handler(int); +#endif +static const suffixes_t *check_suffix(char *, int); +static ssize_t read_retry(int, void *, size_t); + +#ifdef SMALL +#define unlink_input(f, sb) unlink(f) +#else +static off_t cat_fd(unsigned char *, size_t, off_t *, int fd); +static void prepend_gzip(char *, int *, char ***); +static void handle_dir(char *); +static void print_verbage(const char *, const char *, off_t, off_t); +static void print_test(const char *, int); +static void copymodes(int fd, const struct stat *, const char *file); +static int check_outfile(const char *outfile); +#endif + +#ifndef NO_BZIP2_SUPPORT +static off_t unbzip2(int, int, char *, size_t, off_t *); +#endif + +#ifndef NO_COMPRESS_SUPPORT +static FILE *zdopen(int); +static off_t zuncompress(FILE *, FILE *, char *, size_t, off_t *); +#endif + +#ifndef NO_PACK_SUPPORT +static off_t unpack(int, int, char *, size_t, off_t *); +#endif + +#ifndef NO_XZ_SUPPORT +static off_t unxz(int, int, char *, size_t, off_t *); +#endif + +#ifdef SMALL +#define getopt_long(a,b,c,d,e) getopt(a,b,c) +#else +static const struct option longopts[] = { + { "stdout", no_argument, 0, 'c' }, + { "to-stdout", no_argument, 0, 'c' }, + { "decompress", no_argument, 0, 'd' }, + { "uncompress", no_argument, 0, 'd' }, + { "force", no_argument, 0, 'f' }, + { "help", no_argument, 0, 'h' }, + { "keep", no_argument, 0, 'k' }, + { "list", no_argument, 0, 'l' }, + { "no-name", no_argument, 0, 'n' }, + { "name", no_argument, 0, 'N' }, + { "quiet", no_argument, 0, 'q' }, + { "recursive", no_argument, 0, 'r' }, + { "suffix", required_argument, 0, 'S' }, + { "test", no_argument, 0, 't' }, + { "verbose", no_argument, 0, 'v' }, + { "version", no_argument, 0, 'V' }, + { "fast", no_argument, 0, '1' }, + { "best", no_argument, 0, '9' }, + { "ascii", no_argument, 0, 'a' }, + { "license", no_argument, 0, 'L' }, + { NULL, no_argument, 0, 0 }, +}; +#endif + +int +main(int argc, char **argv) +{ + const char *progname = getprogname(); +#ifndef SMALL + char *gzip; + int len; +#endif + int ch; + +#ifndef SMALL + if ((gzip = getenv("GZIP")) != NULL) + prepend_gzip(gzip, &argc, &argv); + signal(SIGINT, sigint_handler); +#endif + + /* + * XXX + * handle being called `gunzip', `zcat' and `gzcat' + */ + if (strcmp(progname, "gunzip") == 0) + dflag = 1; + else if (strcmp(progname, "zcat") == 0 || + strcmp(progname, "gzcat") == 0) + dflag = cflag = 1; + +#ifdef __APPLE__ + if (strcmp(progname, "zcat") == 0) { + zcat = true; + } +#endif + +#ifdef SMALL +#define OPT_LIST "123456789cdhlV" +#else +#define OPT_LIST "123456789acdfhklLNnqrS:tVv" +#endif + + while ((ch = getopt_long(argc, argv, OPT_LIST, longopts, NULL)) != -1) { + switch (ch) { + case '1': case '2': case '3': + case '4': case '5': case '6': + case '7': case '8': case '9': + numflag = ch - '0'; + break; + case 'c': + cflag = 1; + break; + case 'd': + dflag = 1; + break; + case 'l': + lflag = 1; + dflag = 1; + break; + case 'V': + display_version(); + /* NOTREACHED */ +#ifndef SMALL + case 'a': + fprintf(stderr, "%s: option --ascii ignored on this system\n", progname); + break; + case 'f': + fflag = 1; + break; + case 'k': + kflag = 1; + break; + case 'L': + display_license(); + /* NOT REACHED */ + case 'N': + nflag = 0; + Nflag = 1; + break; + case 'n': + nflag = 1; + Nflag = 0; + break; + case 'q': + qflag = 1; + break; + case 'r': + rflag = 1; + break; + case 'S': + len = strlen(optarg); + if (len != 0) { + if (len > SUFFIX_MAXLEN) + errx(1, "incorrect suffix: '%s': too long", optarg); + suffixes[0].zipped = optarg; + suffixes[0].ziplen = len; + } else { + suffixes[NUM_SUFFIXES - 1].zipped = ""; + suffixes[NUM_SUFFIXES - 1].ziplen = 0; + } + break; + case 't': + cflag = 1; + tflag = 1; + dflag = 1; + break; + case 'v': + vflag = 1; + break; +#endif + default: + usage(); + /* NOTREACHED */ + } + } + argv += optind; + argc -= optind; + + if (argc == 0) { + if (dflag) /* stdin mode */ + handle_stdin(); + else /* stdout mode */ + handle_stdout(); + } else { + do { + handle_pathname(argv[0]); + } while (*++argv); + } +#ifndef SMALL + if (qflag == 0 && lflag && argc > 1) + print_list(-1, 0, "(totals)", 0); +#endif + exit(exit_value); +} + +/* maybe print a warning */ +void +maybe_warn(const char *fmt, ...) +{ + va_list ap; + + if (qflag == 0) { + va_start(ap, fmt); + vwarn(fmt, ap); + va_end(ap); + } + if (exit_value == 0) + exit_value = 1; +} + +/* ... without an errno. */ +void +maybe_warnx(const char *fmt, ...) +{ + va_list ap; + + if (qflag == 0) { + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); + } + if (exit_value == 0) + exit_value = 1; +} + +/* maybe print an error */ +void +maybe_err(const char *fmt, ...) +{ + va_list ap; + + if (qflag == 0) { + va_start(ap, fmt); + vwarn(fmt, ap); + va_end(ap); + } + exit(2); +} + +#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT) || \ + !defined(NO_XZ_SUPPORT) +/* ... without an errno. */ +void +maybe_errx(const char *fmt, ...) +{ + va_list ap; + + if (qflag == 0) { + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); + } + exit(2); +} +#endif + +#ifndef SMALL +/* split up $GZIP and prepend it to the argument list */ +static void +prepend_gzip(char *gzip, int *argc, char ***argv) +{ + char *s, **nargv, **ac; + int nenvarg = 0, i; + + /* scan how many arguments there are */ + for (s = gzip;;) { + while (*s == ' ' || *s == '\t') + s++; + if (*s == 0) + goto count_done; + nenvarg++; + while (*s != ' ' && *s != '\t') + if (*s++ == 0) + goto count_done; + } +count_done: + /* punt early */ + if (nenvarg == 0) + return; + + *argc += nenvarg; + ac = *argv; + + nargv = (char **)malloc((*argc + 1) * sizeof(char *)); + if (nargv == NULL) + maybe_err("malloc"); + + /* stash this away */ + *argv = nargv; + + /* copy the program name first */ + i = 0; + nargv[i++] = *(ac++); + + s = gzip; + for (;;) { + /* Skip whitespaces. */ + while (*s == ' ' || *s == '\t') + s++; + if (*s == 0) { + goto copy_done; + } + nargv[i++] = s; + /* Find the end of this argument. */ + while (*s != ' ' && *s != '\t') + if (*s++ == 0) + /* Argument followed by NUL. */ + goto copy_done; + /* copy any unterminated args */ + nargv[i-1] = strndup(nargv[i-1], s-nargv[i-1]); + if (nargv[i-1] == NULL) + maybe_err("strndup"); + s++; + } +copy_done: + + /* copy the original arguments and a NULL */ + while (*ac) + nargv[i++] = *(ac++); + nargv[i] = NULL; +} +#endif + +/* compress input to output. Return bytes read, -1 on error */ +static off_t +gz_compress(int in, int out, off_t *gsizep, const char *origname, uint32_t mtime) +{ + z_stream z; + char *outbufp, *inbufp; + off_t in_tot = 0, out_tot = 0; + ssize_t in_size; + int i, error; + uLong crc; +#ifdef SMALL + static char header[] = { GZIP_MAGIC0, GZIP_MAGIC1, Z_DEFLATED, 0, + 0, 0, 0, 0, + 0, OS_CODE }; +#endif + + outbufp = malloc(BUFLEN); + inbufp = malloc(BUFLEN); + if (outbufp == NULL || inbufp == NULL) { + maybe_err("malloc failed"); + goto out; + } + + memset(&z, 0, sizeof z); + z.zalloc = Z_NULL; + z.zfree = Z_NULL; + z.opaque = 0; + +#ifdef SMALL + memcpy(outbufp, header, sizeof header); + i = sizeof header; +#else + if (nflag != 0) { + mtime = 0; + origname = ""; + } + + i = snprintf(outbufp, BUFLEN, "%c%c%c%c%c%c%c%c%c%c%s", + GZIP_MAGIC0, GZIP_MAGIC1, Z_DEFLATED, + *origname ? ORIG_NAME : 0, + mtime & 0xff, + (mtime >> 8) & 0xff, + (mtime >> 16) & 0xff, + (mtime >> 24) & 0xff, + numflag == 1 ? 4 : numflag == 9 ? 2 : 0, + OS_CODE, origname); + if (i >= BUFLEN) + /* this need PATH_MAX > BUFLEN ... */ + maybe_err("snprintf"); + if (*origname) + i++; +#endif + + z.next_out = (unsigned char *)outbufp + i; + z.avail_out = BUFLEN - i; + + error = deflateInit2(&z, numflag, Z_DEFLATED, + (-MAX_WBITS), 8, Z_DEFAULT_STRATEGY); + if (error != Z_OK) { + maybe_warnx("deflateInit2 failed"); + in_tot = -1; + goto out; + } + + crc = crc32(0L, Z_NULL, 0); + for (;;) { + if (z.avail_out == 0) { + if (write(out, outbufp, BUFLEN) != BUFLEN) { + maybe_warn("write"); + out_tot = -1; + goto out; + } + + out_tot += BUFLEN; + z.next_out = (unsigned char *)outbufp; + z.avail_out = BUFLEN; + } + + if (z.avail_in == 0) { + in_size = read(in, inbufp, BUFLEN); + if (in_size < 0) { + maybe_warn("read"); + in_tot = -1; + goto out; + } + if (in_size == 0) + break; + + crc = crc32(crc, (const Bytef *)inbufp, (unsigned)in_size); + in_tot += in_size; + z.next_in = (unsigned char *)inbufp; + z.avail_in = in_size; + } + + error = deflate(&z, Z_NO_FLUSH); + if (error != Z_OK && error != Z_STREAM_END) { + maybe_warnx("deflate failed"); + in_tot = -1; + goto out; + } + } + + /* clean up */ + for (;;) { + size_t len; + ssize_t w; + + error = deflate(&z, Z_FINISH); + if (error != Z_OK && error != Z_STREAM_END) { + maybe_warnx("deflate failed"); + in_tot = -1; + goto out; + } + + len = (char *)z.next_out - outbufp; + + w = write(out, outbufp, len); + if (w == -1 || (size_t)w != len) { + maybe_warn("write"); + out_tot = -1; + goto out; + } + out_tot += len; + z.next_out = (unsigned char *)outbufp; + z.avail_out = BUFLEN; + + if (error == Z_STREAM_END) + break; + } + + if (deflateEnd(&z) != Z_OK) { + maybe_warnx("deflateEnd failed"); + in_tot = -1; + goto out; + } + + i = snprintf(outbufp, BUFLEN, "%c%c%c%c%c%c%c%c", + (int)crc & 0xff, + (int)(crc >> 8) & 0xff, + (int)(crc >> 16) & 0xff, + (int)(crc >> 24) & 0xff, + (int)in_tot & 0xff, + (int)(in_tot >> 8) & 0xff, + (int)(in_tot >> 16) & 0xff, + (int)(in_tot >> 24) & 0xff); + if (i != 8) + maybe_err("snprintf"); + if (write(out, outbufp, i) != i) { + maybe_warn("write"); + in_tot = -1; + } else + out_tot += i; + +out: + if (inbufp != NULL) + free(inbufp); + if (outbufp != NULL) + free(outbufp); + if (gsizep) + *gsizep = out_tot; + return in_tot; +} + +/* + * uncompress input to output then close the input. return the + * uncompressed size written, and put the compressed sized read + * into `*gsizep'. + */ +static off_t +gz_uncompress(int in, int out, char *pre, size_t prelen, off_t *gsizep, + const char *filename) +{ + z_stream z; + char *outbufp, *inbufp; + off_t out_tot = -1, in_tot = 0; + uint32_t out_sub_tot = 0; + enum { + GZSTATE_MAGIC0, + GZSTATE_MAGIC1, + GZSTATE_METHOD, + GZSTATE_FLAGS, + GZSTATE_SKIPPING, + GZSTATE_EXTRA, + GZSTATE_EXTRA2, + GZSTATE_EXTRA3, + GZSTATE_ORIGNAME, + GZSTATE_COMMENT, + GZSTATE_HEAD_CRC1, + GZSTATE_HEAD_CRC2, + GZSTATE_INIT, + GZSTATE_READ, + GZSTATE_CRC, + GZSTATE_LEN, + } state = GZSTATE_MAGIC0; + int flags = 0, skip_count = 0; + int error = Z_STREAM_ERROR, done_reading = 0; + uLong crc = 0; + ssize_t wr; + int needmore = 0; + +#define ADVANCE() { z.next_in++; z.avail_in--; } + + if ((outbufp = malloc(BUFLEN)) == NULL) { + maybe_err("malloc failed"); + goto out2; + } + if ((inbufp = malloc(BUFLEN)) == NULL) { + maybe_err("malloc failed"); + goto out1; + } + + memset(&z, 0, sizeof z); + z.avail_in = prelen; + z.next_in = (unsigned char *)pre; + z.avail_out = BUFLEN; + z.next_out = (unsigned char *)outbufp; + z.zalloc = NULL; + z.zfree = NULL; + z.opaque = 0; + + in_tot = prelen; + out_tot = 0; + + for (;;) { + if ((z.avail_in == 0 || needmore) && done_reading == 0) { + ssize_t in_size; + + if (z.avail_in > 0) { + memmove(inbufp, z.next_in, z.avail_in); + } + z.next_in = (unsigned char *)inbufp; + in_size = read(in, z.next_in + z.avail_in, + BUFLEN - z.avail_in); + + if (in_size == -1) { + maybe_warn("failed to read stdin"); + goto stop_and_fail; + } else if (in_size == 0) { + done_reading = 1; + } + + z.avail_in += in_size; + needmore = 0; + + in_tot += in_size; + } + if (z.avail_in == 0) { + if (done_reading && state != GZSTATE_MAGIC0) { + maybe_warnx("%s: unexpected end of file", + filename); + goto stop_and_fail; + } + goto stop; + } + switch (state) { + case GZSTATE_MAGIC0: + if (*z.next_in != GZIP_MAGIC0) { + if (in_tot > 0) { + maybe_warnx("%s: trailing garbage " + "ignored", filename); + goto stop; + } + maybe_warnx("input not gziped (MAGIC0)"); + goto stop_and_fail; + } + ADVANCE(); + state++; + out_sub_tot = 0; + crc = crc32(0L, Z_NULL, 0); + break; + + case GZSTATE_MAGIC1: + if (*z.next_in != GZIP_MAGIC1 && + *z.next_in != GZIP_OMAGIC1) { + maybe_warnx("input not gziped (MAGIC1)"); + goto stop_and_fail; + } + ADVANCE(); + state++; + break; + + case GZSTATE_METHOD: + if (*z.next_in != Z_DEFLATED) { + maybe_warnx("unknown compression method"); + goto stop_and_fail; + } + ADVANCE(); + state++; + break; + + case GZSTATE_FLAGS: + flags = *z.next_in; + ADVANCE(); + skip_count = 6; + state++; + break; + + case GZSTATE_SKIPPING: + if (skip_count > 0) { + skip_count--; + ADVANCE(); + } else + state++; + break; + + case GZSTATE_EXTRA: + if ((flags & EXTRA_FIELD) == 0) { + state = GZSTATE_ORIGNAME; + break; + } + skip_count = *z.next_in; + ADVANCE(); + state++; + break; + + case GZSTATE_EXTRA2: + skip_count |= ((*z.next_in) << 8); + ADVANCE(); + state++; + break; + + case GZSTATE_EXTRA3: + if (skip_count > 0) { + skip_count--; + ADVANCE(); + } else + state++; + break; + + case GZSTATE_ORIGNAME: + if ((flags & ORIG_NAME) == 0) { + state++; + break; + } + if (*z.next_in == 0) + state++; + ADVANCE(); + break; + + case GZSTATE_COMMENT: + if ((flags & COMMENT) == 0) { + state++; + break; + } + if (*z.next_in == 0) + state++; + ADVANCE(); + break; + + case GZSTATE_HEAD_CRC1: + if (flags & HEAD_CRC) + skip_count = 2; + else + skip_count = 0; + state++; + break; + + case GZSTATE_HEAD_CRC2: + if (skip_count > 0) { + skip_count--; + ADVANCE(); + } else + state++; + break; + + case GZSTATE_INIT: + if (inflateInit2(&z, -MAX_WBITS) != Z_OK) { + maybe_warnx("failed to inflateInit"); + goto stop_and_fail; + } + state++; + break; + + case GZSTATE_READ: + error = inflate(&z, Z_FINISH); + switch (error) { + /* Z_BUF_ERROR goes with Z_FINISH... */ + case Z_BUF_ERROR: + if (z.avail_out > 0 && !done_reading) + continue; + + case Z_STREAM_END: + case Z_OK: + break; + + case Z_NEED_DICT: + maybe_warnx("Z_NEED_DICT error"); + goto stop_and_fail; + case Z_DATA_ERROR: + maybe_warnx("data stream error"); + goto stop_and_fail; + case Z_STREAM_ERROR: + maybe_warnx("internal stream error"); + goto stop_and_fail; + case Z_MEM_ERROR: + maybe_warnx("memory allocation error"); + goto stop_and_fail; + + default: + maybe_warn("unknown error from inflate(): %d", + error); + } + wr = BUFLEN - z.avail_out; + + if (wr != 0) { + crc = crc32(crc, (const Bytef *)outbufp, (unsigned)wr); + if ( +#ifndef SMALL + /* don't write anything with -t */ + tflag == 0 && +#endif + write(out, outbufp, wr) != wr) { + maybe_warn("error writing to output"); + goto stop_and_fail; + } + + out_tot += wr; + out_sub_tot += wr; + } + + if (error == Z_STREAM_END) { + inflateEnd(&z); + state++; + } + + z.next_out = (unsigned char *)outbufp; + z.avail_out = BUFLEN; + + break; + case GZSTATE_CRC: + { + uLong origcrc; + + if (z.avail_in < 4) { + if (!done_reading) { + needmore = 1; + continue; + } + maybe_warnx("truncated input"); + goto stop_and_fail; + } + origcrc = ((unsigned)z.next_in[0] & 0xff) | + ((unsigned)z.next_in[1] & 0xff) << 8 | + ((unsigned)z.next_in[2] & 0xff) << 16 | + ((unsigned)z.next_in[3] & 0xff) << 24; + if (origcrc != crc) { + maybe_warnx("invalid compressed" + " data--crc error"); + goto stop_and_fail; + } + } + + z.avail_in -= 4; + z.next_in += 4; + + if (!z.avail_in && done_reading) { + goto stop; + } + state++; + break; + case GZSTATE_LEN: + { + uLong origlen; + + if (z.avail_in < 4) { + if (!done_reading) { + needmore = 1; + continue; + } + maybe_warnx("truncated input"); + goto stop_and_fail; + } + origlen = ((unsigned)z.next_in[0] & 0xff) | + ((unsigned)z.next_in[1] & 0xff) << 8 | + ((unsigned)z.next_in[2] & 0xff) << 16 | + ((unsigned)z.next_in[3] & 0xff) << 24; + + if (origlen != out_sub_tot) { + maybe_warnx("invalid compressed" + " data--length error"); + goto stop_and_fail; + } + } + + z.avail_in -= 4; + z.next_in += 4; + + if (error < 0) { + maybe_warnx("decompression error"); + goto stop_and_fail; + } + state = GZSTATE_MAGIC0; + break; + } + continue; +stop_and_fail: + out_tot = -1; +stop: + break; + } + if (state > GZSTATE_INIT) + inflateEnd(&z); + + free(inbufp); +out1: + free(outbufp); +out2: + if (gsizep) + *gsizep = in_tot; + return (out_tot); +} + +#ifndef SMALL +/* + * set the owner, mode, flags & utimes using the given file descriptor. + * file is only used in possible warning messages. + */ +static void +copymodes(int fd, const struct stat *sbp, const char *file) +{ + struct timeval times[2]; + struct stat sb; + + /* + * If we have no info on the input, give this file some + * default values and return.. + */ + if (sbp == NULL) { + mode_t mask = umask(022); + + (void)fchmod(fd, DEFFILEMODE & ~mask); + (void)umask(mask); + return; + } + sb = *sbp; + + /* if the chown fails, remove set-id bits as-per compress(1) */ + if (fchown(fd, sb.st_uid, sb.st_gid) < 0) { + if (errno != EPERM) + maybe_warn("couldn't fchown: %s", file); + sb.st_mode &= ~(S_ISUID|S_ISGID); + } + + /* we only allow set-id and the 9 normal permission bits */ + sb.st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO; + if (fchmod(fd, sb.st_mode) < 0) + maybe_warn("couldn't fchmod: %s", file); + +#ifdef __APPLE__ + TIMESPEC_TO_TIMEVAL(×[0], &sb.st_atimespec); + TIMESPEC_TO_TIMEVAL(×[1], &sb.st_mtimespec); +#else + TIMESPEC_TO_TIMEVAL(×[0], &sb.st_atim); + TIMESPEC_TO_TIMEVAL(×[1], &sb.st_mtim); +#endif + if (futimes(fd, times) < 0) + maybe_warn("couldn't utimes: %s", file); + + /* only try flags if they exist already */ + if (sb.st_flags != 0 && fchflags(fd, sb.st_flags) < 0) + maybe_warn("couldn't fchflags: %s", file); +} +#endif + +/* what sort of file is this? */ +static enum filetype +file_gettype(u_char *buf) +{ + + if (buf[0] == GZIP_MAGIC0 && + (buf[1] == GZIP_MAGIC1 || buf[1] == GZIP_OMAGIC1)) + return FT_GZIP; + else +#ifndef NO_BZIP2_SUPPORT + if (memcmp(buf, BZIP2_MAGIC, 3) == 0 && + buf[3] >= '0' && buf[3] <= '9') + return FT_BZIP2; + else +#endif +#ifndef NO_COMPRESS_SUPPORT + if (memcmp(buf, Z_MAGIC, 2) == 0) + return FT_Z; + else +#endif +#ifndef NO_PACK_SUPPORT + if (memcmp(buf, PACK_MAGIC, 2) == 0) + return FT_PACK; + else +#endif +#ifndef NO_XZ_SUPPORT + if (memcmp(buf, XZ_MAGIC, 4) == 0) /* XXX: We only have 4 bytes */ + return FT_XZ; + else +#endif + return FT_UNKNOWN; +} + +#ifndef SMALL +/* check the outfile is OK. */ +static int +check_outfile(const char *outfile) +{ + struct stat sb; + int ok = 1; + + if (lflag == 0 && stat(outfile, &sb) == 0) { + if (fflag) + unlink(outfile); + else if (isatty(STDIN_FILENO)) { + char ans[10] = { 'n', '\0' }; /* default */ + + fprintf(stderr, "%s already exists -- do you wish to " + "overwrite (y or n)? " , outfile); + (void)fgets(ans, sizeof(ans) - 1, stdin); + if (ans[0] != 'y' && ans[0] != 'Y') { + fprintf(stderr, "\tnot overwriting\n"); + ok = 0; + } else + unlink(outfile); + } else { + maybe_warnx("%s already exists -- skipping", outfile); + ok = 0; + } + } + return ok; +} + +static void +unlink_input(const char *file, const struct stat *sb) +{ + struct stat nsb; + + if (kflag) + return; + bzero(&nsb, sizeof(nsb)); + if (stat(file, &nsb) != 0) + /* Must be gone already */ + return; + if (nsb.st_dev != sb->st_dev || nsb.st_ino != sb->st_ino) + /* Definitely a different file */ + return; + unlink(file); +} + +static void +sigint_handler(int signo __unused) +{ + + if (remove_file != NULL) + unlink(remove_file); + _exit(2); +} +#endif + +static const suffixes_t * +check_suffix(char *file, int xlate) +{ + const suffixes_t *s; + int len = strlen(file); + char *sp; + + for (s = suffixes; s != suffixes + NUM_SUFFIXES; s++) { + /* if it doesn't fit in "a.suf", don't bother */ + if (s->ziplen >= len) + continue; + sp = file + len - s->ziplen; + if (strcmp(s->zipped, sp) != 0) + continue; + if (xlate) + strcpy(sp, s->normal); + return s; + } + return NULL; +} + +#ifdef __APPLE__ +static void +clear_type_and_creator(int fd) +{ + struct attrlist alist; + struct { + u_int32_t length; + char info[32]; + } abuf; + + memset(&alist, 0, sizeof(alist)); + alist.bitmapcount = ATTR_BIT_MAP_COUNT; + alist.commonattr = ATTR_CMN_FNDRINFO; + + if (!fgetattrlist(fd, &alist, &abuf, sizeof(abuf), 0) && abuf.length == sizeof(abuf)) { + memset(abuf.info, 0, 8); + fsetattrlist(fd, &alist, abuf.info, sizeof(abuf.info), 0); + } +} +#endif /* __APPLE__ */ + +/* + * compress the given file: create a corresponding .gz file and remove the + * original. + */ +static off_t +file_compress(char *file, char *outfile, size_t outsize) +{ + int in; + int out; + off_t size, insize; +#ifndef SMALL + struct stat isb, osb; + const suffixes_t *suff; +#endif + + in = open(file, O_RDONLY); + if (in == -1) { + maybe_warn("can't open %s", file); + return (-1); + } + +#ifndef SMALL + bzero(&isb, sizeof(isb)); + if (fstat(in, &isb) != 0) { + maybe_warn("couldn't stat: %s", file); + close(in); + return (-1); + } +#endif + + if (cflag == 0) { +#ifndef SMALL + if (isb.st_nlink > 1 && fflag == 0) { + maybe_warnx("%s has %d other link%s -- skipping", + file, isb.st_nlink - 1, + (isb.st_nlink - 1) == 1 ? "" : "s"); + close(in); + return (-1); + } + + if (fflag == 0 && (suff = check_suffix(file, 0)) && + suff->zipped[0] != 0) { + maybe_warnx("%s already has %s suffix -- unchanged", + file, suff->zipped); + close(in); + return (-1); + } +#endif + + /* Add (usually) .gz to filename */ + if ((size_t)snprintf(outfile, outsize, "%s%s", + file, suffixes[0].zipped) >= outsize) + memcpy(outfile + outsize - suffixes[0].ziplen - 1, + suffixes[0].zipped, suffixes[0].ziplen + 1); + +#ifndef SMALL + if (check_outfile(outfile) == 0) { + close(in); + return (-1); + } +#endif + } + + if (cflag == 0) { + out = open(outfile, O_WRONLY | O_CREAT | O_EXCL, 0600); + if (out == -1) { + maybe_warn("could not create output: %s", outfile); + fclose(stdin); + return (-1); + } +#ifndef SMALL + remove_file = outfile; +#endif + } else + out = STDOUT_FILENO; + + insize = gz_compress(in, out, &size, basename(file), (uint32_t)isb.st_mtime); + +#ifndef __APPLE__ + (void)close(in); +#endif /* !__APPLE__ */ + + /* + * If there was an error, insize will be -1. + * If we compressed to stdout, just return the size. + * Otherwise stat the file and check it is the correct size. + * We only blow away the file if we can stat the output and it + * has the expected size. + */ + if (cflag != 0) + return (insize == -1 ? -1 : size); + +#ifndef SMALL + if (fstat(out, &osb) != 0) { + maybe_warn("couldn't stat: %s", outfile); + goto bad_outfile; + } + + if (osb.st_size != size) { + maybe_warnx("output file: %s wrong size (%ju != %ju), deleting", + outfile, (uintmax_t)osb.st_size, (uintmax_t)size); + goto bad_outfile; + } + +#ifdef __APPLE__ + fcopyfile(in, out, 0, COPYFILE_ACL | COPYFILE_XATTR); + clear_type_and_creator(out); +#endif /* __APPLE__ */ + copymodes(out, &isb, outfile); + remove_file = NULL; +#endif +#ifdef __APPLE__ + (void)close(in); +#endif /* __APPLE__ */ + if (close(out) == -1) + maybe_warn("couldn't close output"); + + /* output is good, ok to delete input */ + unlink_input(file, &isb); + return (size); + +#ifndef SMALL + bad_outfile: + if (close(out) == -1) + maybe_warn("couldn't close output"); + + maybe_warnx("leaving original %s", file); + unlink(outfile); + return (size); +#endif +} + +/* uncompress the given file and remove the original */ +static off_t +file_uncompress(char *file, char *outfile, size_t outsize) +{ + struct stat isb, osb; + off_t size; + ssize_t rbytes; + unsigned char header1[4]; + enum filetype method; + int fd, ofd, zfd = -1; +#ifndef SMALL + ssize_t rv; + time_t timestamp = 0; + unsigned char name[PATH_MAX + 1]; +#endif + + /* gather the old name info */ + + fd = open(file, O_RDONLY); + if (fd < 0) { + maybe_warn("can't open %s", file); + goto lose; + } + + strlcpy(outfile, file, outsize); + if (check_suffix(outfile, 1) == NULL && !(cflag || lflag)) { + maybe_warnx("%s: unknown suffix -- ignored", file); + goto lose; + } + + rbytes = read(fd, header1, sizeof header1); + if (rbytes != sizeof header1) { + /* we don't want to fail here. */ +#ifndef SMALL + if (fflag) + goto lose; +#endif + if (rbytes == -1) + maybe_warn("can't read %s", file); + else + goto unexpected_EOF; + goto lose; + } + + method = file_gettype(header1); +#ifndef SMALL + if (fflag == 0 && method == FT_UNKNOWN) { + maybe_warnx("%s: not in gzip format", file); + goto lose; + } + +#endif + +#ifndef SMALL + if (method == FT_GZIP && Nflag) { + unsigned char ts[4]; /* timestamp */ + + rv = pread(fd, ts, sizeof ts, GZIP_TIMESTAMP); + if (rv >= 0 && rv < (ssize_t)(sizeof ts)) + goto unexpected_EOF; + if (rv == -1) { + if (!fflag) + maybe_warn("can't read %s", file); + goto lose; + } + timestamp = ts[3] << 24 | ts[2] << 16 | ts[1] << 8 | ts[0]; + + if (header1[3] & ORIG_NAME) { + rbytes = pread(fd, name, sizeof name, GZIP_ORIGNAME); + if (rbytes < 0) { + maybe_warn("can't read %s", file); + goto lose; + } + if (name[0] != 0) { + /* preserve original directory name */ + char *dp = strrchr(file, '/'); + if (dp == NULL) + dp = file; + else + dp++; + snprintf(outfile, outsize, "%.*s%.*s", + (int) (dp - file), + file, (int) rbytes, name); + } + } + } +#endif + lseek(fd, 0, SEEK_SET); + bzero(&isb, sizeof(isb)); + if (cflag == 0 || lflag) { + if (fstat(fd, &isb) != 0) + goto lose; +#ifndef SMALL + if (isb.st_nlink > 1 && lflag == 0 && fflag == 0) { + maybe_warnx("%s has %d other links -- skipping", + file, isb.st_nlink - 1); + goto lose; + } + if (nflag == 0 && timestamp) + isb.st_mtime = timestamp; + if (check_outfile(outfile) == 0) + goto lose; +#endif + } + + if (cflag == 0 && lflag == 0) { + zfd = open(outfile, O_WRONLY|O_CREAT|O_EXCL, 0600); + if (zfd == STDOUT_FILENO) { + /* We won't close STDOUT_FILENO later... */ + zfd = dup(zfd); + close(STDOUT_FILENO); + } + if (zfd == -1) { + maybe_warn("can't open %s", outfile); + goto lose; + } +#ifndef SMALL + remove_file = outfile; +#endif + } else + zfd = STDOUT_FILENO; + + switch (method) { +#ifndef NO_BZIP2_SUPPORT + case FT_BZIP2: + /* XXX */ + if (lflag) { + maybe_warnx("no -l with bzip2 files"); + goto lose; + } + + size = unbzip2(fd, zfd, NULL, 0, NULL); + break; +#endif + +#ifndef NO_COMPRESS_SUPPORT + case FT_Z: { + FILE *in, *out; + + /* XXX */ + if (lflag) { + maybe_warnx("no -l with Lempel-Ziv files"); + goto lose; + } + + if ((in = zdopen(fd)) == NULL) { + maybe_warn("zdopen for read: %s", file); + goto lose; + } + + out = fdopen(dup(zfd), "w"); + if (out == NULL) { + maybe_warn("fdopen for write: %s", outfile); + fclose(in); + goto lose; + } + + size = zuncompress(in, out, NULL, 0, NULL); + /* need to fclose() if ferror() is true... */ + if (ferror(in) | fclose(in)) { + maybe_warn("failed infile fclose"); + unlink(outfile); + (void)fclose(out); + } + if (fclose(out) != 0) { + maybe_warn("failed outfile fclose"); + unlink(outfile); + goto lose; + } + break; + } +#endif + +#ifndef NO_PACK_SUPPORT + case FT_PACK: + if (lflag) { + maybe_warnx("no -l with packed files"); + goto lose; + } + + size = unpack(fd, zfd, NULL, 0, NULL); + break; +#endif + +#ifndef NO_XZ_SUPPORT + case FT_XZ: + if (lflag) { + maybe_warnx("no -l with xz files"); + goto lose; + } + + size = unxz(fd, zfd, NULL, 0, NULL); + break; +#endif + +#ifndef SMALL + case FT_UNKNOWN: + if (lflag) { + maybe_warnx("no -l for unknown filetypes"); + goto lose; + } + size = cat_fd(NULL, 0, NULL, fd); + break; +#endif + default: + if (lflag) { + print_list(fd, isb.st_size, outfile, isb.st_mtime); + close(fd); + return -1; /* XXX */ + } + + size = gz_uncompress(fd, zfd, NULL, 0, NULL, file); + break; + } + + if (close(fd) != 0) + maybe_warn("couldn't close input"); + if (zfd != STDOUT_FILENO && close(zfd) != 0) + maybe_warn("couldn't close output"); + + if (size == -1) { + if (cflag == 0) + unlink(outfile); + maybe_warnx("%s: uncompress failed", file); + return -1; + } + + /* if testing, or we uncompressed to stdout, this is all we need */ +#ifndef SMALL + if (tflag) + return size; +#endif + /* if we are uncompressing to stdin, don't remove the file. */ + if (cflag) + return size; + + /* + * if we create a file... + */ + /* + * if we can't stat the file don't remove the file. + */ + + ofd = open(outfile, O_RDWR, 0); + if (ofd == -1) { + maybe_warn("couldn't open (leaving original): %s", + outfile); + return -1; + } + if (fstat(ofd, &osb) != 0) { + maybe_warn("couldn't stat (leaving original): %s", + outfile); + close(ofd); + return -1; + } + if (osb.st_size != size) { + maybe_warnx("stat gave different size: %ju != %ju (leaving original)", + (uintmax_t)size, (uintmax_t)osb.st_size); + close(ofd); + unlink(outfile); + return -1; + } +#ifndef SMALL + copymodes(ofd, &isb, outfile); + remove_file = NULL; +#endif + close(ofd); + unlink_input(file, &isb); + return size; + + unexpected_EOF: + maybe_warnx("%s: unexpected end of file", file); + lose: + if (fd != -1) + close(fd); + if (zfd != -1 && zfd != STDOUT_FILENO) + close(fd); + return -1; +} + +#ifndef SMALL +static off_t +cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd) +{ + char buf[BUFLEN]; + off_t in_tot; + ssize_t w; + + in_tot = count; + w = write(STDOUT_FILENO, prepend, count); + if (w == -1 || (size_t)w != count) { + maybe_warn("write to stdout"); + return -1; + } + for (;;) { + ssize_t rv; + + rv = read(fd, buf, sizeof buf); + if (rv == 0) + break; + if (rv < 0) { + maybe_warn("read from fd %d", fd); + break; + } + + if (write(STDOUT_FILENO, buf, rv) != rv) { + maybe_warn("write to stdout"); + break; + } + in_tot += rv; + } + + if (gsizep) + *gsizep = in_tot; + return (in_tot); +} +#endif + +static void +handle_stdin(void) +{ + unsigned char header1[4]; + off_t usize, gsize; + enum filetype method; + ssize_t bytes_read; +#ifndef NO_COMPRESS_SUPPORT + FILE *in; +#endif + +#ifndef SMALL + if (fflag == 0 && lflag == 0 && isatty(STDIN_FILENO)) { + maybe_warnx("standard input is a terminal -- ignoring"); + return; + } +#endif + + if (lflag) { + struct stat isb; + + /* XXX could read the whole file, etc. */ + if (fstat(STDIN_FILENO, &isb) < 0) { + maybe_warn("fstat"); + return; + } + print_list(STDIN_FILENO, isb.st_size, "stdout", isb.st_mtime); + return; + } + + bytes_read = read_retry(STDIN_FILENO, header1, sizeof header1); + if (bytes_read == -1) { + maybe_warn("can't read stdin"); + return; + } else if (bytes_read != sizeof(header1)) { + maybe_warnx("(stdin): unexpected end of file"); + return; + } + + method = file_gettype(header1); + switch (method) { + default: +#ifndef SMALL + if (fflag == 0) { + maybe_warnx("unknown compression format"); + return; + } + usize = cat_fd(header1, sizeof header1, &gsize, STDIN_FILENO); + break; +#endif + case FT_GZIP: + usize = gz_uncompress(STDIN_FILENO, STDOUT_FILENO, + (char *)header1, sizeof header1, &gsize, "(stdin)"); + break; +#ifndef NO_BZIP2_SUPPORT + case FT_BZIP2: + usize = unbzip2(STDIN_FILENO, STDOUT_FILENO, + (char *)header1, sizeof header1, &gsize); + break; +#endif +#ifndef NO_COMPRESS_SUPPORT + case FT_Z: + if ((in = zdopen(STDIN_FILENO)) == NULL) { + maybe_warnx("zopen of stdin"); + return; + } + + usize = zuncompress(in, stdout, (char *)header1, + sizeof header1, &gsize); + fclose(in); + break; +#endif +#ifndef NO_PACK_SUPPORT + case FT_PACK: + usize = unpack(STDIN_FILENO, STDOUT_FILENO, + (char *)header1, sizeof header1, &gsize); + break; +#endif +#ifndef NO_XZ_SUPPORT + case FT_XZ: + usize = unxz(STDIN_FILENO, STDOUT_FILENO, + (char *)header1, sizeof header1, &gsize); + break; +#endif + } + +#ifndef SMALL + if (vflag && !tflag && usize != -1 && gsize != -1) + print_verbage(NULL, NULL, usize, gsize); + if (vflag && tflag) + print_test("(stdin)", usize != -1); +#endif + +} + +static void +handle_stdout(void) +{ + off_t gsize, usize; + struct stat sb; + time_t systime; + uint32_t mtime; + int ret; + +#ifndef SMALL + if (fflag == 0 && isatty(STDOUT_FILENO)) { + maybe_warnx("standard output is a terminal -- ignoring"); + return; + } +#endif + /* If stdin is a file use it's mtime, otherwise use current time */ + ret = fstat(STDIN_FILENO, &sb); + +#ifndef SMALL + if (ret < 0) { + maybe_warn("Can't stat stdin"); + return; + } +#endif + + if (S_ISREG(sb.st_mode)) + mtime = (uint32_t)sb.st_mtime; + else { + systime = time(NULL); +#ifndef SMALL + if (systime == -1) { + maybe_warn("time"); + return; + } +#endif + mtime = (uint32_t)systime; + } + + usize = gz_compress(STDIN_FILENO, STDOUT_FILENO, &gsize, "", mtime); +#ifndef SMALL + if (vflag && !tflag && usize != -1 && gsize != -1) + print_verbage(NULL, NULL, usize, gsize); +#endif +} + +/* do what is asked for, for the path name */ +static void +handle_pathname(char *path) +{ + char *opath = path, *s = NULL; + ssize_t len; + int slen; + struct stat sb; + + /* check for stdout/stdin */ + if (path[0] == '-' && path[1] == '\0') { + if (dflag) + handle_stdin(); + else + handle_stdout(); + return; + } + +#ifdef __APPLE__ + if (zcat && COMPAT_MODE("bin/zcat", "Unix2003")) { + char *suffix = strrchr(path, '.'); + if (suffix == NULL || strcmp(suffix, Z_SUFFIX) != 0) { + len = strlen(path); + slen = sizeof(Z_SUFFIX) - 1; + s = malloc(len + slen + 1); + memcpy(s, path, len); + memcpy(s + len, Z_SUFFIX, slen + 1); + path = s; + } + } +#endif + +retry: + if (stat(path, &sb) != 0 || (fflag == 0 && cflag == 0 && + lstat(path, &sb) != 0)) { + /* lets try .gz if we're decompressing */ + if (dflag && s == NULL && errno == ENOENT) { + len = strlen(path); + slen = suffixes[0].ziplen; + s = malloc(len + slen + 1); + if (s == NULL) + maybe_err("malloc"); + memcpy(s, path, len); + memcpy(s + len, suffixes[0].zipped, slen + 1); + path = s; + goto retry; + } +#ifdef __APPLE__ + /* Include actual path for clarity. */ + maybe_warn("can't stat: %s (%s)", opath, path); +#else + maybe_warn("can't stat: %s", opath); +#endif + goto out; + } + + if (S_ISDIR(sb.st_mode)) { +#ifndef SMALL + if (rflag) + handle_dir(path); + else +#endif + maybe_warnx("%s is a directory", path); + goto out; + } + + if (S_ISREG(sb.st_mode)) + handle_file(path, &sb); + else + maybe_warnx("%s is not a regular file", path); + +out: + if (s) + free(s); +} + +/* compress/decompress a file */ +static void +handle_file(char *file, struct stat *sbp) +{ + off_t usize, gsize; + char outfile[PATH_MAX]; + + infile = file; + if (dflag) { + usize = file_uncompress(file, outfile, sizeof(outfile)); +#ifndef SMALL + if (vflag && tflag) + print_test(file, usize != -1); +#endif + if (usize == -1) + return; + gsize = sbp->st_size; + } else { + gsize = file_compress(file, outfile, sizeof(outfile)); + if (gsize == -1) + return; + usize = sbp->st_size; + } + + +#ifndef SMALL + if (vflag && !tflag) + print_verbage(file, (cflag) ? NULL : outfile, usize, gsize); +#endif +} + +#ifndef SMALL +/* this is used with -r to recursively descend directories */ +static void +handle_dir(char *dir) +{ + char *path_argv[2]; + FTS *fts; + FTSENT *entry; + + path_argv[0] = dir; + path_argv[1] = 0; + fts = fts_open(path_argv, FTS_PHYSICAL | FTS_NOCHDIR, NULL); + if (fts == NULL) { + warn("couldn't fts_open %s", dir); + return; + } + + while ((entry = fts_read(fts))) { + switch(entry->fts_info) { + case FTS_D: + case FTS_DP: + continue; + + case FTS_DNR: + case FTS_ERR: + case FTS_NS: + maybe_warn("%s", entry->fts_path); + continue; + case FTS_F: + handle_file(entry->fts_path, entry->fts_statp); + } + } + (void)fts_close(fts); +} +#endif + +/* print a ratio - size reduction as a fraction of uncompressed size */ +static void +print_ratio(off_t in, off_t out, FILE *where) +{ + int percent10; /* 10 * percent */ + off_t diff; + char buff[8]; + int len; + + diff = in - out/2; + if (diff <= 0) + /* + * Output is more than double size of input! print -99.9% + * Quite possibly we've failed to get the original size. + */ + percent10 = -999; + else { + /* + * We only need 12 bits of result from the final division, + * so reduce the values until a 32bit division will suffice. + */ + while (in > 0x100000) { + diff >>= 1; + in >>= 1; + } + if (in != 0) + percent10 = ((u_int)diff * 2000) / (u_int)in - 1000; + else + percent10 = 0; + } + + len = snprintf(buff, sizeof buff, "%2.2d.", percent10); + /* Move the '.' to before the last digit */ + buff[len - 1] = buff[len - 2]; + buff[len - 2] = '.'; + fprintf(where, "%5s%%", buff); +} + +#ifndef SMALL +/* print compression statistics, and the new name (if there is one!) */ +static void +print_verbage(const char *file, const char *nfile, off_t usize, off_t gsize) +{ + if (file) + fprintf(stderr, "%s:%s ", file, + strlen(file) < 7 ? "\t\t" : "\t"); + print_ratio(usize, gsize, stderr); + if (nfile) + fprintf(stderr, " -- replaced with %s", nfile); + fprintf(stderr, "\n"); + fflush(stderr); +} + +/* print test results */ +static void +print_test(const char *file, int ok) +{ + + if (exit_value == 0 && ok == 0) + exit_value = 1; + fprintf(stderr, "%s:%s %s\n", file, + strlen(file) < 7 ? "\t\t" : "\t", ok ? "OK" : "NOT OK"); + fflush(stderr); +} +#endif + +/* print a file's info ala --list */ +/* eg: + compressed uncompressed ratio uncompressed_name + 354841 1679360 78.8% /usr/pkgsrc/distfiles/libglade-2.0.1.tar +*/ +static void +print_list(int fd, off_t out, const char *outfile, time_t ts) +{ + static int first = 1; +#ifndef SMALL + static off_t in_tot, out_tot; + uint32_t crc = 0; +#endif + off_t in = 0, rv; + + if (first) { +#ifndef SMALL + if (vflag) + printf("method crc date time "); +#endif + if (qflag == 0) + printf(" compressed uncompressed " + "ratio uncompressed_name\n"); + } + first = 0; + + /* print totals? */ +#ifndef SMALL + if (fd == -1) { + in = in_tot; + out = out_tot; + } else +#endif + { + /* read the last 4 bytes - this is the uncompressed size */ + rv = lseek(fd, (off_t)(-8), SEEK_END); + if (rv != -1) { + unsigned char buf[8]; + uint32_t usize; + + rv = read(fd, (char *)buf, sizeof(buf)); + if (rv == -1) + maybe_warn("read of uncompressed size"); + else if (rv != sizeof(buf)) + maybe_warnx("read of uncompressed size"); + + else { + usize = buf[4] | buf[5] << 8 | + buf[6] << 16 | buf[7] << 24; + in = (off_t)usize; +#ifndef SMALL + crc = buf[0] | buf[1] << 8 | + buf[2] << 16 | buf[3] << 24; +#endif + } + } + } + +#ifndef SMALL + if (vflag && fd == -1) + printf(" "); + else if (vflag) { + char *date = ctime(&ts); + + /* skip the day, 1/100th second, and year */ + date += 4; + date[12] = 0; + printf("%5s %08x %11s ", "defla"/*XXX*/, crc, date); + } + in_tot += in; + out_tot += out; +#else + (void)&ts; /* XXX */ +#endif + printf("%12llu %12llu ", (unsigned long long)out, (unsigned long long)in); + print_ratio(in, out, stdout); + printf(" %s\n", outfile); +} + +/* display the usage of NetBSD gzip */ +static void +usage(void) +{ + + fprintf(stderr, "%s\n", gzip_version); + fprintf(stderr, +#ifdef SMALL + "usage: %s [-" OPT_LIST "] [ [ ...]]\n", +#else + "usage: %s [-123456789acdfhklLNnqrtVv] [-S .suffix] [ [ ...]]\n" + " -1 --fast fastest (worst) compression\n" + " -2 .. -8 set compression level\n" + " -9 --best best (slowest) compression\n" + " -c --stdout write to stdout, keep original files\n" + " --to-stdout\n" + " -d --decompress uncompress files\n" + " --uncompress\n" + " -f --force force overwriting & compress links\n" + " -h --help display this help\n" + " -k --keep don't delete input files during operation\n" + " -l --list list compressed file contents\n" + " -N --name save or restore original file name and time stamp\n" + " -n --no-name don't save original file name or time stamp\n" + " -q --quiet output no warnings\n" + " -r --recursive recursively compress files in directories\n" + " -S .suf use suffix .suf instead of .gz\n" + " --suffix .suf\n" + " -t --test test compressed file\n" + " -V --version display program version\n" + " -v --verbose print extra statistics\n", +#endif + getprogname()); + exit(0); +} + +#ifndef SMALL +/* display the license information of FreeBSD gzip */ +static void +display_license(void) +{ + +#ifdef __APPLE__ + fprintf(stderr, "%s (based on FreeBSD gzip 20111009)\n", gzip_version); +#else + fprintf(stderr, "%s (based on NetBSD gzip 20111009)\n", gzip_version); +#endif + fprintf(stderr, "%s\n", gzip_copyright); + exit(0); +} +#endif + +/* display the version of NetBSD gzip */ +static void +display_version(void) +{ + + fprintf(stderr, "%s\n", gzip_version); + exit(0); +} + +#ifndef NO_BZIP2_SUPPORT +#include "unbzip2.c" +#endif +#ifndef NO_COMPRESS_SUPPORT +#include "zuncompress.c" +#endif +#ifndef NO_PACK_SUPPORT +#include "unpack.c" +#endif +#ifndef NO_XZ_SUPPORT +#include "unxz.c" +#endif + +static ssize_t +read_retry(int fd, void *buf, size_t sz) +{ + char *cp = buf; + size_t left = MIN(sz, (size_t) SSIZE_MAX); + + while (left > 0) { + ssize_t ret; + + ret = read(fd, cp, left); + if (ret == -1) { + return ret; + } else if (ret == 0) { + break; /* EOF */ + } + cp += ret; + left -= ret; + } + + return sz - left; +} diff --git a/gzip/gzip.plist b/gzip/gzip.plist new file mode 100644 index 0000000..a0190fd --- /dev/null +++ b/gzip/gzip.plist @@ -0,0 +1,29 @@ + + + + + OpenSourceImportDate + 2012-10-25 + OpenSourceLicense + bsd + OpenSourceLicenseFile + gzip.txt + OpenSourceModifications + + gzip.c: adjust --version output + gzip.c: timespec portability fixes + gzip.c: preserve ACLs/EAs (3753276) + gzip.c: clear type/creator (4123341) + gzip.c, gzip.1: zcat conformance (3675040) + zmore: work as zless or zmore + + OpenSourceProject + gzip + OpenSourceSCM + cvs -d :pserver:anoncvs@anoncvs.fr.FreeBSD.org:/home/ncvs co src/usr.bin/gzip + OpenSourceVersion + 2012-10-19 + OpenSourceWebsiteURL + http://svnweb.freebsd.org/base/head/usr.bin/gzip/ + + diff --git a/gzip/gzip.xcconfig b/gzip/gzip.xcconfig new file mode 100644 index 0000000..382cbbf --- /dev/null +++ b/gzip/gzip.xcconfig @@ -0,0 +1,49 @@ +PRODUCT_NAME = $(TARGET_NAME) +GZIP_PREFIX = /usr/local +GZIP_PREFIX[sdk=macosx*] = /usr +INSTALL_PATH = $(GZIP_PREFIX)/bin + +GCC_PREPROCESSOR_DEFINITIONS = GZIP_APPLE_VERSION=\"$(RC_ProjectSourceVersion)\" + +// Make it build in the GUI +SUPPORTED_PLATFORMS = iphoneos macosx +ARCHS[sdk=macosx*] = x86_64 +RUN_CLANG_STATIC_ANALYZER = YES + +// Versioning +CURRENT_PROJECT_VERSION = $(RC_ProjectSourceVersion) +VERSIONING_SYSTEM = apple-generic +VERSION_INFO_PREFIX = __ + +// Other Stuff +ALWAYS_SEARCH_USER_PATHS = NO +APPLY_RULES_IN_COPY_FILES = YES +CODE_SIGN_IDENTITY = - +DEAD_CODE_STRIPPING = YES +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +STRIP_INSTALLED_PRODUCT = YES +USE_HEADERMAP = NO + +// Warnings +//CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES +//CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES +GCC_TREAT_WARNINGS_AS_ERRORS = YES +//GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES +GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_SHADOW = YES +GCC_WARN_SIGN_COMPARE = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNKNOWN_PRAGMAS = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_LABEL = YES +GCC_WARN_UNUSED_PARAMETER = YES +GCC_WARN_UNUSED_VARIABLE = YES + +// Used by install_scripts.sh +GZIP_SCRIPTS = gzexe zdiff zforce zmore znew +GZIP_LINKS = gzip gunzip gzip gzcat gzip zcat zdiff zcmp zmore zless diff --git a/gzip/install_scripts.sh b/gzip/install_scripts.sh new file mode 100644 index 0000000..6e8e550 --- /dev/null +++ b/gzip/install_scripts.sh @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +INSTALL_MAN1_DIR=${INSTALL_ROOT}${GZIP_PREFIX}/share/man/man1 + +install -d -m 0755 "${INSTALL_MAN1_DIR}" +for script in ${GZIP_SCRIPTS}; do + printf "Installing ${script} ...\n" + install -m 0755 ${SRCROOT}/gzip/${script} ${INSTALL_DIR}/${script} + install -m 0644 ${SRCROOT}/gzip/${script}.1 ${INSTALL_MAN1_DIR}/${script}.1 +done + +set ${GZIP_LINKS} +while [ $# -ge 2 ]; do + l=$1 + shift + t=$1 + shift + printf "Creating link: ${t} -> ${l} ...\n" + ln -f ${INSTALL_DIR}/${l} ${INSTALL_DIR}/${t} + ln -f ${INSTALL_MAN1_DIR}/${l}.1 ${INSTALL_MAN1_DIR}/${t}.1 +done diff --git a/gzip/unbzip2.c b/gzip/unbzip2.c new file mode 100644 index 0000000..4192e9b --- /dev/null +++ b/gzip/unbzip2.c @@ -0,0 +1,141 @@ +/* $NetBSD: unbzip2.c,v 1.13 2009/12/05 03:23:37 mrg Exp $ */ + +/*- + * Copyright (c) 2006 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Simon Burge. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/usr.bin/gzip/unbzip2.c,v 1.5 2010/04/07 22:54:53 delphij Exp $ + */ + +/* This file is #included by gzip.c */ + +static off_t +unbzip2(int in, int out, char *pre, size_t prelen, off_t *bytes_in) +{ + int ret, end_of_file, cold = 0; + off_t bytes_out = 0; + bz_stream bzs; + static char *inbuf, *outbuf; + + if (inbuf == NULL) + inbuf = malloc(BUFLEN); + if (outbuf == NULL) + outbuf = malloc(BUFLEN); + if (inbuf == NULL || outbuf == NULL) + maybe_err("malloc"); + + bzs.bzalloc = NULL; + bzs.bzfree = NULL; + bzs.opaque = NULL; + + end_of_file = 0; + ret = BZ2_bzDecompressInit(&bzs, 0, 0); + if (ret != BZ_OK) + maybe_errx("bzip2 init"); + + /* Prepend. */ + bzs.avail_in = prelen; + bzs.next_in = pre; + + if (bytes_in) + *bytes_in = prelen; + + while (ret == BZ_OK) { + if (bzs.avail_in == 0 && !end_of_file) { + ssize_t n; + + n = read(in, inbuf, BUFLEN); + if (n < 0) + maybe_err("read"); + if (n == 0) + end_of_file = 1; + bzs.next_in = inbuf; + bzs.avail_in = n; + if (bytes_in) + *bytes_in += n; + } + + bzs.next_out = outbuf; + bzs.avail_out = BUFLEN; + ret = BZ2_bzDecompress(&bzs); + + switch (ret) { + case BZ_STREAM_END: + case BZ_OK: + if (ret == BZ_OK && end_of_file) { + /* + * If we hit this after a stream end, consider + * it as the end of the whole file and don't + * bail out. + */ + if (cold == 1) + ret = BZ_STREAM_END; + else + maybe_errx("truncated file"); + } + cold = 0; + if (!tflag && bzs.avail_out != BUFLEN) { + ssize_t n; + + n = write(out, outbuf, BUFLEN - bzs.avail_out); + if (n < 0) + maybe_err("write"); + bytes_out += n; + } + if (ret == BZ_STREAM_END && !end_of_file) { + if (BZ2_bzDecompressEnd(&bzs) != BZ_OK || + BZ2_bzDecompressInit(&bzs, 0, 0) != BZ_OK) + maybe_errx("bzip2 re-init"); + cold = 1; + ret = BZ_OK; + } + break; + + case BZ_DATA_ERROR: + maybe_warnx("bzip2 data integrity error"); + break; + + case BZ_DATA_ERROR_MAGIC: + maybe_warnx("bzip2 magic number error"); + break; + + case BZ_MEM_ERROR: + maybe_warnx("bzip2 out of memory"); + break; + + default: + maybe_warnx("unknown bzip2 error: %d", ret); + break; + } + } + + if (ret != BZ_STREAM_END || BZ2_bzDecompressEnd(&bzs) != BZ_OK) + return (-1); + + return (bytes_out); +} + diff --git a/gzip/unpack.c b/gzip/unpack.c new file mode 100644 index 0000000..dbad588 --- /dev/null +++ b/gzip/unpack.c @@ -0,0 +1,329 @@ +/*- + * Copyright (c) 2009 Xin LI + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/usr.bin/gzip/unpack.c,v 1.3 2010/10/16 15:24:04 bcr Exp $ + */ + +/* This file is #included by gzip.c */ + +/* + * pack(1) file format: + * + * The first 7 bytes is the header: + * 00, 01 - Signature (US, RS), we already validated it earlier. + * 02..05 - Uncompressed size + * 06 - Level for the huffman tree (<=24) + * + * pack(1) will then store symbols (leaf) nodes count in each huffman + * tree levels, each level would consume 1 byte (See [1]). + * + * After the symbol count table, there is the symbol table, storing + * symbols represented by corresponding leaf node. EOB is not being + * explicitly transmitted (not necessary anyway) in the symbol table. + * + * Compressed data goes after the symbol table. + * + * NOTES + * + * [1] If we count EOB into the symbols, that would mean that we will + * have at most 256 symbols in the huffman tree. pack(1) rejects empty + * file and files that just repeats one character, which means that we + * will have at least 2 symbols. Therefore, pack(1) would reduce the + * last level symbol count by 2 which makes it a number in + * range [0..254], so all levels' symbol count would fit into 1 byte. + */ + +#define PACK_HEADER_LENGTH 7 +#define HTREE_MAXLEVEL 24 + +/* + * unpack descriptor + * + * Represent the huffman tree in a similar way that pack(1) would + * store in a packed file. We store all symbols in a linear table, + * and store pointers to each level's first symbol. In addition to + * that, maintain two counts for each level: inner nodes count and + * leaf nodes count. + */ +typedef struct { + int symbol_size; /* Size of the symbol table */ + int treelevels; /* Levels for the huffman tree */ + + int *symbolsin; /* Table of leaf symbols count in + each level */ + int *inodesin; /* Table of internal nodes count in + each level */ + + char *symbol; /* The symbol table */ + char *symbol_eob; /* Pointer to the EOB symbol */ + char **tree; /* Decoding huffman tree (pointers to + first symbol of each tree level */ + + off_t uncompressed_size; /* Uncompressed size */ + FILE *fpIn; /* Input stream */ + FILE *fpOut; /* Output stream */ +} unpack_descriptor_t; + +/* + * Release resource allocated to an unpack descriptor. + * + * Caller is responsible to make sure that all of these pointers are + * initialized (in our case, they all point to valid memory block). + * We don't zero out pointers here because nobody else would ever + * reference the memory block without scrubbing them. + */ +static void +unpack_descriptor_fini(unpack_descriptor_t *unpackd) +{ + + free(unpackd->symbolsin); + free(unpackd->inodesin); + free(unpackd->symbol); + free(unpackd->tree); + + fclose(unpackd->fpIn); + fclose(unpackd->fpOut); +} + +/* + * Recursively fill the internal node count table + */ +static void +unpackd_fill_inodesin(const unpack_descriptor_t *unpackd, int level) +{ + + /* + * The internal nodes would be 1/2 of total internal nodes and + * leaf nodes in the next level. For the last level there + * would be no internal node by definition. + */ + if (level < unpackd->treelevels) { + unpackd_fill_inodesin(unpackd, level + 1); + unpackd->inodesin[level] = (unpackd->inodesin[level + 1] + + unpackd->symbolsin[level + 1]) / 2; + } else + unpackd->inodesin[level] = 0; +} + +/* + * Update counter for accepted bytes + */ +static void +accepted_bytes(off_t *bytes_in, off_t newbytes) +{ + + if (bytes_in != NULL) + (*bytes_in) += newbytes; +} + +/* + * Read file header and construct the tree. Also, prepare the buffered I/O + * for decode routine. + * + * Return value is uncompressed size. + */ +static void +unpack_parse_header(int in, int out, char *pre, size_t prelen, off_t *bytes_in, + unpack_descriptor_t *unpackd) +{ + unsigned char hdr[PACK_HEADER_LENGTH]; /* buffer for header */ + ssize_t bytesread; /* Bytes read from the file */ + int i, j, thisbyte; + + /* Prepend the header buffer if we already read some data */ + if (prelen != 0) + memcpy(hdr, pre, prelen); + + /* Read in and fill the rest bytes of header */ + bytesread = read(in, hdr + prelen, PACK_HEADER_LENGTH - prelen); + if (bytesread < 0) + maybe_err("Error reading pack header"); + + accepted_bytes(bytes_in, PACK_HEADER_LENGTH); + + /* Obtain uncompressed length (bytes 2,3,4,5)*/ + unpackd->uncompressed_size = 0; + for (i = 2; i <= 5; i++) { + unpackd->uncompressed_size <<= 8; + unpackd->uncompressed_size |= hdr[i]; + } + + /* Get the levels of the tree */ + unpackd->treelevels = hdr[6]; + if (unpackd->treelevels > HTREE_MAXLEVEL || unpackd->treelevels < 1) + maybe_errx("Huffman tree has insane levels"); + + /* Let libc take care for buffering from now on */ + if ((unpackd->fpIn = fdopen(in, "r")) == NULL) + maybe_err("Can not fdopen() input stream"); + if ((unpackd->fpOut = fdopen(out, "w")) == NULL) + maybe_err("Can not fdopen() output stream"); + + /* Allocate for the tables of bounds and the tree itself */ + unpackd->inodesin = + calloc(unpackd->treelevels, sizeof(*(unpackd->inodesin))); + unpackd->symbolsin = + calloc(unpackd->treelevels, sizeof(*(unpackd->symbolsin))); + unpackd->tree = + calloc(unpackd->treelevels, (sizeof (*(unpackd->tree)))); + if (unpackd->inodesin == NULL || unpackd->symbolsin == NULL || + unpackd->tree == NULL) + maybe_err("calloc"); + + /* We count from 0 so adjust to match array upper bound */ + unpackd->treelevels--; + + /* Read the levels symbol count table and calculate total */ + unpackd->symbol_size = 1; /* EOB */ + for (i = 0; i <= unpackd->treelevels; i++) { + if ((thisbyte = fgetc(unpackd->fpIn)) == EOF) + maybe_err("File appears to be truncated"); + unpackd->symbolsin[i] = (unsigned char)thisbyte; + unpackd->symbol_size += unpackd->symbolsin[i]; + } + accepted_bytes(bytes_in, unpackd->treelevels); + if (unpackd->symbol_size > 256) + maybe_errx("Bad symbol table"); + + /* Allocate for the symbol table, point symbol_eob at the beginning */ + unpackd->symbol_eob = unpackd->symbol = calloc(1, unpackd->symbol_size); + if (unpackd->symbol == NULL) + maybe_err("calloc"); + + /* + * Read in the symbol table, which contain [2, 256] symbols. + * In order to fit the count in one byte, pack(1) would offset + * it by reducing 2 from the actual number from the last level. + * + * We adjust the last level's symbol count by 1 here, because + * the EOB symbol is not being transmitted explicitly. Another + * adjustment would be done later afterward. + */ + unpackd->symbolsin[unpackd->treelevels]++; + for (i = 0; i <= unpackd->treelevels; i++) { + unpackd->tree[i] = unpackd->symbol_eob; + for (j = 0; j < unpackd->symbolsin[i]; j++) { + if ((thisbyte = fgetc(unpackd->fpIn)) == EOF) + maybe_errx("Symbol table truncated"); + *unpackd->symbol_eob++ = (char)thisbyte; + } + accepted_bytes(bytes_in, unpackd->symbolsin[i]); + } + + /* Now, take account for the EOB symbol as well */ + unpackd->symbolsin[unpackd->treelevels]++; + + /* + * The symbolsin table has been constructed now. + * Calculate the internal nodes count table based on it. + */ + unpackd_fill_inodesin(unpackd, 0); +} + +/* + * Decode huffman stream, based on the huffman tree. + */ +static void +unpack_decode(const unpack_descriptor_t *unpackd, off_t *bytes_in) +{ + int thislevel, thiscode, thisbyte, inlevelindex; + int i; + off_t bytes_out = 0; + const char *thissymbol; /* The symbol pointer decoded from stream */ + + /* + * Decode huffman. Fetch every bytes from the file, get it + * into 'thiscode' bit-by-bit, then output the symbol we got + * when one has been found. + * + * Assumption: sizeof(int) > ((max tree levels + 1) / 8). + * bad things could happen if not. + */ + thislevel = 0; + thiscode = thisbyte = 0; + + while ((thisbyte = fgetc(unpackd->fpIn)) != EOF) { + accepted_bytes(bytes_in, 1); + + /* + * Split one bit from thisbyte, from highest to lowest, + * feed the bit into thiscode, until we got a symbol from + * the tree. + */ + for (i = 7; i >= 0; i--) { + thiscode = (thiscode << 1) | ((thisbyte >> i) & 1); + + /* Did we got a symbol? (referencing leaf node) */ + if (thiscode >= unpackd->inodesin[thislevel]) { + inlevelindex = + thiscode - unpackd->inodesin[thislevel]; + if (inlevelindex > unpackd->symbolsin[thislevel]) + maybe_errx("File corrupt"); + + thissymbol = + &(unpackd->tree[thislevel][inlevelindex]); + if ((thissymbol == unpackd->symbol_eob) && + (bytes_out == unpackd->uncompressed_size)) + goto finished; + + fputc((*thissymbol), unpackd->fpOut); + bytes_out++; + + /* Prepare for next input */ + thislevel = 0; thiscode = 0; + } else { + thislevel++; + if (thislevel > unpackd->treelevels) + maybe_errx("File corrupt"); + } + } + } + +finished: + if (bytes_out != unpackd->uncompressed_size) + maybe_errx("Premature EOF"); +} + +/* Handler for pack(1)'ed file */ +static off_t +unpack(int in, int out, char *pre, size_t prelen, off_t *bytes_in) +{ + unpack_descriptor_t unpackd; + + in = dup(in); + if (in == -1) + maybe_err("dup"); + out = dup(out); + if (out == -1) + maybe_err("dup"); + + unpack_parse_header(in, out, pre, prelen, bytes_in, &unpackd); + unpack_decode(&unpackd, bytes_in); + unpack_descriptor_fini(&unpackd); + + /* If we reached here, the unpack was successful */ + return (unpackd.uncompressed_size); +} + diff --git a/gzip/unxz.c b/gzip/unxz.c new file mode 100644 index 0000000..df48ae3 --- /dev/null +++ b/gzip/unxz.c @@ -0,0 +1,153 @@ +/* $NetBSD: unxz.c,v 1.5 2011/09/30 01:32:21 christos Exp $ */ + +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#include +__FBSDID("$FreeBSD: src/usr.bin/gzip/unxz.c,v 1.2 2011/10/16 07:35:26 delphij Exp $"); + +#include +#include +#include +#include +#include + +static off_t +unxz(int i, int o, char *pre, size_t prelen, off_t *bytes_in) +{ + lzma_stream strm = LZMA_STREAM_INIT; + static const int flags = LZMA_TELL_UNSUPPORTED_CHECK|LZMA_CONCATENATED; + lzma_ret ret; + lzma_action action = LZMA_RUN; + off_t bytes_out, bp; + uint8_t ibuf[BUFSIZ]; + uint8_t obuf[BUFSIZ]; + + if (bytes_in == NULL) + bytes_in = &bp; + + strm.next_in = ibuf; + memcpy(ibuf, pre, prelen); + strm.avail_in = read(i, ibuf + prelen, sizeof(ibuf) - prelen); + if (strm.avail_in == (size_t)-1) + maybe_err("read failed"); + strm.avail_in += prelen; + *bytes_in = strm.avail_in; + + if ((ret = lzma_stream_decoder(&strm, UINT64_MAX, flags)) != LZMA_OK) + maybe_errx("Can't initialize decoder (%d)", ret); + + strm.next_out = NULL; + strm.avail_out = 0; + if ((ret = lzma_code(&strm, LZMA_RUN)) != LZMA_OK) + maybe_errx("Can't read headers (%d)", ret); + + bytes_out = 0; + strm.next_out = obuf; + strm.avail_out = sizeof(obuf); + + for (;;) { + if (strm.avail_in == 0) { + strm.next_in = ibuf; + strm.avail_in = read(i, ibuf, sizeof(ibuf)); + switch (strm.avail_in) { + case (size_t)-1: + maybe_err("read failed"); + /*NOTREACHED*/ + case 0: + action = LZMA_FINISH; + break; + default: + *bytes_in += strm.avail_in; + break; + } + } + + ret = lzma_code(&strm, action); + + // Write and check write error before checking decoder error. + // This way as much data as possible gets written to output + // even if decoder detected an error. + if (strm.avail_out == 0 || ret != LZMA_OK) { + const size_t write_size = sizeof(obuf) - strm.avail_out; + + if (write(o, obuf, write_size) != (ssize_t)write_size) + maybe_err("write failed"); + + strm.next_out = obuf; + strm.avail_out = sizeof(obuf); + bytes_out += write_size; + } + + if (ret != LZMA_OK) { + if (ret == LZMA_STREAM_END) { + // Check that there's no trailing garbage. + if (strm.avail_in != 0 || read(i, ibuf, 1)) + ret = LZMA_DATA_ERROR; + else { + lzma_end(&strm); + return bytes_out; + } + } + + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = strerror(ENOMEM); + break; + + case LZMA_FORMAT_ERROR: + msg = "File format not recognized"; + break; + + case LZMA_OPTIONS_ERROR: + // FIXME: Better message? + msg = "Unsupported compression options"; + break; + + case LZMA_DATA_ERROR: + msg = "File is corrupt"; + break; + + case LZMA_BUF_ERROR: + msg = "Unexpected end of input"; + break; + + case LZMA_MEMLIMIT_ERROR: + msg = "Reached memory limit"; + break; + + default: + maybe_errx("Unknown error (%d)", ret); + break; + } + maybe_errx("%s", msg); + + } + } +} diff --git a/gzip/zdiff b/gzip/zdiff new file mode 100644 index 0000000..87863c0 --- /dev/null +++ b/gzip/zdiff @@ -0,0 +1,142 @@ +#!/bin/sh - +# +# $NetBSD: zdiff,v 1.5 2010/04/14 20:30:28 joerg Exp $ +# +# $OpenBSD: zdiff,v 1.2 2003/07/29 07:42:44 otto Exp $ +# +#- +# Copyright (c) 2003 Todd C. Miller +# Copyright (c) 2010 Joerg Sonnenberger +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Sponsored in part by the Defense Advanced Research Projects +# Agency (DARPA) and Air Force Research Laboratory, Air Force +# Materiel Command, USAF, under agreement number F39502-99-1-0512. +# +# $FreeBSD: src/usr.bin/gzip/zdiff,v 1.2 2011/05/23 09:02:44 delphij Exp $ + +# Set $prog based on $0 +case $0 in + *cmp) prog=cmp + ;; + *) prog=diff + ;; +esac +USAGE="usage: $0 [options] file1 [file2]" + +check_suffix() { + case "$1" in + *[._-][Zz]) + setvar $2 "${1%??}" + setvar $3 "gzip -cdqf" + ;; + *[._-]bz) + setvar $2 "${1%???}" + setvar $3 "bzip2 -cdqf" + ;; + *[._-]gz) + setvar $2 "${1%???}" + setvar $3 "gzip -cdqf" + ;; + *[._-]xz) + setvar $2 "${1%???}" + setvar $3 "xz -cdqf" + ;; + *[._-]bz2) + setvar $2 "${1%????}" + setvar $3 "bzip2 -cdqf" + ;; + *[._-]lzma) + setvar $2 "${1%?????}" + setvar $3 "xz -cdqf" + ;; + *.t[ag]z) + setvar $2 "${1%??}"ar + setvar $3 "gzip -cdqf" + ;; + *.tbz) + setvar $2 "${1%??}"ar + setvar $3 "bzip2 -cdqf" + ;; + *.tbz2) + setvar $2 "${1%???}"ar + setvar $3 "bzip2 -cdqf" + ;; + *.t[lx]z) + setvar $2 "${1%??}"ar + setvar $3 "xz -cdqf" + ;; + *) + setvar $2 "$1" + setvar $3 "" + ;; + esac +} + + +# Pull out any command line flags so we can pass them to diff/cmp +# XXX - assumes there is no optarg +flags= +while test $# -ne 0; do + case "$1" in + --) + shift + break + ;; + -) + break + ;; + -*) + flags="$flags $1" + shift + ;; + *) + break + ;; + esac +done + +if [ $# -eq 1 ]; then + # One file given, compare compressed to uncompressed + files="$1" + check_suffix "$1" files filt + if [ -z "$filt" ]; then + echo "z$prog: unknown suffix" 1>&2 + exit 1 + fi + $filt -- "$1" | $prog $flags -- - "$files" + status=$? +elif [ $# -eq 2 ]; then + # Two files given, compare the two uncompressing as needed + check_suffix "$1" files filt + check_suffix "$2" files2 filt2 + if [ -z "$filt" -a -z "$filt2" ]; then + $prog $flags -- "$1" "$2" + elif [ -z "$filt" -a -n "$filt2" -a "$1" != "-" ]; then + $filt2 -- "$2" | $prog $flags -- "$1" - + elif [ -n "$filt" -a -z "$filt2" -a "$2" != "-" ]; then + $filt -- "$1" | $prog $flags -- - "$2" + else + tmp=`mktemp -t z$prog.XXXXXXXXXX` || exit 1 + trap "rm -f $tmp" 0 1 2 3 13 15 + ${filt2:-cat} -- "$2" > $tmp || exit $? + ${filt:-cat} -- "$1" | $prog $flags -- - "$tmp" + fi + status=$? +else + echo "$USAGE" 1>&2 + exit 1 +fi + +exit $status diff --git a/gzip/zdiff.1 b/gzip/zdiff.1 new file mode 100644 index 0000000..2e0ebea --- /dev/null +++ b/gzip/zdiff.1 @@ -0,0 +1,142 @@ +.\" $NetBSD: zdiff.1,v 1.5 2010/04/14 19:52:05 wiz Exp $ +.\" $OpenBSD: zdiff.1,v 1.2 2003/07/13 17:39:14 millert Exp $ +.\" +.\" Copyright (c) 2003 Todd C. Miller +.\" Copyright (c) 2010 Joerg Sonnenberger +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" Sponsored in part by the Defense Advanced Research Projects +.\" Agency (DARPA) and Air Force Research Laboratory, Air Force +.\" Materiel Command, USAF, under agreement number F39502-99-1-0512. +.\" +.\" $FreeBSD: src/usr.bin/gzip/zdiff.1,v 1.2 2011/05/23 09:02:44 delphij Exp $ +.Dd May 23, 2011 +.Dt ZDIFF 1 +.Os +.Sh NAME +.Nm zcmp , +.Nm zdiff +.Nd compare compressed files +.Sh SYNOPSIS +.Nm zcmp +.Op Ar options +.Ar file +.Op Ar file2 +.Nm zdiff +.Op Ar options +.Ar file +.Op Ar file2 +.Sh DESCRIPTION +.Nm zcmp +and +.Nm zdiff +are filters that invoke +.Xr cmp 1 +or +.Xr diff 1 +respectively to compare compressed files. +Any +.Ar options +that are specified are passed to +.Xr cmp 1 +or +.Xr diff 1 . +.Pp +If only +.Ar file1 +is specified, it is compared against a file with the same name, but +with the extension removed. +When both +.Ar file1 +or +.Ar file2 +are specified, either file may be compressed. +.Pp +Extensions handled by +.Xr gzip 1 : +.Bl -bullet -compact +.It +z, Z, +.It +gz, +.It +taz, +.It +tgz. +.El +.Pp +Extensions handled by +.Xr bzip2 1 : +.Bl -bullet -compact +.It +bz, +.It +bz2, +.It +tbz, +.It +tbz2. +.El +.Pp +Extensions handled by +.Xr xz 1 : +.Bl -bullet -compact +.It +lzma, +.It +xz, +.It +tlz, +.It +txz. +.El +.Sh ENVIRONMENT +.Bl -tag -width "TMPDIR" +.It Ev TMPDIR +Directory in which to place temporary files. +If unset, +.Pa /tmp +is used. +.El +.Sh FILES +.Bl -tag -width "/tmp/zdiff.XXXXXXXXXX" -compact +.It Pa /tmp/zcmp.XXXXXXXXXX +Temporary file for +.Nm zcmp . +.It Pa /tmp/zdiff.XXXXXXXXXX +Temporary file for +.Nm zdiff . +.El +.Sh SEE ALSO +.Xr bzip2 1 , +.Xr cmp 1 , +.Xr diff 1 , +.Xr gzip 1 , +.Xr xz 1 +.Sh CAVEATS +.Nm zcmp +and +.Nm zdiff +rely solely on the file extension to determine what is, or is not, +a compressed file. +Consequently, the following are not supported as arguments: +.Bl -dash +.It +directories +.It +device special files +.It +filenames indicating the standard input +.Pq Dq \- +.El diff --git a/gzip/zforce b/gzip/zforce new file mode 100644 index 0000000..243cbdf --- /dev/null +++ b/gzip/zforce @@ -0,0 +1,55 @@ +#!/bin/sh - +# +# $NetBSD: zforce,v 1.2 2003/12/28 12:43:43 wiz Exp $ +# $OpenBSD: zforce,v 1.2 2003/08/05 18:22:17 deraadt Exp $ +# +#- +# Copyright (c) 2003 Otto Moerbeek +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# $FreeBSD: src/usr.bin/gzip/zforce,v 1.1 2007/01/26 10:19:07 delphij Exp $ +prog=`basename $0` +USAGE="usage: $prog file ..." +if test $# -eq 0; then + echo $USAGE + exit 1 +fi + +ret=0 + +while test $# -ne 0; do + case "$1" in + *[._-]gz) + shift + ;; + *.t[ag]z) + shift + ;; + *) + if file "$1" | + grep -q "gzip compressed data" 2> /dev/null + then + n="$1".gz + if mv "$1" "$n" 2> /dev/null; then + echo "$1" -- renamed to "$n" + else + ret=1 + echo $prog: cannot rename "$1" to "$n" + fi + fi + shift + ;; + esac +done +exit $ret diff --git a/gzip/zforce.1 b/gzip/zforce.1 new file mode 100644 index 0000000..933d681 --- /dev/null +++ b/gzip/zforce.1 @@ -0,0 +1,53 @@ +.\" $NetBSD: zforce.1,v 1.2 2003/12/28 12:43:43 wiz Exp $ +.\" $OpenBSD: zforce.1,v 1.1 2003/07/29 11:50:09 otto Exp $ +.\" +.\" Copyright (c) 2003 Otto Moerbeek +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $FreeBSD: src/usr.bin/gzip/zforce.1,v 1.1 2007/01/26 10:19:07 delphij Exp $ +.Dd January 26, 2007 +.Dt ZFORCE 1 +.Os +.Sh NAME +.Nm zforce +.Nd force gzip files to have a .gz suffix +.Sh SYNOPSIS +.Nm zforce +.Ar +.Sh DESCRIPTION +The +.Nm +utility renames +.Xr gzip 1 +files to have a +.Sq .gz +suffix, so that +.Xr gzip 1 +will not compress them twice. +This can be useful if file names were truncated during a file transfer. +Files that have an existing +.Sq .gz , +.Sq -gz , +.Sq _gz , +.Sq .tgz +or +.Sq .taz +suffix, or that have not been compressed by +.Xr gzip 1 , +are ignored. +.Sh SEE ALSO +.Xr gzip 1 +.Sh CAVEATS +.Nm +overwrites existing files without warning. diff --git a/gzip/zmore b/gzip/zmore new file mode 100644 index 0000000..6b55c77 --- /dev/null +++ b/gzip/zmore @@ -0,0 +1,81 @@ +#!/bin/sh - +# +# $NetBSD: zmore,v 1.3 2004/03/29 09:59:42 wiz Exp $ +# $OpenBSD: zmore,v 1.4 2003/07/29 07:42:45 otto Exp $ +# +#- +# Copyright (c) 2003 Todd C. Miller +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Sponsored in part by the Defense Advanced Research Projects +# Agency (DARPA) and Air Force Research Laboratory, Air Force +# Materiel Command, USAF, under agreement number F39502-99-1-0512. +# +# $FreeBSD: src/usr.bin/gzip/zmore,v 1.1 2007/01/26 10:19:07 delphij Exp $ + +if [ "$0" = "zless" ]; then +zpager="less" +else +zpager="more" +fi + +# Pull out any command line flags so we can pass them to more/less +flags= +while test $# -ne 0; do + case "$1" in + --) + shift + break + ;; + -*) + flags="$flags $1" + shift + ;; + *) + break + ;; + esac +done + +# No files means read from stdin +if [ $# -eq 0 ]; then + gzip -cdfq 2>&1 | ${PAGER-${zpager}} $flags + exit 0 +fi + +oterm=`stty -g 2>/dev/null` +while test $# -ne 0; do + gzip -cdfq "$1" 2>&1 | ${PAGER-${zpager}} $flags + prev="$1" + shift + if tty -s && test -n "$oterm" -a $# -gt 0; then + #echo -n "--More--(Next file: $1)" + echo -n "$prev (END) - Next: $1 " + trap "stty $oterm 2>/dev/null" 0 1 2 3 13 15 + stty cbreak -echo 2>/dev/null + REPLY=`dd bs=1 count=1 2>/dev/null` + stty $oterm 2>/dev/null + trap - 0 1 2 3 13 15 + echo + case "$REPLY" in + s) + shift + ;; + e|q) + break + ;; + esac + fi +done +exit 0 diff --git a/gzip/zmore.1 b/gzip/zmore.1 new file mode 100644 index 0000000..19e7a03 --- /dev/null +++ b/gzip/zmore.1 @@ -0,0 +1,94 @@ +.\" $NetBSD: zmore.1,v 1.3 2003/12/28 12:47:52 wiz Exp $ +.\" $OpenBSD: zmore.1,v 1.3 2003/06/23 21:00:48 deraadt Exp $ +.\" +.\" Copyright (c) 2003 Todd C. Miller +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" Sponsored in part by the Defense Advanced Research Projects +.\" Agency (DARPA) and Air Force Research Laboratory, Air Force +.\" Materiel Command, USAF, under agreement number F39502-99-1-0512. +.\" +.\" $FreeBSD: src/usr.bin/gzip/zmore.1,v 1.3 2012/06/05 03:14:39 eadler Exp $ +.Dd February 6, 2011 +.Dt ZMORE 1 +.Os +.Sh NAME +.Nm zmore +.Nd view compressed files +.Sh SYNOPSIS +.Nm zmore +.Op Ar flags +.Op Ar file ... +.Sh DESCRIPTION +.Nm +is a filter that allows the viewing of files compressed with Lempel-Ziv +encoding. +Such files generally have a +.Dq Z +or +.Dq gz +extension (both the +.Xr compress 1 +and +.Xr gzip 1 +formats are supported). +Any +.Ar flags +that are specified are passed to the user's preferred +.Ev PAGER +(which is +.Pa /usr/bin/more +by default). +.Pp +When multiple files are specified, +.Nm +will pause at the end of each file and present the following prompt to the user: +.Bd -literal -offset indent +prev_file (END) - Next: next_file +.Ed +.Pp +Where +.Sy prev_file +is the file that was just displayed and +.Sy next_file +is the next file to be displayed. +The following keys are recognized at the prompt: +.Bl -tag -width "e or q" -offset indent +.It Ic e No or Ic q +quit +.Nm zmore . +.It Ic s +skip the next file (or exit if the next file is the last). +.El +.Pp +If no files are specified, +.Nm +will read from the standard input. +In this mode +.Nm +will assume +.Xr gzip 1 +style compression since there is no suffix on which to make a decision. +.Sh ENVIRONMENT +.Bl -tag -width "PAGER" +.It Ev PAGER +Program used to display files. +If unset, +.Pa /usr/bin/more +is used. +.El +.Sh SEE ALSO +.Xr compress 1 , +.Xr less 1 , +.Xr more 1 diff --git a/gzip/znew b/gzip/znew new file mode 100644 index 0000000..4a84f58 --- /dev/null +++ b/gzip/znew @@ -0,0 +1,137 @@ +#!/bin/sh - +# +# $NetBSD: znew,v 1.3 2008/04/27 09:07:13 nakayama Exp $ +# $OpenBSD: znew,v 1.2 2003/08/05 18:22:17 deraadt Exp $ +# +#- +# Copyright (c) 2003 Otto Moerbeek +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# $FreeBSD: src/usr.bin/gzip/znew,v 1.3 2008/06/30 23:53:15 delphij Exp $ + +# Return 0 if the first arg file size is smaller than the second, 1 otherwise. +smaller () { + a=`du -k "$1" | awk '{ print $1 }'` + b=`du -k "$2" | awk '{ print $1 }'` + test $a -lt $b +} + +# Check gzip integrity if the -t flag is specified +checkfile () { + if test $tflag -eq 1; then + gzip -qt < "$1" + fi +} + +# Decompress a file and then gzip it +process () { + prefix="${1%.Z}" + filez="$prefix".Z + filegz="$prefix".gz + + if test ! -e "$filez"; then + echo "$prog: $filez does not exist" + return 1 + fi + if test ! -f "$filez"; then + echo "$prog: $filez is not a regular file" + return 1 + fi + if test -e "$filegz" -a $fflag -eq 0; then + echo "$prog: $filegz already exists" + return 1 + fi + + tmp=`mktemp /tmp/znewXXXXXXXXXX` || { + echo "$prog: cannot create tmp file" + return 1 + } + trap 'rm -f "$tmp"; exit 1' HUP INT QUIT PIPE TERM + + # Do the actual work, producing a file "$tmp" + if uncompress -f -c < "$filez" | gzip -f -c $gzipflags > "$tmp"; then + if test $kflag -eq 1 && smaller "$filez" "$tmp"; then + echo -n "$prog: $filez is smaller than $filegz" + echo "; keeping it" + rm -f "$tmp" + return 0 + fi + if ! checkfile "$tmp"; then + echo "$prog: integrity check of $tmp failed" + rm -f "$tmp" + return 1; + fi + + # Try to keep the mode of the original file + if ! cp -fp "$filez" "$filegz"; then + echo "$prog: warning: could not keep mode of $filez" + fi + if ! cp "$tmp" "$filegz" 2> /dev/null; then + echo "$prog: warning: could not keep mode of $filez" + if ! cp -f "$tmp" "$filegz" 2> /dev/null; then + echo "$prog: could not copy $tmp to $filegz" + rm -f "$filegz" "$tmp" + return 1 + fi + fi + if ! touch -fr "$filez" "$filegz"; then + echo -n "$prog: warning: could not keep timestamp of " + echo "$filez" + fi + rm -f "$filez" "$tmp" + else + echo "$prog: failed to process $filez" + rm -f "$tmp" + return 1 + fi +} + +prog=`basename "$0"` +usage="usage: $prog [-ftv9K] file ..." + +fflag=0 +tflag=0 +kflag=0 +gzipflags= + +# -P flag is recognized to maintain compatibility, but ignored. Pipe mode is +# always used +while getopts :ftv9PK i; do + case $i in + f) fflag=1;; + t) tflag=1;; + v) gzipflags="-v $gzipflags";; + 9) gzipflags="-9 $gzipflags";; + P) ;; + K) kflag=1;; + \?) echo "$usage"; exit 1;; + esac +done + +shift $((OPTIND - 1)) + +if test $# -eq 0; then + echo "$usage" + exit 1 +fi + +rc=0 + +while test $# -ne 0; do + if ! process "$1"; then + rc=$? + fi + shift +done +exit $rc diff --git a/gzip/znew.1 b/gzip/znew.1 new file mode 100644 index 0000000..61060ca --- /dev/null +++ b/gzip/znew.1 @@ -0,0 +1,71 @@ +.\" $NetBSD: znew.1,v 1.2 2003/12/28 12:43:43 wiz Exp $ +.\" $OpenBSD: znew.1,v 1.1 2003/08/02 20:52:50 otto Exp $ +.\" +.\" Copyright (c) 2003 Otto Moerbeek +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $FreeBSD: src/usr.bin/gzip/znew.1,v 1.1 2007/01/26 10:19:07 delphij Exp $ +.Dd January 26, 2007 +.Dt ZNEW 1 +.Os +.Sh NAME +.Nm znew +.Nd convert compressed files to gzipped files +.Sh SYNOPSIS +.Nm +.Op Fl ftv9K +.Ar +.Sh DESCRIPTION +The +.Nm +utility uncompresses files compressed by +.Xr compress 1 +and recompresses them with +.Xr gzip 1 . +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl f +Overwrite existing +.Sq .gz +files. +Unless this option is specified, +.Nm +refuses to overwrite existing files. +.It Fl t +Test integrity of the gzipped file before deleting the original file. +If the integrity check fails, the original +.Sq .Z +file is not removed. +.It Fl v +Print a report specifying the achieved compression ratios. +.It Fl 9 +Use the -9 mode of +.Xr gzip 1 , +achieving better compression at the cost of slower execution. +.It Fl K +Keep the original +.Sq .Z +file if it uses less disk blocks than the gzipped one. +A disk block is 1024 bytes. +.El +.Sh SEE ALSO +.Xr gzip 1 +.Sh CAVEATS +The +.Nm +utility tries to maintain the file mode of the original file. +If the original file is not writable, it is not able to do that and +.Nm +will print a warning. diff --git a/gzip/zuncompress.c b/gzip/zuncompress.c new file mode 100644 index 0000000..454f05b --- /dev/null +++ b/gzip/zuncompress.c @@ -0,0 +1,396 @@ +/* $NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */ + +/*- + * Copyright (c) 1985, 1986, 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Diomidis Spinellis and James A. Woods, derived from original + * work by Spencer Thomas and Joseph Orost. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * from: NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp + * $FreeBSD: src/usr.bin/gzip/zuncompress.c,v 1.7 2012/10/19 14:49:42 ed Exp $ + */ + +/* This file is #included by gzip.c */ + +static int zread(void *, char *, int); + +#define tab_prefixof(i) (zs->zs_codetab[i]) +#define tab_suffixof(i) ((char_type *)(zs->zs_htab))[i] +#define de_stack ((char_type *)&tab_suffixof(1 << BITS)) + +#define BITS 16 /* Default bits. */ +#define HSIZE 69001 /* 95% occupancy */ /* XXX may not need HSIZE */ +#define BIT_MASK 0x1f /* Defines for third byte of header. */ +#define BLOCK_MASK 0x80 +#define CHECK_GAP 10000 /* Ratio check interval. */ +#define BUFSIZE (64 * 1024) + +/* + * Masks 0x40 and 0x20 are free. I think 0x20 should mean that there is + * a fourth header byte (for expansion). + */ +#define INIT_BITS 9 /* Initial number of bits/code. */ + +/* + * the next two codes should not be changed lightly, as they must not + * lie within the contiguous general code space. + */ +#define FIRST 257 /* First free entry. */ +#define CLEAR 256 /* Table clear output code. */ + + +#define MAXCODE(n_bits) ((1 << (n_bits)) - 1) + +typedef long code_int; +typedef long count_int; +typedef u_char char_type; + +static char_type magic_header[] = + {'\037', '\235'}; /* 1F 9D */ + +static char_type rmask[9] = + {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; + +static off_t total_compressed_bytes; +static size_t compressed_prelen; +static char *compressed_pre; + +struct s_zstate { + FILE *zs_fp; /* File stream for I/O */ + char zs_mode; /* r or w */ + enum { + S_START, S_MIDDLE, S_EOF + } zs_state; /* State of computation */ + int zs_n_bits; /* Number of bits/code. */ + int zs_maxbits; /* User settable max # bits/code. */ + code_int zs_maxcode; /* Maximum code, given n_bits. */ + code_int zs_maxmaxcode; /* Should NEVER generate this code. */ + count_int zs_htab [HSIZE]; + u_short zs_codetab [HSIZE]; + code_int zs_hsize; /* For dynamic table sizing. */ + code_int zs_free_ent; /* First unused entry. */ + /* + * Block compression parameters -- after all codes are used up, + * and compression rate changes, start over. + */ + int zs_block_compress; + int zs_clear_flg; + long zs_ratio; + count_int zs_checkpoint; + int zs_offset; + long zs_in_count; /* Length of input. */ + long zs_bytes_out; /* Length of compressed output. */ + long zs_out_count; /* # of codes output (for debugging). */ + char_type zs_buf[BITS]; + union { + struct { + long zs_fcode; + code_int zs_ent; + code_int zs_hsize_reg; + int zs_hshift; + } w; /* Write parameters */ + struct { + char_type *zs_stackp; + int zs_finchar; + code_int zs_code, zs_oldcode, zs_incode; + int zs_roffset, zs_size; + char_type zs_gbuf[BITS]; + } r; /* Read parameters */ + } u; +}; + +static code_int getcode(struct s_zstate *zs); + +static off_t +zuncompress(FILE *in, FILE *out, char *pre, size_t prelen, + off_t *compressed_bytes) +{ + off_t bin, bout = 0; + char *buf; + + buf = malloc(BUFSIZE); + if (buf == NULL) + return -1; + + /* XXX */ + compressed_prelen = prelen; + if (prelen != 0) + compressed_pre = pre; + else + compressed_pre = NULL; + + while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) { + if (tflag == 0 && (off_t)fwrite(buf, 1, bin, out) != bin) { + free(buf); + return -1; + } + bout += bin; + } + + if (compressed_bytes) + *compressed_bytes = total_compressed_bytes; + + free(buf); + return bout; +} + +static int +zclose(void *zs) +{ + free(zs); + /* We leave the caller to close the fd passed to zdopen() */ + return 0; +} + +FILE * +zdopen(int fd) +{ + struct s_zstate *zs; + + if ((zs = calloc(1, sizeof(struct s_zstate))) == NULL) + return (NULL); + + zs->zs_state = S_START; + + /* XXX we can get rid of some of these */ + zs->zs_hsize = HSIZE; /* For dynamic table sizing. */ + zs->zs_free_ent = 0; /* First unused entry. */ + zs->zs_block_compress = BLOCK_MASK; + zs->zs_clear_flg = 0; /* XXX we calloc()'d this structure why = 0? */ + zs->zs_ratio = 0; + zs->zs_checkpoint = CHECK_GAP; + zs->zs_in_count = 1; /* Length of input. */ + zs->zs_out_count = 0; /* # of codes output (for debugging). */ + zs->u.r.zs_roffset = 0; + zs->u.r.zs_size = 0; + + /* + * Layering compress on top of stdio in order to provide buffering, + * and ensure that reads and write work with the data specified. + */ + if ((zs->zs_fp = fdopen(fd, "r")) == NULL) { + free(zs); + return NULL; + } + + return funopen(zs, zread, NULL, NULL, zclose); +} + +/* + * Decompress read. This routine adapts to the codes in the file building + * the "string" table on-the-fly; requiring no table to be stored in the + * compressed file. The tables used herein are shared with those of the + * compress() routine. See the definitions above. + */ +static int +zread(void *cookie, char *rbp, int num) +{ + u_int count, i; + struct s_zstate *zs; + u_char *bp, header[3]; + + if (num == 0) + return (0); + + zs = cookie; + count = num; + bp = (u_char *)rbp; + switch (zs->zs_state) { + case S_START: + zs->zs_state = S_MIDDLE; + break; + case S_MIDDLE: + goto middle; + case S_EOF: + goto eof; + } + + /* Check the magic number */ + for (i = 0; i < 3 && compressed_prelen; i++, compressed_prelen--) + header[i] = *compressed_pre++; + + if (fread(header + i, 1, sizeof(header) - i, zs->zs_fp) != + sizeof(header) - i || + memcmp(header, magic_header, sizeof(magic_header)) != 0) { + errno = EFTYPE; + return (-1); + } + total_compressed_bytes = 0; + zs->zs_maxbits = header[2]; /* Set -b from file. */ + zs->zs_block_compress = zs->zs_maxbits & BLOCK_MASK; + zs->zs_maxbits &= BIT_MASK; + zs->zs_maxmaxcode = 1L << zs->zs_maxbits; + if (zs->zs_maxbits > BITS || zs->zs_maxbits < 12) { + errno = EFTYPE; + return (-1); + } + /* As above, initialize the first 256 entries in the table. */ + zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS); + for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0; zs->u.r.zs_code--) { + tab_prefixof(zs->u.r.zs_code) = 0; + tab_suffixof(zs->u.r.zs_code) = (char_type) zs->u.r.zs_code; + } + zs->zs_free_ent = zs->zs_block_compress ? FIRST : 256; + + zs->u.r.zs_oldcode = -1; + zs->u.r.zs_stackp = de_stack; + + while ((zs->u.r.zs_code = getcode(zs)) > -1) { + + if ((zs->u.r.zs_code == CLEAR) && zs->zs_block_compress) { + for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0; + zs->u.r.zs_code--) + tab_prefixof(zs->u.r.zs_code) = 0; + zs->zs_clear_flg = 1; + zs->zs_free_ent = FIRST; + zs->u.r.zs_oldcode = -1; + continue; + } + zs->u.r.zs_incode = zs->u.r.zs_code; + + /* Special case for KwKwK string. */ + if (zs->u.r.zs_code >= zs->zs_free_ent) { + if (zs->u.r.zs_code > zs->zs_free_ent || + zs->u.r.zs_oldcode == -1) { + /* Bad stream. */ + errno = EINVAL; + return (-1); + } + *zs->u.r.zs_stackp++ = zs->u.r.zs_finchar; + zs->u.r.zs_code = zs->u.r.zs_oldcode; + } + /* + * The above condition ensures that code < free_ent. + * The construction of tab_prefixof in turn guarantees that + * each iteration decreases code and therefore stack usage is + * bound by 1 << BITS - 256. + */ + + /* Generate output characters in reverse order. */ + while (zs->u.r.zs_code >= 256) { + *zs->u.r.zs_stackp++ = tab_suffixof(zs->u.r.zs_code); + zs->u.r.zs_code = tab_prefixof(zs->u.r.zs_code); + } + *zs->u.r.zs_stackp++ = zs->u.r.zs_finchar = tab_suffixof(zs->u.r.zs_code); + + /* And put them out in forward order. */ +middle: do { + if (count-- == 0) + return (num); + *bp++ = *--zs->u.r.zs_stackp; + } while (zs->u.r.zs_stackp > de_stack); + + /* Generate the new entry. */ + if ((zs->u.r.zs_code = zs->zs_free_ent) < zs->zs_maxmaxcode && + zs->u.r.zs_oldcode != -1) { + tab_prefixof(zs->u.r.zs_code) = (u_short) zs->u.r.zs_oldcode; + tab_suffixof(zs->u.r.zs_code) = zs->u.r.zs_finchar; + zs->zs_free_ent = zs->u.r.zs_code + 1; + } + + /* Remember previous code. */ + zs->u.r.zs_oldcode = zs->u.r.zs_incode; + } + zs->zs_state = S_EOF; +eof: return (num - count); +} + +/*- + * Read one code from the standard input. If EOF, return -1. + * Inputs: + * stdin + * Outputs: + * code or -1 is returned. + */ +static code_int +getcode(struct s_zstate *zs) +{ + code_int gcode; + int r_off, bits, i; + char_type *bp; + + bp = zs->u.r.zs_gbuf; + if (zs->zs_clear_flg > 0 || zs->u.r.zs_roffset >= zs->u.r.zs_size || + zs->zs_free_ent > zs->zs_maxcode) { + /* + * If the next entry will be too big for the current gcode + * size, then we must increase the size. This implies reading + * a new buffer full, too. + */ + if (zs->zs_free_ent > zs->zs_maxcode) { + zs->zs_n_bits++; + if (zs->zs_n_bits == zs->zs_maxbits) /* Won't get any bigger now. */ + zs->zs_maxcode = zs->zs_maxmaxcode; + else + zs->zs_maxcode = MAXCODE(zs->zs_n_bits); + } + if (zs->zs_clear_flg > 0) { + zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS); + zs->zs_clear_flg = 0; + } + /* XXX */ + for (i = 0; i < zs->zs_n_bits && compressed_prelen; i++, compressed_prelen--) + zs->u.r.zs_gbuf[i] = *compressed_pre++; + zs->u.r.zs_size = fread(zs->u.r.zs_gbuf + i, 1, zs->zs_n_bits - i, zs->zs_fp); + zs->u.r.zs_size += i; + if (zs->u.r.zs_size <= 0) /* End of file. */ + return (-1); + zs->u.r.zs_roffset = 0; + + total_compressed_bytes += zs->u.r.zs_size; + + /* Round size down to integral number of codes. */ + zs->u.r.zs_size = (zs->u.r.zs_size << 3) - (zs->zs_n_bits - 1); + } + r_off = zs->u.r.zs_roffset; + bits = zs->zs_n_bits; + + /* Get to the first byte. */ + bp += (r_off >> 3); + r_off &= 7; + + /* Get first part (low order bits). */ + gcode = (*bp++ >> r_off); + bits -= (8 - r_off); + r_off = 8 - r_off; /* Now, roffset into gcode word. */ + + /* Get any 8 bit parts in the middle (<=1 for up to 16 bits). */ + if (bits >= 8) { + gcode |= *bp++ << r_off; + r_off += 8; + bits -= 8; + } + + /* High order bits. */ + gcode |= (*bp & rmask[bits]) << r_off; + zs->u.r.zs_roffset += zs->zs_n_bits; + + return (gcode); +} + diff --git a/install/xinstall.c b/install/xinstall.c index 88616e2..05b6500 100644 --- a/install/xinstall.c +++ b/install/xinstall.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1987, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -41,7 +42,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "From: @(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.43 2001/05/30 07:08:49 ru Exp $"; #endif /* not lint */ diff --git a/ipcrm/ipcrm.c b/ipcrm/ipcrm.c index ac16401..2a401f3 100644 --- a/ipcrm/ipcrm.c +++ b/ipcrm/ipcrm.c @@ -29,8 +29,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char rcsid[] = +__used static const char rcsid[] = "$Id: ipcrm.c,v 1.3 2005/02/03 07:31:33 josborne Exp $"; #endif /* not lint */ diff --git a/ln/ln.c b/ln/ln.c index f7bdc7a..5e61d21 100644 --- a/ln/ln.c +++ b/ln/ln.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.34 2006/02/14 11:08:05 glebius Exp $"); #include #include +#include #include #include #include @@ -169,6 +170,7 @@ linkit(const char *target, const char *source, int isdir) const char *p; int ch, exists, first; char path[PATH_MAX]; + char bbuf[PATH_MAX]; if (!sflag) { /* If target doesn't exist, quit now. */ @@ -191,11 +193,9 @@ linkit(const char *target, const char *source, int isdir) if (isdir || (lstat(source, &sb) == 0 && S_ISDIR(sb.st_mode)) || (!hflag && stat(source, &sb) == 0 && S_ISDIR(sb.st_mode))) { - if ((p = strrchr(target, '/')) == NULL) - p = target; - else - ++p; - if (snprintf(path, sizeof(path), "%s/%s", source, p) >= + if (strlcpy(bbuf, target, sizeof(bbuf)) >= sizeof(bbuf) || + (p = basename(bbuf)) == NULL || + snprintf(path, sizeof(path), "%s/%s", source, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", target); diff --git a/ls/ls.c b/ls/ls.c index 13be69b..ab8b756 100644 --- a/ls/ls.c +++ b/ls/ls.c @@ -34,8 +34,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -69,6 +70,9 @@ __RCSID("$FreeBSD: src/bin/ls/ls.c,v 1.66 2002/09/21 01:28:36 wollman Exp $"); #include #endif #ifdef __APPLE__ +#include +#include +#include #include #else #define COMPAT_MODE(a,b) (1) @@ -533,8 +537,10 @@ traverse(int argc, char *argv[], int options) break; case FTS_D: if (p->fts_level != FTS_ROOTLEVEL && - p->fts_name[0] == '.' && !f_listdot) + p->fts_name[0] == '.' && !f_listdot) { + fts_set(ftsp, p, FTS_SKIP); break; + } /* * If already output something, put out a newline as @@ -606,7 +612,12 @@ display(FTSENT *p, FTSENT *list) char buf[STRBUF_SIZEOF(u_quad_t) + 1]; char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; - +#ifdef __APPLE__ + acl_entry_t dummy; + ssize_t xattr_size; + char *filename; + char path[MAXPATHLEN+1]; +#endif // __APPLE__ /* * If list is NULL there are two possibilities: that the parent * directory p has no children, or that fts_children() returned an @@ -777,7 +788,7 @@ display(FTSENT *p, FTSENT *list) lattr = NULL; lattrlen = 0; - if ((np = malloc(sizeof(NAMES) + lattrlen + + if ((np = calloc(1, sizeof(NAMES) + lattrlen + ulen + glen + flen + 4)) == NULL) err(1, "malloc"); @@ -785,7 +796,48 @@ display(FTSENT *p, FTSENT *list) (void)strcpy(np->user, user); np->group = &np->data[ulen + 1]; (void)strcpy(np->group, group); - +#ifdef __APPLE__ + if (cur->fts_level == FTS_ROOTLEVEL) { + filename = cur->fts_name; + } else { + snprintf(path, sizeof(path), "%s/%s", cur->fts_parent->fts_accpath, cur->fts_name); + filename = path; + } + xattr_size = listxattr(filename, NULL, 0, XATTR_NOFOLLOW); + if (xattr_size < 0) { + xattr_size = 0; + } + if ((xattr_size > 0) && f_xattr) { + /* collect sizes */ + np->xattr_names = malloc(xattr_size); + listxattr(filename, np->xattr_names, xattr_size, XATTR_NOFOLLOW); + for (char *name = np->xattr_names; name < np->xattr_names + xattr_size; + name += strlen(name)+1) { + np->xattr_sizes = reallocf(np->xattr_sizes, (np->xattr_count+1) * sizeof(np->xattr_sizes[0])); + np->xattr_sizes[np->xattr_count] = getxattr(filename, name, 0, 0, 0, XATTR_NOFOLLOW); + np->xattr_count++; + } + } + /* symlinks can not have ACLs */ + np->acl = acl_get_link_np(filename, ACL_TYPE_EXTENDED); + if (np->acl) { + if (acl_get_entry(np->acl, ACL_FIRST_ENTRY, &dummy) == -1) { + acl_free(np->acl); + np->acl = NULL; + } + } + if (xattr_size > 0) { + np->mode_suffix = '@'; + } else if (np->acl) { + np->mode_suffix = '+'; + } else { + np->mode_suffix = ' '; + } + if (!f_acl) { + acl_free(np->acl); + np->acl = NULL; + } +#endif // __APPLE__ if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) bcfile = 1; @@ -830,9 +882,20 @@ display(FTSENT *p, FTSENT *list) printfcn(&d); output = 1; - if (f_longform) - for (cur = list; cur; cur = cur->fts_link) - free(cur->fts_pointer); + if (f_longform) { + for (cur = list; cur; cur = cur->fts_link) { + np = cur->fts_pointer; + if (np) { + if (np->acl) { + acl_free(np->acl); + } + free(np->xattr_names); + free(np->xattr_sizes); + free(np); + cur->fts_pointer = NULL; + } + } + } } /* diff --git a/ls/ls.h b/ls/ls.h index 246470b..14babbb 100644 --- a/ls/ls.h +++ b/ls/ls.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -67,6 +66,10 @@ extern int f_color; /* add type in color for non-regular files */ #endif extern int f_numericonly; /* don't convert uid/gid to name */ +#ifdef __APPLE__ +#include +#endif // __APPLE__ + typedef struct { FTSENT *list; u_int64_t btotal; @@ -89,6 +92,12 @@ typedef struct { char *flags; #ifndef __APPLE__ char *lattr; +#else + char *xattr_names; /* f_xattr */ + int *xattr_sizes; + acl_t acl; /* f_acl */ + int xattr_count; + char mode_suffix; /* @ | + | */ #endif /* __APPLE__ */ char data[1]; } NAMES; diff --git a/ls/print.c b/ls/print.c index 2be44be..d137156 100644 --- a/ls/print.c +++ b/ls/print.c @@ -130,7 +130,8 @@ printscol(DISPLAY *dp) { FTSENT *p; - if (COMPAT_MODE("bin/ls", "Unix2003")) { + assert(dp); + if (COMPAT_MODE("bin/ls", "Unix2003") && (dp->list != NULL)) { if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) (void)printf("total %qu\n", (u_int64_t)howmany(dp->btotal, blocksize)); } @@ -249,25 +250,16 @@ uuid_to_name(uuid_t *uu) } static void -printxattr(DISPLAY *dp, char *filename, ssize_t xattr) +printxattr(DISPLAY *dp, int count, char *buf, int sizes[]) { - int flags = XATTR_NOFOLLOW; - char *buf = malloc(xattr); - - if (NULL == buf) - err(1, "malloc"); - if (listxattr(filename, buf, xattr, flags) > 0) { - char *name; - for (name = buf; name < buf+xattr; name += strlen(name) + 1) { - ssize_t size = getxattr(filename, name, 0, 0, 0, flags); - putchar('\t'); - printname(name); - putchar('\t'); - printsize(dp->s_size, size); - putchar('\n'); - } + for (int i = 0; i < count; i++) { + putchar('\t'); + printname(buf); + putchar('\t'); + printsize(dp->s_size, sizes[i]); + putchar('\n'); + buf += strlen(buf) + 1; } - free(buf); } static void @@ -344,14 +336,6 @@ printlong(DISPLAY *dp) FTSENT *p; NAMES *np; char buf[20]; -#ifdef __APPLE__ - acl_t acl = NULL; - acl_entry_t dummy; - char full_path[MAXPATHLEN]; - char *filename; - ssize_t xattr = 0; - char str[2]; -#endif #ifdef COLORLS int color_printed = 0; #endif @@ -376,29 +360,7 @@ printlong(DISPLAY *dp) np = p->fts_pointer; #ifdef __APPLE__ buf[10] = '\0'; /* make +/@ abut the mode */ - filename = p->fts_name; - if (p->fts_level != FTS_ROOTLEVEL) - { - snprintf(full_path, sizeof full_path, "%s/%s", - p->fts_parent->fts_accpath, p->fts_name); - filename = full_path; - } - /* symlinks can not have ACLs */ - acl = acl_get_link_np(filename, ACL_TYPE_EXTENDED); - if (acl && acl_get_entry(acl, ACL_FIRST_ENTRY, &dummy) == -1) { - acl_free(acl); - acl = NULL; - } - xattr = listxattr(filename, NULL, 0, XATTR_NOFOLLOW); - if (xattr < 0) - xattr = 0; - str[1] = '\0'; - if (xattr > 0) - str[0] = '@'; - else if (acl != NULL) - str[0] = '+'; - else - str[0] = ' '; + char str[2] = { np->mode_suffix, '\0' }; #endif /* __APPLE__ */ if (f_group && f_owner) { /* means print neither */ #ifdef __APPLE__ @@ -476,14 +438,11 @@ printlong(DISPLAY *dp) printlink(p); (void)putchar('\n'); #ifdef __APPLE__ - if (f_xattr && xattr) { - printxattr(dp, filename, xattr); + if (np->xattr_count && f_xattr) { + printxattr(dp, np->xattr_count, np->xattr_names, np->xattr_sizes); } - if (acl != NULL) { - if (f_acl) - printacl(acl, S_ISDIR(sp->st_mode)); - acl_free(acl); - acl = NULL; + if (np->acl != NULL && f_acl) { + printacl(np->acl, S_ISDIR(sp->st_mode)); } #endif /* __APPLE__ */ } @@ -544,12 +503,13 @@ printcol(DISPLAY *dp) */ if ((lastentries == -1) || (dp->entries > lastentries)) { lastentries = dp->entries; - if ((array = - realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) { + if ((array = realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) { warn(NULL); printscol(dp); + return; } } + memset(array, 0, dp->entries * sizeof(FTSENT *)); for (p = dp->list, num = 0; p; p = p->fts_link) if (p->fts_number != NO_PRINT) array[num++] = p; @@ -582,8 +542,8 @@ printcol(DISPLAY *dp) if (!f_sortacross) base = row; for (col = 0, chcnt = 0; col < numcols; ++col) { - chcnt += printaname(array[base], dp->s_inode, - dp->s_block); + assert(base < dp->entries); + chcnt += printaname(array[base], dp->s_inode, dp->s_block); if (f_sortacross) base++; else diff --git a/mkdir/mkdir.c b/mkdir/mkdir.c index 3ab0c19..8aede86 100644 --- a/mkdir/mkdir.c +++ b/mkdir/mkdir.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char const copyright[] = +__used static char const copyright[] = "@(#) Copyright (c) 1983, 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/mtree/commoncrypto.c b/mtree/commoncrypto.c index 91f1207..0dda1f0 100644 --- a/mtree/commoncrypto.c +++ b/mtree/commoncrypto.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -27,12 +27,12 @@ Digest_File(CCDigestAlg algorithm, const char *filename, char *buf) (void)fcntl(fd, F_NOCACHE, 1); - (void)osx_assumes_zero(CCDigestInit(algorithm, &ctx)); + (void)os_assumes_zero(CCDigestInit(algorithm, &ctx)); queue = dispatch_queue_create("com.apple.mtree.io", NULL); - osx_assert(queue); + os_assert(queue); sema = dispatch_semaphore_create(0); - osx_assert(sema); + os_assert(sema); io = dispatch_io_create(DISPATCH_IO_STREAM, fd, queue, ^(int error) { if (error != 0) { @@ -41,11 +41,11 @@ Digest_File(CCDigestAlg algorithm, const char *filename, char *buf) (void)close(fd); (void)dispatch_semaphore_signal(sema); }); - osx_assert(io); + os_assert(io); dispatch_io_read(io, 0, SIZE_MAX, queue, ^(__unused bool done, dispatch_data_t data, int error) { if (data != NULL) { (void)dispatch_data_apply(data, ^(__unused dispatch_data_t region, __unused size_t offset, const void *buffer, size_t size) { - (void)osx_assumes_zero(CCDigestUpdate(&ctx, buffer, size)); + (void)os_assumes_zero(CCDigestUpdate(&ctx, buffer, size)); return (bool)true; }); } @@ -67,9 +67,9 @@ Digest_File(CCDigestAlg algorithm, const char *filename, char *buf) } /* Finalize and convert to hex. */ - (void)osx_assumes_zero(CCDigestFinal(&ctx, digest)); + (void)os_assumes_zero(CCDigestFinal(&ctx, digest)); length = CCDigestOutputSize(&ctx); - osx_assert(length <= sizeof(digest)); + os_assert(length <= sizeof(digest)); for (i = 0; i < length; i++) { buf[i+i] = hex[digest[i] >> 4]; buf[i+i+1] = hex[digest[i] & 0x0f]; diff --git a/mtree/compare.c b/mtree/compare.c index a9fc284..1bf7d51 100644 --- a/mtree/compare.c +++ b/mtree/compare.c @@ -382,13 +382,11 @@ ftype(u_int type) char * rlink(char *name) { - static char lbuf[MAXPATHLEN * 4]; + static char lbuf[MAXPATHLEN]; ssize_t len; - char tbuf[MAXPATHLEN]; - if ((len = readlink(name, tbuf, sizeof(tbuf) - 1)) == -1) + if ((len = readlink(name, lbuf, sizeof(lbuf) - 1)) == -1) err(1, "line %d: %s", lineno, name); - tbuf[len] = '\0'; - strvis(lbuf, tbuf, VIS_WHITE | VIS_OCTAL); + lbuf[len] = '\0'; return (lbuf); } diff --git a/mtree/create.c b/mtree/create.c index ad2fe1b..44c3295 100644 --- a/mtree/create.c +++ b/mtree/create.c @@ -269,8 +269,12 @@ statf(int indent, FTSENT *p) } #endif /* ENABLE_SHA256 */ if (keys & F_SLINK && - (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) - output(indent, &offset, "link=%s", rlink(p->fts_accpath)); + (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { + char visbuf[MAXPATHLEN * 4]; + char *s = rlink(p->fts_accpath); + strvis(visbuf, s, VIS_WHITE | VIS_OCTAL); + output(indent, &offset, "link=%s", visbuf); + } if (keys & F_FLAGS && p->fts_statp->st_flags != flags) { fflags = flags_to_string(p->fts_statp->st_flags); output(indent, &offset, "flags=%s", fflags); diff --git a/mtree/spec.c b/mtree/spec.c index a2ecc51..915858c 100644 --- a/mtree/spec.c +++ b/mtree/spec.c @@ -176,7 +176,7 @@ set(char *t, NODE *ip) for (; (kw = strtok(t, "= \t\n")); t = NULL) { ip->flags |= type = parsekey(kw, &value); - if (value && (val = strtok(NULL, " \t\n")) == NULL) + if ((value == 0) || (val = strtok(NULL, " \t\n")) == NULL) errx(1, "line %d: missing value", lineno); switch(type) { case F_CKSUM: diff --git a/mtree/specspec.c b/mtree/specspec.c index 9aa66f0..113d2fd 100644 --- a/mtree/specspec.c +++ b/mtree/specspec.c @@ -122,17 +122,17 @@ compare_nodes(NODE *n1, NODE *n2, char const *path) if (n2 != NULL && n2->type == F_LINK) n2->flags &= ~F_MODE; differs = 0; - if (n1 == NULL && n2 != NULL) { + if ((n1 == NULL) && (n2 == NULL)) { + return 0; + } else if (n1 == NULL) { differs = n2->flags; mismatch(n1, n2, differs, path); return (1); - } - if (n1 != NULL && n2 == NULL) { + } else if (n2 == NULL) { differs = n1->flags; mismatch(n1, n2, differs, path); return (1); - } - if (n1->type != n2->type) { + } else if (n1->type != n2->type) { differs = 0; mismatch(n1, n2, differs, path); return (1); diff --git a/mtree/verify.c b/mtree/verify.c index 4ad3202..0b3dc9b 100644 --- a/mtree/verify.c +++ b/mtree/verify.c @@ -91,6 +91,9 @@ vwalk(void) case FTS_SL: break; case FTS_DP: + if (level == NULL) { + errx(1 , "invalid root in vwalk"); + } if (specdepth > p->fts_level) { for (level = level->parent; level->prev; level = level->prev); diff --git a/mv/mv.c b/mv/mv.c index 98c0974..c1116d4 100644 --- a/mv/mv.c +++ b/mv/mv.c @@ -34,8 +34,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char const copyright[] = +__used static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -441,6 +442,8 @@ int copy(char *from, char *to) { int pid, status; + + /* posix_spawn mv from to && rm from */ if ((pid = fork()) == 0) { execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, diff --git a/pax/ar_io.c b/pax/ar_io.c index 99b1dfd..1c4b943 100644 --- a/pax/ar_io.c +++ b/pax/ar_io.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $"; +__used static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $"; #endif #endif /* not lint */ diff --git a/pax/ar_subs.c b/pax/ar_subs.c index 056f483..b4896ea 100644 --- a/pax/ar_subs.c +++ b/pax/ar_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $"; +__used static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $"; #endif #endif /* not lint */ @@ -255,7 +256,6 @@ extract(void) struct copyfile_list_entry_t { char *src; char *dst; - char *tmp; LIST_ENTRY(copyfile_list_entry_t) link; } *cle; @@ -443,21 +443,16 @@ extract(void) (void)rd_skip(cnt + arcn->pad); #ifdef __APPLE__ - if (!strncmp(basename(arcn->name), "._", 2)) - { + if (!strncmp(basename(arcn->name), "._", 2)) { cle = alloca(sizeof(struct copyfile_list_entry_t)); cle->src = strdup(arcn->name); - - if (asprintf(&cle->tmp, "%s.XXX", cle->src) > MAXPATHLEN) - continue; - if (mktemp(cle->tmp) == NULL) - continue; - if (rename(cle->src, cle->tmp)) - continue; - + if (asprintf(&cle->dst, "%s/%s", - dirname(arcn->name), basename(arcn->name) + 2) != -1) + dirname(arcn->name), basename(arcn->name) + 2) != -1) { LIST_INSERT_HEAD(©file_list, cle, link); + } else { + free(cle->src); + } } #endif /* @@ -469,18 +464,16 @@ extract(void) #ifdef __APPLE__ LIST_FOREACH(cle, ©file_list, link) { - if(copyfile_disable || copyfile(cle->tmp, cle->dst, NULL, - COPYFILE_UNPACK | COPYFILE_XATTR | COPYFILE_ACL)) { - if (!copyfile_disable) { - syswarn(1, errno, "Unable to set metadata on %s", cle->dst); - } - rename(cle->tmp, cle->src); - } else { - unlink(cle->tmp); - } - free(cle->dst); - free(cle->src); - free(cle->tmp); + if(copyfile_disable || copyfile(cle->src, cle->dst, NULL, + COPYFILE_UNPACK | COPYFILE_XATTR | COPYFILE_ACL)) { + if (!copyfile_disable) { + syswarn(1, errno, "Unable to set metadata on %s", cle->dst); + } + } else { + unlink(cle->src); + } + free(cle->dst); + free(cle->src); } #endif @@ -824,7 +817,7 @@ append(void) ARCHD *arcn; int res; ARCHD archd; - FSUB *orgfrmt; + const FSUB *orgfrmt; int udev; off_t tlen; diff --git a/pax/buf_subs.c b/pax/buf_subs.c index aff311a..e56e822 100644 --- a/pax/buf_subs.c +++ b/pax/buf_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $"; +__used static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $"; #endif #endif /* not lint */ diff --git a/pax/cache.c b/pax/cache.c index 44eda1f..e5c4996 100644 --- a/pax/cache.c +++ b/pax/cache.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $"; +__used static const char rcsid[] = "$OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $"; #endif #endif /* not lint */ diff --git a/pax/cpio.c b/pax/cpio.c index 7126164..cb9f969 100644 --- a/pax/cpio.c +++ b/pax/cpio.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $"; +__used static const char rcsid[] = "$OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $"; #endif #endif /* not lint */ diff --git a/pax/extern.h b/pax/extern.h index 6f09be3..5dad640 100644 --- a/pax/extern.h +++ b/pax/extern.h @@ -192,7 +192,7 @@ int getoldopt(int, char **, const char *); /* * options.c */ -extern FSUB fsub[]; +extern const FSUB fsub[]; extern int ford[]; void options(int, char **); OPLIST * opt_next(void); @@ -217,7 +217,7 @@ int set_dest(ARCHD *, char *, int); * pax.c */ extern int act; -extern FSUB *frmt; +extern const FSUB *frmt; extern int cflag; extern int cwdfd; extern int dflag; diff --git a/pax/file_subs.c b/pax/file_subs.c index 23114e9..e78ba2b 100644 --- a/pax/file_subs.c +++ b/pax/file_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $"; +__used static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $"; #endif #endif /* not lint */ @@ -114,7 +115,7 @@ file_creat(ARCHD *arcn) path_to_open = arcn->name; new_path = arcn->name; - cwd = getcwd(&cwd_buff[0],MAXPATHLEN); + cwd = getcwd(cwd_buff,sizeof(cwd_buff)); if (cwd==NULL) return -1; for (;;) { /* @@ -148,7 +149,7 @@ file_creat(ARCHD *arcn) } if (new_path) path_to_open = new_path; /* try again */ } - if (strcmp(new_path, arcn->name)!=0) { + if (new_path && strcmp(new_path, arcn->name)!=0) { dochdir(cwd); /* go back to original directory */ } return(fd); diff --git a/pax/ftree.c b/pax/ftree.c index 7bb4a80..f274241 100644 --- a/pax/ftree.c +++ b/pax/ftree.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $"; +__used static const char rcsid[] = "$OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $"; #endif #endif /* not lint */ diff --git a/pax/gen_subs.c b/pax/gen_subs.c index 79438e0..d3b4c16 100644 --- a/pax/gen_subs.c +++ b/pax/gen_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $"; +__used static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $"; #endif #endif /* not lint */ diff --git a/pax/getoldopt.c b/pax/getoldopt.c index 45fdbf2..3133f62 100644 --- a/pax/getoldopt.c +++ b/pax/getoldopt.c @@ -10,8 +10,9 @@ * in the Public Domain for your edification and enjoyment. */ +#include #ifndef lint -static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $"; +__used static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $"; #endif /* not lint */ #include diff --git a/pax/options.c b/pax/options.c index 0b5b988..0544e5e 100644 --- a/pax/options.c +++ b/pax/options.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $"; +__used static const char rcsid[] = "$OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $"; #endif #endif /* not lint */ @@ -103,56 +104,57 @@ static int getline_error; * rd_data, wr_data, options */ -FSUB fsub[] = { -/* 0: OLD BINARY CPIO */ +const FSUB fsub[] = { +/* OLD BINARY CPIO */ {"bcpio", 5120, sizeof(HD_BCPIO), 1, 0, 0, 1, bcpio_id, cpio_strd, bcpio_rd, bcpio_endrd, cpio_stwr, bcpio_wr, cpio_endwr, cpio_trail, rd_wrfile, wr_rdfile, bad_opt}, -/* 1: OLD OCTAL CHARACTER CPIO */ +/* OLD OCTAL CHARACTER CPIO */ {"cpio", 5120, sizeof(HD_CPIO), 1, 0, 0, 1, cpio_id, cpio_strd, cpio_rd, cpio_endrd, cpio_stwr, cpio_wr, cpio_endwr, cpio_trail, rd_wrfile, wr_rdfile, bad_opt}, -/* 2: SVR4 HEX CPIO */ +/* POSIX 3 PAX */ + {"pax", 5120, BLKMULT, 0, 1, BLKMULT, 0, pax_id, ustar_strd, + pax_rd, tar_endrd, ustar_stwr, pax_wr, tar_endwr, tar_trail, + rd_wrfile, wr_rdfile, pax_opt}, + +/* SVR4 HEX CPIO */ {"sv4cpio", 5120, sizeof(HD_VCPIO), 1, 0, 0, 1, vcpio_id, cpio_strd, vcpio_rd, vcpio_endrd, cpio_stwr, vcpio_wr, cpio_endwr, cpio_trail, rd_wrfile, wr_rdfile, bad_opt}, -/* 3: SVR4 HEX CPIO WITH CRC */ +/* SVR4 HEX CPIO WITH CRC */ {"sv4crc", 5120, sizeof(HD_VCPIO), 1, 0, 0, 1, crc_id, crc_strd, vcpio_rd, vcpio_endrd, crc_stwr, vcpio_wr, cpio_endwr, cpio_trail, rd_wrfile, wr_rdfile, bad_opt}, -/* 4: OLD TAR */ +/* OLD TAR */ {"tar", 10240, BLKMULT, 0, 1, BLKMULT, 0, tar_id, no_op, tar_rd, tar_endrd, no_op, tar_wr, tar_endwr, tar_trail, rd_wrfile, wr_rdfile, tar_opt}, -/* 5: POSIX USTAR */ +/* POSIX USTAR */ {"ustar", 10240, BLKMULT, 0, 1, BLKMULT, 0, ustar_id, ustar_strd, ustar_rd, tar_endrd, ustar_stwr, ustar_wr, tar_endwr, tar_trail, rd_wrfile, wr_rdfile, bad_opt}, - -/* 6: POSIX 3 PAX */ - {"pax", 5120, BLKMULT, 0, 1, BLKMULT, 0, pax_id, ustar_strd, - pax_rd, tar_endrd, ustar_stwr, pax_wr, tar_endwr, tar_trail, - rd_wrfile, wr_rdfile, pax_opt}, }; -#define F_OCPIO 0 /* format when called as cpio -6 */ -#define F_ACPIO 1 /* format when called as cpio -c */ -#define F_CPIO 3 /* format when called as cpio */ -#define F_OTAR 4 /* format when called as tar -o */ -#define F_TAR 5 /* format when called as tar */ -#define F_PAX 6 /* format for pax */ -#define DEFLT 5 /* default write format from list above */ +#define F_OCPIO 0 /* format when called as cpio -6 */ +#define F_ACPIO 1 /* format when called as cpio -c */ +#define F_PAX 2 /* -x pax */ +#define F_SCPIO 3 /* -x sv4cpio */ +#define F_CPIO 4 /* format when called as cpio */ +#define F_OTAR 5 /* format when called as tar -o */ +#define F_TAR 6 /* format when called as tar */ +#define DEFLT F_TAR /* default write format from list above */ /* * ford is the archive search order used by get_arc() to determine what kind * of archive we are dealing with. This helps to properly id archive formats * some formats may be subsets of others.... */ -int ford[] = {6, 5, 4, 3, 2, 1, 0, -1 }; +int ford[] = {F_PAX, F_TAR, F_OTAR, F_CPIO, F_SCPIO, F_ACPIO, F_OCPIO, -1 }; /* * Do we have -C anywhere? @@ -413,7 +415,7 @@ pax_options(int argc, char **argv) */ tmp.name = optarg; n_fsub = sizeof(fsub)/sizeof(FSUB); - if ((frmt = (FSUB *)lsearch(&tmp, fsub, &n_fsub, sizeof(FSUB), + if ((frmt = (FSUB *)bsearch(&tmp, fsub, n_fsub, sizeof(FSUB), c_frmt)) != NULL) { flg |= XF; break; @@ -1274,8 +1276,8 @@ cpio_options(int argc, char **argv) */ tmp.name = optarg; n_fsub = sizeof(fsub)/sizeof(FSUB); - if ((frmt = (FSUB *)lsearch((void *)&tmp, (void *)fsub, - &n_fsub, sizeof(FSUB), c_frmt)) != NULL) + if ((frmt = (FSUB *)bsearch((void *)&tmp, (void *)fsub, + n_fsub, sizeof(FSUB), c_frmt)) != NULL) break; paxwarn(1, "Unknown -H format: %s", optarg); (void)fputs("cpio: Known -H formats are:", stderr); diff --git a/pax/pat_rep.c b/pax/pat_rep.c index def5317..ff2819e 100644 --- a/pax/pat_rep.c +++ b/pax/pat_rep.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $"; +__used static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $"; #endif #endif /* not lint */ diff --git a/pax/pax.c b/pax/pax.c index b59ba18..7c278f0 100644 --- a/pax/pax.c +++ b/pax/pax.c @@ -34,8 +34,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -44,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $"; +__used static const char rcsid[] = "$OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $"; #endif #endif /* not lint */ @@ -74,7 +75,7 @@ static int gen_init(void); * Variables that can be accessed by any routine within pax */ int act = DEFOP; /* read/write/append/copy */ -FSUB *frmt = NULL; /* archive format type */ +const FSUB *frmt = NULL; /* archive format type */ int cflag; /* match all EXCEPT pattern/file */ int cwdfd; /* starting cwd */ int dflag; /* directory member match only */ diff --git a/pax/pax_format.c b/pax/pax_format.c index 181e3f7..3b34ca8 100644 --- a/pax/pax_format.c +++ b/pax/pax_format.c @@ -1081,6 +1081,7 @@ emit_extended_header_record(int len, int total_len, int head_type, return (total_len); } +__attribute__((__malloc__)) static char * substitute_percent(char * header, char * filename) { @@ -1090,7 +1091,7 @@ substitute_percent(char * header, char * filename) char *dname, *fname; nextpercent = strchr(header,'%'); - if (nextpercent==NULL) return header; + if (nextpercent==NULL) return strdup(header); pos = nextpercent-header; memcpy(buf,header, pos); while (nextpercent++) { @@ -1129,7 +1130,7 @@ substitute_percent(char * header, char * filename) break; default: paxwarn(1,"header format substitution failed: '%c'", *nextpercent); - return (header); + return strdup(header); } nextpercent++; if (*nextpercent=='\0') { @@ -1239,6 +1240,8 @@ generate_pax_ext_header_and_data(ARCHD *arcn, int nfields, int *table, strlcpy(hd->name, header_name, sizeof(hd->name)); } + free(header_name); + header_name = NULL; records_size = (u_long)total_len; if (ul_oct(records_size, hd->size, sizeof(hd->size), term_char)) { paxwarn(1,"extended header data too long for header type '%c'", header_type); diff --git a/pax/sel_subs.c b/pax/sel_subs.c index 55d3a00..008479b 100644 --- a/pax/sel_subs.c +++ b/pax/sel_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $"; +__used static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $"; #endif #endif /* not lint */ @@ -393,6 +394,7 @@ trng_add(char *str) default: paxwarn(1, "Bad option %c with time range %s", *flgpt, str); + free(pt); goto out; } ++flgpt; diff --git a/pax/tables.c b/pax/tables.c index 9787951..f45d291 100644 --- a/pax/tables.c +++ b/pax/tables.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] = "$OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $"; +__used static const char rcsid[] = "$OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $"; #endif #endif /* not lint */ diff --git a/pax/tar.c b/pax/tar.c index 2cc800c..360541f 100644 --- a/pax/tar.c +++ b/pax/tar.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $"; +__used static const char rcsid[] = "$OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $"; #endif #endif /* not lint */ diff --git a/pax/tty_subs.c b/pax/tty_subs.c index 5a78a71..74065c6 100644 --- a/pax/tty_subs.c +++ b/pax/tty_subs.c @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint #if 0 static const char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #else -static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.12 2003/06/02 23:32:09 millert Exp $"; +__used static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.12 2003/06/02 23:32:09 millert Exp $"; #endif #endif /* not lint */ diff --git a/rm/rm.c b/rm/rm.c index e215ec8..4e78b46 100644 --- a/rm/rm.c +++ b/rm/rm.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ @@ -41,7 +42,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; #else -static const char rcsid[] = +__used static const char rcsid[] = "$FreeBSD: src/bin/rm/rm.c,v 1.33 2001/06/13 15:01:25 ru Exp $"; #endif #endif /* not lint */ diff --git a/rmdir/rmdir.c b/rmdir/rmdir.c index a362efa..32969bc 100644 --- a/rmdir/rmdir.c +++ b/rmdir/rmdir.c @@ -31,8 +31,9 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char const copyright[] = +__used static char const copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ diff --git a/stat/stat.c b/stat/stat.c index 8869f72..095900e 100644 --- a/stat/stat.c +++ b/stat/stat.c @@ -549,7 +549,7 @@ format1(const struct stat *st, struct passwd *pw; struct group *gr; const struct timespec *tsp; - struct timespec ts; + struct timespec ts = {0,0}; struct tm *tm; int l, small, formats; diff --git a/touch/touch.c b/touch/touch.c index c4c3a10..aca5b90 100644 --- a/touch/touch.c +++ b/touch/touch.c @@ -36,13 +36,13 @@ __FBSDID("$FreeBSD: src/usr.bin/touch/touch.c,v 1.25 2010/03/28 13:16:08 ed Exp $"); #ifndef lint -static const char copyright[] = +__used static const char copyright[] = "@(#) Copyright (c) 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif #ifndef lint -static const char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93"; +__used static const char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93"; #endif #include -- 2.7.4