head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.2.1.4.2
	RELENG_9_1:1.2.2.1.0.4
	RELENG_9_1_BP:1.2.2.1
	RELENG_8_3_0_RELEASE:1.1.12.2.2.1
	RELENG_8_3:1.1.12.2.0.2
	RELENG_8_3_BP:1.1.12.2
	RELENG_9_0_0_RELEASE:1.2.2.1.2.1
	RELENG_9_0:1.2.2.1.0.2
	RELENG_9_0_BP:1.2.2.1
	RELENG_9:1.2.0.2
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.16.1
	RELENG_8_2_0_RELEASE:1.1.12.1.6.1
	RELENG_7_4:1.1.0.16
	RELENG_7_4_BP:1.1
	RELENG_8_2:1.1.12.1.0.6
	RELENG_8_2_BP:1.1.12.1
	RELENG_8_1_0_RELEASE:1.1.12.1.4.1
	RELENG_8_1:1.1.12.1.0.4
	RELENG_8_1_BP:1.1.12.1
	RELENG_7_3_0_RELEASE:1.1.14.1
	RELENG_7_3:1.1.0.14
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.1.12.1.2.1
	RELENG_8_0:1.1.12.1.0.2
	RELENG_8_0_BP:1.1.12.1
	RELENG_8:1.1.0.12
	RELENG_8_BP:1.1
	RELENG_7_2_0_RELEASE:1.1.10.1
	RELENG_7_2:1.1.0.10
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.8.1
	RELENG_6_4_0_RELEASE:1.1.2.1.4.1
	RELENG_7_1:1.1.0.8
	RELENG_7_1_BP:1.1
	RELENG_6_4:1.1.2.1.0.4
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.1.0.6
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.2.1.0.2
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.1.0.4
	RELENG_7_BP:1.1
	RELENG_6:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.54.21;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2011.05.23.09.02.44;	author delphij;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2007.01.26.10.19.07;	author delphij;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.8.1
	1.1.10.1
	1.1.12.1
	1.1.14.1
	1.1.16.1;
next	;

1.3.2.1
date	2012.11.17.01.54.21;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.06.04;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.11.37.38;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

1.2.2.1.2.2
date	2012.11.17.08.37.35;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.1.4.2;

1.2.2.1.4.2
date	2012.11.17.08.48.26;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2007.02.20.08.33.31;	author delphij;	state Exp;
branches
	1.1.2.1.4.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.45.41;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.4.1
date	2011.06.06.05.48.25;	author delphij;	state Exp;
branches;
next	1.1.4.2;

1.1.4.2
date	2012.11.17.08.08.28;	author svnexp;	state Exp;
branches;
next	;

1.1.8.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.10.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.12.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.1.12.1.2.1
	1.1.12.1.4.1
	1.1.12.1.6.1;
next	1.1.12.2;

1.1.12.2
date	2011.06.06.05.40.52;	author delphij;	state Exp;
branches
	1.1.12.2.2.1;
next	1.1.12.3;

1.1.12.3
date	2012.11.17.10.37.16;	author svnexp;	state Exp;
branches;
next	;

1.1.12.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.1.12.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.1.12.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.1.12.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.12.2.2.2;

1.1.12.2.2.2
date	2012.11.17.08.25.50;	author svnexp;	state Exp;
branches;
next	;

1.1.14.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.16.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.16.2;

1.1.16.2
date	2012.11.17.08.17.42;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@#!/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 <Todd.Miller@@courtesan.com>
# Copyright (c) 2010 Joerg Sonnenberger <joerg@@NetBSD.org>
#
# 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: head/usr.bin/gzip/zdiff 222210 2011-05-23 09:02:44Z delphij $

# 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
@


1.3.2.1
log
@file zdiff was added on branch RELENG_8_4 on 2013-03-28 13:06:04 +0000
@
text
@d1 142
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 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 <Todd.Miller@@courtesan.com>
# Copyright (c) 2010 Joerg Sonnenberger <joerg@@NetBSD.org>
#
# 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: releng/8.4/usr.bin/gzip/zdiff 222735 2011-06-06 05:40:52Z delphij $

# 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
@


1.2
log
@SVN rev 222210 on 2011-05-23 09:02:44Z by delphij

Diff reduction against NetBSD.  The most notable change is to zdiff(1) to
handle more file formats including bzip2 and xz.

MFC after:	2 weeks
@
text
@d27 1
a27 1
# $FreeBSD$
@


1.2.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d27 1
a27 1
# $FreeBSD: stable/9/usr.bin/gzip/zdiff 222210 2011-05-23 09:02:44Z delphij $
@


1.2.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.4.2
log
@Switch importer
@
text
@d27 1
a27 1
# $FreeBSD: releng/9.1/usr.bin/gzip/zdiff 222210 2011-05-23 09:02:44Z delphij $
@


1.2.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.2
log
@Switch importer
@
text
@d27 1
a27 1
# $FreeBSD: releng/9.0/usr.bin/gzip/zdiff 222210 2011-05-23 09:02:44Z delphij $
@


1.1
log
@Replace the GNU gzip with a slightly modified NetBSD gzip.  The
NetBSD version is a feature-to-feature re-implementation of GNU
gzip using the freely-redistributable zlib and this version is
expected to be mostly bug-to-bug compatible with the GNU
implementation.

 - Because this is a piece of mature code and we want to make
   changes so it is added directly rather than importing to
   src/contrib.
 - Connect newly added code to src/usr.bin/ and rescue/rescue
   build.
 - Disconnect the GNU gzip code from build for now, they will
   be eventually removed completely.
 - Provide two new src.conf(5) knobs, WITHOUT_BZIP2_SUPPORT and
   WITHOUT_BZIP2.

Tested by:	kris (full exp-7 pointyhat build)
Approved by:	core (importing a 4-clause BSD licensed file)
Approved by:	re (adding new utility during -HEAD code slush)
@
text
@d3 2
a4 1
# $NetBSD: zdiff,v 1.3 2004/03/29 10:01:00 wiz Exp $
d9 1
d36 51
a86 1
USAGE="usage: z$prog [options] file1 [file2]"
d97 3
d113 6
a118 14
	case "$1" in
		*[._-][Zz])
			files="${1%??}"
			;;
		*[._-]gz)
			files="${1%???}"
			;;
		*.t[ag]z)
			files="${1%??}"ar
			;;
		*)	echo "z$prog: unknown suffix" 1>&2
			exit 1
	esac
	gzip -cdfq "$1" | $prog $flags - "$files"
d122 8
a129 27
	case "$1" in
		*[._-][Zz]|*[._-]gz|*.t[ag]z)
			files=-
			filt="gzip -cdfq $1"
			;;
		*)
			files="$1"
			;;
	esac
	case "$2" in
		*[._-][Zz]|*[._-]gz|*.t[ag]z)
			if [ "$files" = "-" ]; then
				tmp=`mktemp -t z$prog.XXXXXXXXXX` || exit 1
				trap "rm -f $tmp" 0 1 2 3 13 15
				gzip -cdfq "$2" > $tmp
				files="$files $tmp"
			else
				files="$files -"
				filt="gzip -cdfq $2"
			fi
			;;
		*)
			files="$files $2"
			;;
	esac
	if [ -n "$filt" ]; then
		$filt | $prog $flags $files
d131 4
a134 1
		$prog $flags $files
@


1.1.4.1
log
@SVN rev 222736 on 2011-06-06 05:48:25Z by delphij

MFC r222210, 222211, 222287:

 - Diff reduction against NetBSD.  The most notable change is to zdiff(1)
   to handle more file formats including bzip2 and xz.
 - Match symbolic link handling behavior with GNU gzip, bzip2 and xz:
   When we are operating on a symbolic link pointing to an existing
   file, bail out by default, but go ahead if -f is specified.
@
text
@d3 1
a3 2
# $NetBSD: zdiff,v 1.5 2010/04/14 20:30:28 joerg Exp $
#
a7 1
# Copyright (c) 2010 Joerg Sonnenberger <joerg@@NetBSD.org>
d34 1
a34 51
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
}

a44 3
		-)
			break
			;;
d58 14
a71 6
	check_suffix "$1" files filt
	if [ -z "$filt" ]; then
		echo "z$prog: unknown suffix" 1>&2
		exit 1
	fi
	$filt -- "$1" | $prog $flags -- - "$files"
d75 27
a101 8
	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"
d103 1
a103 4
		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"
@


1.1.4.2
log
@Switch importer
@
text
@d27 1
a27 1
# $FreeBSD: stable/7/usr.bin/gzip/zdiff 222736 2011-06-06 05:48:25Z delphij $
@


1.1.16.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.1.16.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: releng/7.4/usr.bin/gzip/zdiff 166255 2007-01-26 10:19:08Z delphij $
@


1.1.14.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.12.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.1.12.2
log
@SVN rev 222735 on 2011-06-06 05:40:52Z by delphij

MFC r222210, 222211, 222287:

 - Diff reduction against NetBSD.  The most notable change is to zdiff(1)
   to handle more file formats including bzip2 and xz.
 - Match symbolic link handling behavior with GNU gzip, bzip2 and xz:
   When we are operating on a symbolic link pointing to an existing
   file, bail out by default, but go ahead if -f is specified.
@
text
@d3 1
a3 2
# $NetBSD: zdiff,v 1.5 2010/04/14 20:30:28 joerg Exp $
#
a7 1
# Copyright (c) 2010 Joerg Sonnenberger <joerg@@NetBSD.org>
d34 1
a34 51
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
}

a44 3
		-)
			break
			;;
d58 14
a71 6
	check_suffix "$1" files filt
	if [ -z "$filt" ]; then
		echo "z$prog: unknown suffix" 1>&2
		exit 1
	fi
	$filt -- "$1" | $prog $flags -- - "$files"
d75 27
a101 8
	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"
d103 1
a103 4
		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"
@


1.1.12.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d27 1
a27 1
# $FreeBSD: stable/8/usr.bin/gzip/zdiff 222735 2011-06-06 05:40:52Z delphij $
@


1.1.12.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.1.12.2.2.2
log
@Switch importer
@
text
@d27 1
a27 1
# $FreeBSD: releng/8.3/usr.bin/gzip/zdiff 222735 2011-06-06 05:40:52Z delphij $
@


1.1.12.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.1.12.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.1.12.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1.10.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.8.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.2.1
log
@MFC: Replace gzip(1) with the BSD licensed version found in -HEAD.

Discussed with:	re, so, portmgr (kris)

All bugs are mine.
@
text
@@


1.1.2.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: stable/6/usr.bin/gzip/zdiff 166840 2007-02-20 08:33:32Z delphij $
@


1.1.2.1.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


