Virgin import of diffutils 2.8.7.

5 files changed, 492 insertions, 0 deletions

diff --git a/contrib/diff/man/Makefile.am b/contrib/diff/man/Makefile.am
new file mode 100644
index 0000000..d3a1ee2
--- /dev/null
+++ b/contrib/diff/man/Makefile.am
@@ -0,0 +1,34 @@
+# Automakefile for GNU diffutils man pages
+
+# Copyright (C) 2002 Free Software Foundation, Inc.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+## 02111-1307, USA.
+
+dist_man_MANS =	cmp.1 diff.1 diff3.1 sdiff.1
+MAINTAINERCLEANFILES = $(dist_man_MANS)
+
+S = $(top_srcdir)/src
+cmp.1: $S/cmp.c
+diff.1: $S/diff.c
+diff3.1: $S/diff3.c
+sdiff.1: $S/sdiff.c
+
+# Depend on configure.ac to get version number changes.
+$(dist_man_MANS): $(top_srcdir)/configure.ac
+	base=`expr $@ : '\(.*\).1'` && \
+	  (echo '[NAME]' && sed 's@/\* *@@; s/-/\\-/; q' $S/$$base.c) | \
+	  $(HELP2MAN) -i - -S '$(PACKAGE) $(VERSION)' ../src/$$base | \
+	  sed 's/^\.B info .*/.B info diff/' >$@
diff --git a/contrib/diff/man/cmp.1 b/contrib/diff/man/cmp.1
new file mode 100644
index 0000000..ffc664e
--- /dev/null
+++ b/contrib/diff/man/cmp.1
@@ -0,0 +1,63 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH CMP "1" "April 2004" "diffutils 2.8.7" "User Commands"
+.SH NAME
+cmp \- compare two files byte by byte
+.SH SYNOPSIS
+.B cmp
+[\fIOPTION\fR]... \fIFILE1 \fR[\fIFILE2 \fR[\fISKIP1 \fR[\fISKIP2\fR]]]
+.SH DESCRIPTION
+Compare two files byte by byte.
+.TP
+\fB\-b\fR  \fB\-\-print\-bytes\fR
+Print differing bytes.
+.TP
+\fB\-i\fR SKIP  \fB\-\-ignore\-initial\fR=\fISKIP\fR
+Skip the first SKIP bytes of input.
+.HP
+\fB\-i\fR SKIP1:SKIP2  \fB\-\-ignore\-initial\fR=\fISKIP1\fR:SKIP2
+.IP
+Skip the first SKIP1 bytes of FILE1 and the first SKIP2 bytes of FILE2.
+.TP
+\fB\-l\fR  \fB\-\-verbose\fR
+Output byte numbers and values of all differing bytes.
+.TP
+\fB\-n\fR LIMIT  \fB\-\-bytes\fR=\fILIMIT\fR
+Compare at most LIMIT bytes.
+.TP
+\fB\-s\fR  \fB\-\-quiet\fR  \fB\-\-silent\fR
+Output nothing; yield exit status only.
+.TP
+\fB\-v\fR  \fB\-\-version\fR
+Output version info.
+.TP
+\fB\-\-help\fR
+Output this help.
+.PP
+SKIP1 and SKIP2 are the number of bytes to skip in each file.
+SKIP values may be followed by the following multiplicative suffixes:
+kB 1000, K 1024, MB 1,000,000, M 1,048,576,
+GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y.
+.PP
+If a FILE is `-' or missing, read standard input.
+Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
+.SH AUTHOR
+Written by Torbjorn Granlund and David MacKenzie.
+.SH "REPORTING BUGS"
+Report bugs to <bug-gnu-utils@gnu.org>.
+.SH COPYRIGHT
+Copyright \(co 2004 Free Software Foundation, Inc.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+The full documentation for
+.B cmp
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B cmp
+programs are properly installed at your site, the command
+.IP
+.B info diff
+.PP
+should give you access to the complete manual.
diff --git a/contrib/diff/man/diff.1 b/contrib/diff/man/diff.1
new file mode 100644
index 0000000..cef8e1a
--- /dev/null
+++ b/contrib/diff/man/diff.1
@@ -0,0 +1,227 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH DIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
+.SH NAME
+diff \- compare files line by line
+.SH SYNOPSIS
+.B diff
+[\fIOPTION\fR]... \fIFILES\fR
+.SH DESCRIPTION
+Compare files line by line.
+.TP
+\fB\-i\fR  \fB\-\-ignore\-case\fR
+Ignore case differences in file contents.
+.TP
+\fB\-\-ignore\-file\-name\-case\fR
+Ignore case when comparing file names.
+.TP
+\fB\-\-no\-ignore\-file\-name\-case\fR
+Consider case when comparing file names.
+.TP
+\fB\-E\fR  \fB\-\-ignore\-tab\-expansion\fR
+Ignore changes due to tab expansion.
+.TP
+\fB\-b\fR  \fB\-\-ignore\-space\-change\fR
+Ignore changes in the amount of white space.
+.TP
+\fB\-w\fR  \fB\-\-ignore\-all\-space\fR
+Ignore all white space.
+.TP
+\fB\-B\fR  \fB\-\-ignore\-blank\-lines\fR
+Ignore changes whose lines are all blank.
+.TP
+\fB\-I\fR RE  \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
+Ignore changes whose lines all match RE.
+.TP
+\fB\-\-strip\-trailing\-cr\fR
+Strip trailing carriage return on input.
+.TP
+\fB\-a\fR  \fB\-\-text\fR
+Treat all files as text.
+.TP
+\fB\-c\fR  \fB\-C\fR NUM  \fB\-\-context\fR[=\fINUM\fR]
+Output NUM (default 3) lines of copied context.
+.TP
+\fB\-u\fR  \fB\-U\fR NUM  \fB\-\-unified\fR[=\fINUM\fR]
+Output NUM (default 3) lines of unified context.
+.TP
+\fB\-\-label\fR LABEL
+Use LABEL instead of file name.
+.TP
+\fB\-p\fR  \fB\-\-show\-c\-function\fR
+Show which C function each change is in.
+.TP
+\fB\-F\fR RE  \fB\-\-show\-function\-line\fR=\fIRE\fR
+Show the most recent line matching RE.
+.TP
+\fB\-q\fR  \fB\-\-brief\fR
+Output only whether files differ.
+.TP
+\fB\-e\fR  \fB\-\-ed\fR
+Output an ed script.
+.TP
+\fB\-\-normal\fR
+Output a normal diff.
+.TP
+\fB\-n\fR  \fB\-\-rcs\fR
+Output an RCS format diff.
+.TP
+\fB\-y\fR  \fB\-\-side\-by\-side\fR
+Output in two columns.
+.TP
+\fB\-W\fR NUM  \fB\-\-width\fR=\fINUM\fR
+Output at most NUM (default 130) print columns.
+.TP
+\fB\-\-left\-column\fR
+Output only the left column of common lines.
+.TP
+\fB\-\-suppress\-common\-lines\fR
+Do not output common lines.
+.TP
+\fB\-D\fR NAME  \fB\-\-ifdef\fR=\fINAME\fR
+Output merged file to show `#ifdef NAME' diffs.
+.TP
+\fB\-\-GTYPE\-group\-format\fR=\fIGFMT\fR
+Similar, but format GTYPE input groups with GFMT.
+.TP
+\fB\-\-line\-format\fR=\fILFMT\fR
+Similar, but format all input lines with LFMT.
+.TP
+\fB\-\-LTYPE\-line\-format\fR=\fILFMT\fR
+Similar, but format LTYPE input lines with LFMT.
+.TP
+LTYPE is `old', `new', or `unchanged'.
+GTYPE is LTYPE or `changed'.
+.IP
+GFMT may contain:
+.TP
+%<
+lines from FILE1
+.TP
+%>
+lines from FILE2
+.TP
+%=
+lines common to FILE1 and FILE2
+.TP
+%[-][WIDTH][.[PREC]]{doxX}LETTER
+printf-style spec for LETTER
+.IP
+LETTERs are as follows for new group, lower case for old group:
+.TP
+F
+first line number
+.TP
+L
+last line number
+.TP
+N
+number of lines = L-F+1
+.TP
+E
+F-1
+.TP
+M
+L+1
+.IP
+LFMT may contain:
+.TP
+%L
+contents of line
+.TP
+%l
+contents of line, excluding any trailing newline
+.TP
+%[-][WIDTH][.[PREC]]{doxX}n
+printf-style spec for input line number
+.IP
+Either GFMT or LFMT may contain:
+.TP
+%%
+%
+.TP
+%c'C'
+the single character C
+.TP
+%c'\eOOO'
+the character with octal code OOO
+.TP
+\fB\-l\fR  \fB\-\-paginate\fR
+Pass the output through `pr' to paginate it.
+.TP
+\fB\-t\fR  \fB\-\-expand\-tabs\fR
+Expand tabs to spaces in output.
+.TP
+\fB\-T\fR  \fB\-\-initial\-tab\fR
+Make tabs line up by prepending a tab.
+.TP
+\fB\-\-tabsize\fR=\fINUM\fR
+Tab stops are every NUM (default 8) print columns.
+.TP
+\fB\-r\fR  \fB\-\-recursive\fR
+Recursively compare any subdirectories found.
+.TP
+\fB\-N\fR  \fB\-\-new\-file\fR
+Treat absent files as empty.
+.TP
+\fB\-\-unidirectional\-new\-file\fR
+Treat absent first files as empty.
+.TP
+\fB\-s\fR  \fB\-\-report\-identical\-files\fR
+Report when two files are the same.
+.TP
+\fB\-x\fR PAT  \fB\-\-exclude\fR=\fIPAT\fR
+Exclude files that match PAT.
+.TP
+\fB\-X\fR FILE  \fB\-\-exclude\-from\fR=\fIFILE\fR
+Exclude files that match any pattern in FILE.
+.TP
+\fB\-S\fR FILE  \fB\-\-starting\-file\fR=\fIFILE\fR
+Start with FILE when comparing directories.
+.TP
+\fB\-\-from\-file\fR=\fIFILE1\fR
+Compare FILE1 to all operands.  FILE1 can be a directory.
+.TP
+\fB\-\-to\-file\fR=\fIFILE2\fR
+Compare all operands to FILE2.  FILE2 can be a directory.
+.TP
+\fB\-\-horizon\-lines\fR=\fINUM\fR
+Keep NUM lines of the common prefix and suffix.
+.TP
+\fB\-d\fR  \fB\-\-minimal\fR
+Try hard to find a smaller set of changes.
+.TP
+\fB\-\-speed\-large\-files\fR
+Assume large files and many scattered small changes.
+.TP
+\fB\-v\fR  \fB\-\-version\fR
+Output version info.
+.TP
+\fB\-\-help\fR
+Output this help.
+.PP
+FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'.
+If \fB\-\-from\-file\fR or \fB\-\-to\-file\fR is given, there are no restrictions on FILES.
+If a FILE is `-', read standard input.
+Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
+.SH AUTHOR
+Written by Paul Eggert, Mike Haertel, David Hayes,
+Richard Stallman, and Len Tower.
+.SH "REPORTING BUGS"
+Report bugs to <bug-gnu-utils@gnu.org>.
+.SH COPYRIGHT
+Copyright \(co 2004 Free Software Foundation, Inc.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+The full documentation for
+.B diff
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B diff
+programs are properly installed at your site, the command
+.IP
+.B info diff
+.PP
+should give you access to the complete manual.
diff --git a/contrib/diff/man/diff3.1 b/contrib/diff/man/diff3.1
new file mode 100644
index 0000000..f7daee2
--- /dev/null
+++ b/contrib/diff/man/diff3.1
@@ -0,0 +1,78 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH DIFF3 "1" "April 2004" "diffutils 2.8.7" "User Commands"
+.SH NAME
+diff3 \- compare three files line by line
+.SH SYNOPSIS
+.B diff3
+[\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
+.SH DESCRIPTION
+Compare three files line by line.
+.TP
+\fB\-e\fR  \fB\-\-ed\fR
+Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
+.TP
+\fB\-E\fR  \fB\-\-show\-overlap\fR
+Output unmerged changes, bracketing conflicts.
+.TP
+\fB\-A\fR  \fB\-\-show\-all\fR
+Output all changes, bracketing conflicts.
+.TP
+\fB\-x\fR  \fB\-\-overlap\-only\fR
+Output overlapping changes.
+.TP
+\fB\-X\fR
+Output overlapping changes, bracketing them.
+.TP
+\fB\-3\fR  \fB\-\-easy\-only\fR
+Output unmerged nonoverlapping changes.
+.TP
+\fB\-m\fR  \fB\-\-merge\fR
+Output merged file instead of ed script (default \fB\-A\fR).
+.TP
+\fB\-L\fR LABEL  \fB\-\-label\fR=\fILABEL\fR
+Use LABEL instead of file name.
+.TP
+\fB\-i\fR
+Append `w' and `q' commands to ed scripts.
+.TP
+\fB\-a\fR  \fB\-\-text\fR
+Treat all files as text.
+.TP
+\fB\-\-strip\-trailing\-cr\fR
+Strip trailing carriage return on input.
+.TP
+\fB\-T\fR  \fB\-\-initial\-tab\fR
+Make tabs line up by prepending a tab.
+.TP
+\fB\-\-diff\-program\fR=\fIPROGRAM\fR
+Use PROGRAM to compare files.
+.TP
+\fB\-v\fR  \fB\-\-version\fR
+Output version info.
+.TP
+\fB\-\-help\fR
+Output this help.
+.PP
+If a FILE is `-', read standard input.
+Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
+.SH AUTHOR
+Written by Randy Smith.
+.SH "REPORTING BUGS"
+Report bugs to <bug-gnu-utils@gnu.org>.
+.SH COPYRIGHT
+Copyright \(co 2004 Free Software Foundation, Inc.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+The full documentation for
+.B diff3
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B diff3
+programs are properly installed at your site, the command
+.IP
+.B info diff
+.PP
+should give you access to the complete manual.
diff --git a/contrib/diff/man/sdiff.1 b/contrib/diff/man/sdiff.1
new file mode 100644
index 0000000..ab64c7e
--- /dev/null
+++ b/contrib/diff/man/sdiff.1
@@ -0,0 +1,90 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH SDIFF "1" "April 2004" "diffutils 2.8.7" "User Commands"
+.SH NAME
+sdiff \- side-by-side merge of file differences
+.SH SYNOPSIS
+.B sdiff
+[\fIOPTION\fR]... \fIFILE1 FILE2\fR
+.SH DESCRIPTION
+Side-by-side merge of file differences.
+.TP
+\fB\-o\fR FILE  \fB\-\-output\fR=\fIFILE\fR
+Operate interactively, sending output to FILE.
+.TP
+\fB\-i\fR  \fB\-\-ignore\-case\fR
+Consider upper- and lower-case to be the same.
+.TP
+\fB\-E\fR  \fB\-\-ignore\-tab\-expansion\fR
+Ignore changes due to tab expansion.
+.TP
+\fB\-b\fR  \fB\-\-ignore\-space\-change\fR
+Ignore changes in the amount of white space.
+.TP
+\fB\-W\fR  \fB\-\-ignore\-all\-space\fR
+Ignore all white space.
+.TP
+\fB\-B\fR  \fB\-\-ignore\-blank\-lines\fR
+Ignore changes whose lines are all blank.
+.TP
+\fB\-I\fR RE  \fB\-\-ignore\-matching\-lines\fR=\fIRE\fR
+Ignore changes whose lines all match RE.
+.TP
+\fB\-\-strip\-trailing\-cr\fR
+Strip trailing carriage return on input.
+.TP
+\fB\-a\fR  \fB\-\-text\fR
+Treat all files as text.
+.TP
+\fB\-w\fR NUM  \fB\-\-width\fR=\fINUM\fR
+Output at most NUM (default 130) print columns.
+.TP
+\fB\-l\fR  \fB\-\-left\-column\fR
+Output only the left column of common lines.
+.TP
+\fB\-s\fR  \fB\-\-suppress\-common\-lines\fR
+Do not output common lines.
+.TP
+\fB\-t\fR  \fB\-\-expand\-tabs\fR
+Expand tabs to spaces in output.
+.TP
+\fB\-\-tabsize\fR=\fINUM\fR
+Tab stops are every NUM (default 8) print columns.
+.TP
+\fB\-d\fR  \fB\-\-minimal\fR
+Try hard to find a smaller set of changes.
+.TP
+\fB\-H\fR  \fB\-\-speed\-large\-files\fR
+Assume large files and many scattered small changes.
+.TP
+\fB\-\-diff\-program\fR=\fIPROGRAM\fR
+Use PROGRAM to compare files.
+.TP
+\fB\-v\fR  \fB\-\-version\fR
+Output version info.
+.TP
+\fB\-\-help\fR
+Output this help.
+.PP
+If a FILE is `-', read standard input.
+Exit status is 0 if inputs are the same, 1 if different, 2 if trouble.
+.SH AUTHOR
+Written by Thomas Lord.
+.SH "REPORTING BUGS"
+Report bugs to <bug-gnu-utils@gnu.org>.
+.SH COPYRIGHT
+Copyright \(co 2004 Free Software Foundation, Inc.
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+The full documentation for
+.B sdiff
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B sdiff
+programs are properly installed at your site, the command
+.IP
+.B info diff
+.PP
+should give you access to the complete manual.