From owner-svn-soc-all@FreeBSD.ORG Fri Aug 17 16:51:21 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 389BC1065673 for ; Fri, 17 Aug 2012 16:51:19 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Aug 2012 16:51:19 +0000 Date: Fri, 17 Aug 2012 16:51:19 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120817165119.389BC1065673@hub.freebsd.org> Cc: Subject: socsvn commit: r240474 - soc2012/jhagewood/diff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:51:21 -0000 Author: jhagewood Date: Fri Aug 17 16:51:18 2012 New Revision: 240474 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240474 Log: Modified: soc2012/jhagewood/diff/zdiff-man.txt Modified: soc2012/jhagewood/diff/zdiff-man.txt ============================================================================== --- soc2012/jhagewood/diff/zdiff-man.txt Fri Aug 17 16:47:20 2012 (r240473) +++ soc2012/jhagewood/diff/zdiff-man.txt Fri Aug 17 16:51:18 2012 (r240474) @@ -1,42 +1,43 @@ ZDIFF(1) FreeBSD General Commands Manual ZDIFF(1) -NNAAMMEE - zzddiiffff -- differential file and directory comparator for compressed files. +NAME + zdiff -- differential file and directory comparator for compressed files. -SSYYNNOOPPSSIISS - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] - _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --CC [_n_u_m_b_e_r] _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillqqttww] [--II _p_a_t_t_e_r_n] --DD _s_t_r_i_n_g _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillppqqTTttww] [--II _p_a_t_t_e_r_n] [--LL _l_a_b_e_l] --UU _n_u_m_b_e_r _f_i_l_e_1 _f_i_l_e_2 - zzddiiffff [--aabbddiillNNPPppqqrrssTTttww] [--II _p_a_t_t_e_r_n] [--cc | --ee | --ff | --nn | --uu] [--LL _l_a_b_e_l] - [--SS _n_a_m_e] [--XX _f_i_l_e] [--xx _p_a_t_t_e_r_n] _d_i_r_1 _d_i_r_2 - zzddiiffff [--vv] - -DDEESSCCRRIIPPTTIIOONN - The zzddiiffff utility compares the decompressed contents of gzip _f_i_l_e_1 and - _f_i_l_e_2 and writes to the standard output the list of changes necessary to +SYNOPSIS + zdiff [-abdilpqTtw] [-I pattern] [-c | -e | -f | -n | -u] [-L label] + file1 file2 + zdiff [-abdilpqTtw] [-I pattern] [-L label] -C [number] file1 file2 + zdiff [-abdilqtw] [-I pattern] -D string file1 file2 + zdiff [-abdilpqTtw] [-I pattern] [-L label] -U number file1 file2 + zdiff [-abdilNPpqrsTtw] [-I pattern] [-c | -e | -f | -n | -u] [-L label] + [-S name] [-X file] [-x pattern] dir1 dir2 + zdiff [-v] + +DESCRIPTION + The zdiff utility compares the decompressed contents of gzip file1 and + file2 and writes to the standard output the list of changes necessary to convert one file into the other. No output is produced if the files are identical. See diff(1) for program options. -EENNVVIIRROONNMMEENNTT - TMPDIR If the environment variable TMPDIR exists, zzddiiffff will use the +ENVIRONMENT + TMPDIR If the environment variable TMPDIR exists, zdiff will use the directory specified by TMPDIR as the temporary directory. -FFIILLEESS - _/_t_m_p_/_d_i_f_f_._X_X_X_X_X_X_X_X Temporary file used when comparing a device or the +FILES + /tmp/diff.XXXXXXXX Temporary file used when comparing a device or the standard input. Note that the temporary file is unlinked as soon as it is created so it will not show up in a directory listing. -DDIIAAGGNNOOSSTTIICCSS - The zzddiiffff utility exits with one of the following values: +DIAGNOSTICS + The zdiff utility exits with one of the following values: 0 No differences were found. 1 Differences were found. >1 An error occurred. -SSEEEE AALLSSOO +SEE ALSO diff(1), cmp(1), diff3(1), sdiff(1), zsdiff(1) FreeBSD 9.0 August 15, 2012 FreeBSD 9.0 +