diff options
| -rw-r--r-- | gnu/usr.bin/gzip/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/gzip/zforce | 40 | ||||
| -rw-r--r-- | gnu/usr.bin/gzip/zforce.1 | 21 | ||||
| -rw-r--r-- | usr.bin/compress/Makefile | 11 |
4 files changed, 9 insertions, 69 deletions
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile index 6caf450a198..d1aff921b01 100644 --- a/gnu/usr.bin/gzip/Makefile +++ b/gnu/usr.bin/gzip/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2003/07/12 16:02:25 millert Exp $ +# $OpenBSD: Makefile,v 1.18 2003/07/29 11:54:33 otto Exp $ # $NetBSD: Makefile,v 1.17 1995/10/24 22:18:34 jtc Exp $ -MAN= gzexe.1 zforce.1 znew.1 +MAN= gzexe.1 znew.1 afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/zforce ${.CURDIR}/gzexe ${.CURDIR}/znew \ + ${.CURDIR}/gzexe ${.CURDIR}/znew \ ${DESTDIR}${BINDIR} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/gzip/zforce b/gnu/usr.bin/gzip/zforce deleted file mode 100644 index 5d7e0502ae8..00000000000 --- a/gnu/usr.bin/gzip/zforce +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# zforce: force a gz extension on all gzip files so that gzip will not -# compress them twice. -# -# This can be useful for files with names truncated after a file transfer. -# 12345678901234 is renamed to 12345678901.gz - -x=`basename $0` -if test $# = 0; then - echo "force a '.gz' extension on all gzip files" - echo usage: $x files... - exit 1 -fi - -res=0 -for i do - if test ! -f "$i" ; then - echo ${x}: $i not a file - res=1 - continue - fi - test `expr "$i" : '.*[.-]z$'` -eq 0 || continue - test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue - test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue - - if gzip -l < "$i" 2>/dev/null | grep '^defl' > /dev/null; then - - if test `expr "$i" : '^............'` -eq 12; then - new=`expr "$i" : '\(.*\)...$`.gz - else - new="$i.gz" - fi - if mv "$i" "$new" 2>/dev/null; then - echo $i -- replaced with $new - continue - fi - res=1; echo ${x}: cannot rename $i to $new - fi -done -exit $res diff --git a/gnu/usr.bin/gzip/zforce.1 b/gnu/usr.bin/gzip/zforce.1 deleted file mode 100644 index c1064b2d272..00000000000 --- a/gnu/usr.bin/gzip/zforce.1 +++ /dev/null @@ -1,21 +0,0 @@ -.\" $Id: zforce.1,v 1.1 1995/10/18 08:40:54 deraadt Exp $ -.TH ZFORCE 1 -.SH NAME -zforce \- force a '.gz' extension on all gzip files -.SH SYNOPSIS -.B zforce -[ name ... ] -.SH DESCRIPTION -.I zforce -forces a .gz extension on all -.I gzip -files so that -.I gzip -will not compress them twice. -This can be useful for files with names truncated after a file transfer. -On systems with a 14 char limitation on file names, the original name -is truncated to make room for the .gz suffix. For example, -12345678901234 is renamed to 12345678901.gz. A file name such as foo.tgz -is left intact. -.SH "SEE ALSO" -gzip(1), znew(1), zmore(1), zgrep(1), zdiff(1), gzexe(1) diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile index 49a3f7119bd..2654e0782f9 100644 --- a/usr.bin/compress/Makefile +++ b/usr.bin/compress/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.15 2003/07/13 04:43:34 millert Exp $ +# $OpenBSD: Makefile,v 1.16 2003/07/29 11:54:33 otto Exp $ PROG= compress SRCS= main.c zopen.c gzopen.c -MAN= compress.1 zmore.1 zdiff.1 +MAN= compress.1 zmore.1 zdiff.1 zforce.1 LINKS= ${BINDIR}/compress ${BINDIR}/uncompress \ ${BINDIR}/compress ${BINDIR}/zcat \ ${BINDIR}/compress ${BINDIR}/gzip \ @@ -22,8 +22,9 @@ DPADD=${LIBZ} afterinstall: install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/zmore ${.CURDIR}/zdiff ${DESTDIR}${BINDIR} -# ${.CURDIR}/zforce ${.CURDIR}/gzexe ${.CURDIR}/znew \ -# ${DESTDIR}${BINDIR} + ${.CURDIR}/zmore ${.CURDIR}/zdiff \ + ${.CURDIR}/zforce \ + ${DESTDIR}${BINDIR} +# ${.CURDIR}/gzexe ${.CURDIR}/znew \ .include <bsd.prog.mk> |