Add patch_cmds-17

2024-11-23 12:19:41 +00:00 · 2017-04-06 19:37:19 -07:00 · 2017-04-06 19:37:19 -07:00 · 614ec45a37
commit 614ec45a37
parent c43f887f69
455 changed files with 34639 additions and 0 deletions
--- a/diffstat/CHANGES
+++ b/diffstat/CHANGES
@ -0,0 +1,373 @@
+-- $Id: CHANGES,v 1.73 2012/01/03 09:38:29 tom Exp $
+
+2012/01/03 (diffstat 1.55)
+	+ add -R option, like patch's, to reverse the order of the comparison.
+
+	+ FreeBSD ports/148604, ports/149500 reported that lzcat may not
+	  support extracting files compressed in xz format (patch by Frederic
+	  Culot, FreeBSD #149500).
+
+	+ address documentation issue raised in Novell #739210
+
+	+ correct typo s/Solaris/Solar/.
+
+	+ updated configure script macros:
+	  CF_ANSI_CC_CHECK CF_DISABLE_LEAKS CF_GCC_ATTRIBUTES CF_GCC_WARNINGS
+	  CF_MAKE_TAGS CF_MSG_LOG CF_PATH_PROG CF_WITH_INSTALL_PREFIX
+	  CF_XOPEN_SOURCE
+
+	+ update config.guess, config.sub
+
+2010/10/10 (diffstat 1.54)
+	+ change Debian package script to use native format.
+
+	+ correct counts used for new files when -S/-D options are used.
+
+	+ minor typography improvement to manpage (patch by Solar Designer)
+
+	+ remove the temporary directory on error, introduced in 1.48+ (patch
+	  by Solar Designer).
+
+2010/07/19 (diffstat 1.53)
+
+	+ add missing "break" statement which left "-c" option falling-through
+	  into "-C".
+
+2010/07/16 (diffstat 1.52)
+
+	+ add "-C" option to show the histogram using SGR colors.
+
+	+ add "-s" option to show only the summary line.
+
+	+ add configure check for "xz", using this in preference to "lzcat"
+	  (FreeBSD #148604).
+
+	+ also escape literal dashes used as part of the histogram in the
+	  manpage.
+
+	+ modify hyphens vs dashes in manpage per
+		http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
+	  (patch by Francois Marier).
+
+	+ drop mkdirs.sh, use "mkdir -p"
+
+	+ add configure checks for ctags and lint.
+
+	+ updated configure macros
+
+	+ reformat CHANGES to work with metrics script.
+
+	+ fix strict gcc warnings, e.g., using const.
+
+	+ improve a case where filenames have embedded blanks (patch by Reinier
+	  Post).
+
+	+ update config.guess, config.sub
+
+2009/11/07 (diffstat 1.51)
+
+	+ correct suffix-check for ".xz" files as command-line parameters
+	  rather than as piped input (report by Moritz Barsnick).
+
+2009/11/6 (diffstat 1.50)
+
+	+ build/test fixes for MSYS, i.e., MinGW.
+
+	+ improve configure check for get_unlocked function.
+
+	+ use $TMPDIR for path of temporary file used in decompression.
+	
+	+ correct else-condition for detecting compression type (patch by Zach
+	  Hirsch).
+
+2009/08/31 (diffstat 1.49)
+
+	+ improve lzma support, add support for xz (patch by Eric Blake).
+	
+	+ add special case for no-newline message from some diff's (Ubuntu
+	  #269895).
+
+	+ improve configure check for getopt header.
+
+	+ add configure special case for HPUX 11 with _XOPEN_SOURCE definition.
+
+	+ update config.guess, config.sub
+
+2009/08/11 (diffstat 1.48)
+
+	+ add decompression tests for lzma and pack file types.
+
+	+ check for zcat and uncompress in preference to "compress -dc".
+
+	+ modify to check the first few bytes of standard input, and use a
+	  corresponding decompression utility if the stream appears to be
+	  compressed.  This requires making a temporary copy of the data
+	  (Debian #491575).
+
+	+ add -N option, to truncate filenames.
+
+	+ use getc_unlocked() rather than fgetc_unlocked()
+
+	+ modify to recognize Perforce-style diffs (patch by Ed Schouten).
+
+	+ updated configure macros to improve compiler warning checks, use
+	  $PATH_SEPARATOR rather than $PATH_SEP (for consistency with some
+	  autoconf versions),
+
+	+ fix typo in configure --with-install-prefix option (report by
+	  Dagobert Michelsen).
+
+	+ update config.guess, config.sub
+
+2009/03/29 (diffstat 1.47)
+
+	modify to work with patch ".rej" files, which do not have a header to
+	tell which file is affected.
+
+	fix typo in usage message (reports by Moritz Barsnick, John McNamara,
+	Richard Quadling).
+
+2008-08-06 (diffstat 1.46)
+
+	+ add "-S", "-D" and "-m" options to provide a way to show the amount
+	  of difference relative to the total sizes of the files.
+
+	+ add "-q" option (Debian #488248, patch by Greg Norris).
+
+2007/09/04 (diffstat 1.45)
+
+	+ add "-b" option (Debian #379380, patch by Greg Norris).
+
+2007/08/26 (diffstat 1.44)
+
+	+ add a check for default-diff output, e.g., "diff foo bar|diffstat",
+	  which has no "diff" command in the output for diffstat to guess that
+	  a diff is beginning.
+
+	+ add a check after completing a chunk for unified diff to ensure that
+	  the next line either begins another chunk for the diff, or starts
+	  another diff, e.g., a context diff (report by Adrian Bunk).
+
+	+ add configure options for leak-checking valgrind, etc.
+
+	+ use install-sh rather than install.sh
+
+	+ updated config.guess and config.sub
+
+	+ updated configure macros CF_GCC_ATTRIBUTES CF_GCC_WARNINGS CF_MSG_LOG
+	  CF_PATH_SYNTAX CF_VERBOSE CF_XOPEN_SOURCE
+
+2006/07/16 (diffstat 1.43)
+
+	+ fix to avoid modifying data which is being used by tsearch() for
+	  ordering the binary tree (report by Adrian Bunk).
+
+2006/07/02 (diffstat 1.42)
+
+	+ do not ignore pathnames in /tmp/, since some tools create usable
+	  for both old/new files there (Debian #376086).
+
+	+ correct ifdef for fgetc_unlocked().
+
+	+ updated configure macros CF_GCC_VERSION, CF_PATH_SYNTAX and
+	  CF_XOPEN_SOURCE
+
+	+ add configure check for compress, gzip and bzip2 programs that may be
+	  used to decompress files.
+
+2005/08/24 (diffstat 1.41)
+
+	+ update usage message for options added in 1.40 (report by Eric Blake).
+
+2005-08-15 (diffstat 1.40)
+
+	+ add options -l, -r and -t.  add to -f option (patch, comments by
+	  Jean Delvare, Michael Burian).
+
+	+ improve I/O on Linux using fgetc_locked().
+
+	+ improve searching of long sorted lists using tsearch()
+
+	+ improve configure-script checks for Intel compiler warnings.
+
+2005-04-10 (diffstat 1.39)
+
+	+ change order of merging and prefix-stripping so stripping all prefixes,
+	  e.g., with -p9, will be sorted as expected (patch by Jean Delvare).
+
+	+ correct a reference to freed memory after merging found with valgrind.
+
+2005-01-16 (diffstat 1.38)
+
+	+ add makefile.wnt, etc., for win32 port.
+
+	+ fix "make check" to work even when PATH or the build directory has
+	  spaces in it (patch by Eric Blake).
+
+	+ add support for '--help' and '--version' command line arguments, for a
+	  consistent interface with GNU tools, and still compatible to POSIX
+	  requirements on utility options (patch by Eric Blake).
+
+2004-12-18
+
+	+ modify makefile.in and run_test.sh to allow "make check" to be run
+	  from a build directory which is not the same as the source directory,
+	  i.e., when the configure --srcdir option is used (request by Eric
+	  Blake).
+
+	+ modify distribution to include sample of regression tests, so a
+	  "make check" will work (request by Eric Blake).
+
+2004-12-16 (diffstat 1.37)
+
+	+ fix a different case for data beginning with "--" which was treated
+	  as a header line.
+
+2004-12-14 (diffstat 1.36)
+
+	+ Fix allocation problems.  Open files in binary mode for reading.
+	  Getopt returns -1, not necessarily EOF.  Add const where useful.  Use
+	  NO_IDENT where necessary.  malloc() comes from <stdlib.h> in standard
+	  systems (Patch by Eric Blake <ebb9@byu.net>.)
+
+2004-11-08 (diffstat 1.35)
+
+	+ modify makefile.in to work with configure --srcdir option (report by
+	  Eric Blake).
+
+	+ minor fix for resync of unified diffs checks for range (line beginning
+	  with '@' without header lines (successive lines beginning with "---"
+	  and "+++") (Debian #264098).
+
+	+ miscellaneous updates for configure script
+
+2003-11-09 (diffstat 1.34)
+
+	+ improve check for certain lines (not those that begin a chunk) that
+	  begin with '-', treating all except "---" as a delete (report by
+	  James Rowe <Jay@jnrowe.uklinux.net>).
+
+	+ minor updates to configure script.
+
+2003-02-14 (diffstat 1.33)
+
+	+ modified to work around a case where the filename+date was incomplete,
+	  i.e., missing one of the components such as the day of the month.
+	  While diffstat does not use the date directly, it helps distinguish
+	  some lines from non-patches (report by Moritz Barsnick
+	  <moritz@barsnick.net>).
+
+	+ add "-h" option (request by Moritz Barsnick).
+
+	+ fix a typo in usage message (report by Moritz Barsnick).
+
+	+ add "-e" and "-o" options to simplify testing on OS/2 EMX.
+
+2003-01-04 (diffstat 1.32)
+
+	+ modified to handle patches generated by makepatch-2.00_09, which uses
+	  both "Index" and "diff" lines (report by D Roland Walker).  As a side
+	  effect, the additional merging eliminates occasional reports with
+	  zero differences.
+
+	+ modified to avoid buffer overflows.
+
+	+ fixes for Debian #155000 (did not handle a '-' in first content-column
+	  of a unified diff) and #170947 (option to turn the progress messages
+	  off).
+
+	+ updated configure script using aclocal.m4 macros
+
+	+ update makefile.in to improve use of autoconf (report/patch by Nix
+	  <nix@esperi.demon.co.uk>).
+
+2002-08-20 (diffstat 1.31)
+
+	+ add -u, -k options to override diffstat's normal sorting (-u) and
+	  merging (-k) of identical filenames.  (-u requested by H Peter Anvin
+	  <hpa@zytor.com>).
+
+2002-08-09 (diffstat 1.30)
+
+	+ allow either '/' or '-' as delimiters in dates, to accommodate
+	  gendiff (report by Rik van Riel <riel@conectiva.com.br>).  This
+	  corresponds to the time format used in diffutils 2.8 whose changelog
+	  states that this is ISO 8601 (though online references differ).
+
+2001-10-10 (diffstat 1.29)
+
+	+ add bzip2 (.bz2) suffix (suggested by Gregory T Norris
+	  <haphazard@socket.net>, Debian #82969).
+
+	+ add check for diff from RCS archive where the "diff" lines do not
+	  reference a filename.
+
+2000-03-29 (diffstat 1.28)
+
+	+ Add -c option (to prefix output with '#' comment), eliminating a step
+	  in my script that combines diffstat output with a patch.  This is a
+	  workaround for OSF1's broken sed utility.
+
+	+ Check for compressed file suffixes .Z and .gz, read uncompressed data
+	  via pipe (Debian wishlist item #53975 by ch@lathspell.westend.com).
+
+	+ Simplified makefile based on comments by M Sweger
+	  <mikesw@whiterose.net>
+
+	+ Adapted changes from Troy Engel <tengel@sonic.net> as "-f" option.
+
+1998-05-27 (diffstat 1.27)
+
+	+ Debian diff's don't show dates on the lines where we expect to see
+	  filenames.
+
+1998-01-16 (diffstat 1.26, Patch 5)
+
+	+ Change copyright terms.
+
+ 	+ Accommodate patches w/o tabs in header lines (e.g., from cut/paste).
+	  Still prefer the tabs because otherwise we cannot have spaces in
+	  filenames.
+
+ 	+ Strip suffixes such as ".orig", to avoid confusing output.
+
+1996-03-16 (diffstat 1.24, Patch 4)
+
+	+ Corrected state-transition after "Binary".
+
+	+ Added testing subdirectory
+
+	+ Added -p option.
+
+	+ Handle differences from /tmp (e.g., for X11R5 patches).
+
+1995-05-06 (diffstat 1.17 Patch 3)
+
+	+ Repost whole program to comp.sources.misc (1.17)
+
+	+ Mods to scaling: limit to 1:1 if only a few changes were made; added
+	  logic to accumulate error across +/-/!  calls.
+
+	+ added logic to recognize 'rcsdiff -u' output.
+
+1994-12-26 (diffstat 1.15, Patch 2)
+
+	+ Strip common pathname prefix (1.15)
+
+1994-11-13 (diffstat 1.14, Patch 1)
+
+	+ Test for <string.h> vs <strings.h>
+
+	+ Corrected error in 'match()' that didn't handle properly the case
+	  when an argument was a null string (i.e., blank lines in a unified
+	  diff).
+
+	+ Added options '-n' and '-V'
+
+	+ Added patchlev.h, CHANGES files.
+
+	+ Added install.sh, for autoconf 2.1
+
+1994-06-13 (diffstat 1.12, Patch 0)
+
+	+ Initial release of 'diffstat' (1.12).
--- a/diffstat/README
+++ b/diffstat/README
@ -0,0 +1,7 @@
+$Id: README,v 1.5 2001/10/11 00:23:46 tom Exp $
+
+Readme file for DiffStat.
+
+This program is a simple filter that reads the output of the 'diff' program,
+and produces a histogram of the total number of lines that were changed.  It is
+useful for scanning a patch file to see which files were changed.
--- a/diffstat/aclocal.m4
+++ b/diffstat/aclocal.m4
--- a/diffstat/config.guess
+++ b/diffstat/config.guess
--- a/diffstat/config.h
+++ b/diffstat/config.h
@ -0,0 +1,38 @@
+/* config.h.  Generated automatically by configure.  */
+/*
+ * $Id: config_h.in,v 1.1 1994/06/12 23:48:18 tom Exp $
+ * config_h.in is a template file used by configure to produce config.h.
+ * config_h is then transformed (by config.status) into the header file
+ * config.h -- Kevin Buettner.
+ */
+
+
+#define CC_HAS_PROTOS 1
+//#define SYSTEM_NAME "darwin13.0.0"
+#define BZCAT_PATH "bzcat"
+#define BZIP2_PATH "bzip2"
+#define COMPRESS_PATH "compress"
+#define GZIP_PATH "gzip"
+#define LZCAT_PATH "xz"
+#define UNCOMPRESS_PATH "uncompress"
+#define XZ_PATH "xz"
+#define ZCAT_PATH "zcat"
+#define STDC_HEADERS 1
+#define HAVE_SEARCH_H 1
+#define HAVE_STRING_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_GETOPT_H 1
+#define HAVE_GETOPT_HEADER 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_MKDTEMP 1
+#define HAVE_POPEN 1
+#define HAVE_TSEARCH 1
+#define HAVE_GETC_UNLOCKED 1
--- a/diffstat/config.sub
+++ b/diffstat/config.sub
--- a/diffstat/config_h.in
+++ b/diffstat/config_h.in
@ -0,0 +1,8 @@
+/* 
+ * $Id: config_h.in,v 1.1 1994/06/12 23:48:18 tom Exp $
+ * config_h.in is a template file used by configure to produce config.h.
+ * config_h is then transformed (by config.status) into the header file 
+ * config.h -- Kevin Buettner.
+ */
+
+@DEFS@
--- a/diffstat/configure
+++ b/diffstat/configure
--- a/diffstat/configure.in
+++ b/diffstat/configure.in
@ -0,0 +1,54 @@
+dnl Process this file with 'autoconf' to produce a 'configure' script
+dnl $Id: configure.in,v 1.22 2010/07/16 09:25:15 tom Exp $
+AC_PREREQ(2.13.20020210)
+AC_REVISION($Revision: 1.22 $)
+AC_INIT(diffstat.c)
+AC_CONFIG_HEADER(config.h:config_h.in)
+
+AC_PROG_CC
+AC_PROG_INSTALL
+CF_PROG_LINT
+CF_MAKE_TAGS
+
+CF_ANSI_CC_REQD
+CF_DISABLE_ECHO
+CF_PROG_EXT
+CF_WITH_INSTALL_PREFIX
+
+with_full_paths=no
+CF_PATH_PROG(BZCAT, bzcat)
+CF_PATH_PROG(BZIP2, bzip2)
+CF_PATH_PROG(COMPRESS, compress, gzip)
+CF_PATH_PROG(GZIP, gzip)
+CF_PATH_PROG(LZCAT, lzcat, xz)
+CF_PATH_PROG(PCAT, pcat)
+CF_PATH_PROG(UNCOMPRESS, uncompress.real, uncompress)
+CF_PATH_PROG(XZ, xz, lzcat)
+CF_PATH_PROG(ZCAT, zcat)
+
+CF_XOPEN_SOURCE
+CF_WITH_WARNINGS
+
+AC_CONST
+AC_STDC_HEADERS
+AC_HAVE_HEADERS(\
+malloc.h \
+search.h \
+string.h \
+)
+CF_GETOPT_HEADER
+
+AC_TYPE_SIZE_T
+
+AC_CHECK_FUNCS(\
+mkdtemp \
+popen \
+tsearch \
+)
+
+CF_STDIO_UNLOCKED(getc_unlocked)
+
+CF_DISABLE_LEAKS
+
+###	output makefile and config.h
+AC_OUTPUT(makefile,,,cat)
--- a/diffstat/diffstat.1
+++ b/diffstat/diffstat.1
@ -0,0 +1,235 @@
+.\"*****************************************************************************
+.\" Copyright 1994-2009,2010 by Thomas E. Dickey                               *
+.\" All Rights Reserved.                                                       *
+.\"                                                                            *
+.\" Permission to use, copy, modify, and distribute this software and its      *
+.\" documentation for any purpose and without fee is hereby granted, provided  *
+.\" that the above copyright notice appear in all copies and that both that    *
+.\" copyright notice and this permission notice appear in supporting           *
+.\" documentation, and that the name of the above listed copyright holder(s)   *
+.\" not be used in advertising or publicity pertaining to distribution of the  *
+.\" software without specific, written prior permission.                       *
+.\"                                                                            *
+.\" THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD   *
+.\" TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND  *
+.\" FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE  *
+.\" FOR ANY SPECIAL, 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.                *
+.\"*****************************************************************************
+.\" $Id: diffstat.1,v 1.30 2012/01/02 19:20:26 tom Exp $
+.TH DIFFSTAT 1
+.SH NAME
+\fBdiffstat\fP \- make histogram from diff-output
+.SH SYNOPSIS
+\fBdiffstat\fP\fI [options] [file-specifications]\fP
+.SH DESCRIPTION
+This program reads the output of \fBdiff\fP and displays a histogram
+of the insertions, deletions, and modifications per-file.
+Diffstat is a program that is useful for reviewing large, complex patch files.
+It reads from one or more input files which contain output from \fBdiff\fP,
+producing a histogram of the total lines changed for each file referenced.
+.PP
+If the input filename ends with .bz2, .gz, .lzma, .z or .Z,
+diffstat will read the
+uncompressed data via a pipe from the corresponding program.
+It also can infer the compression type from files piped via the standard input.
+.PP
+Diffstat recognizes the most popular types of output from diff:
+.RS
+.TP
+unified
+preferred by the \fBpatch\fP utility.
+.TP
+context
+best for readability, but not very compact.
+.TP
+default
+not good for much, but simple to generate.
+.RE
+.PP
+\fBDiffstat\fP detects the lines that are output by \fBdiff\fP to
+tell which files are compared, and then counts the markers in the
+first column that denote the type of change (insertion, deletion
+or modification).
+These are shown in the histogram as "+", "\-" and "!" characters.
+.PP
+If no filename is given on the command line,
+\fBdiffstat\fP reads the differences from the standard input.
+.SH OPTIONS
+.TP
+.B \-b
+ignore lines matching "Binary files XXX and YYY differ" in the diff
+.TP
+.B \-c
+prefix each line of output with "#", making it a comment-line for shell
+scripts.
+.TP
+.B \-C
+add SGR color escape sequences to highlight the histogram.
+.TP
+.BI \-D " destination"
+specify a directory containing files which can be referred to as
+the result of applying the differences.
+\fBdiffstat\fP will count the lines in the corresponding files
+(after adjusting the names by the \fB\-p\fP option)
+to obtain the total number of lines in each file.
+.IP
+The remainder, after subtracting modified and deleted lines,
+is shown as "unchanged lines".
+.TP
+.BI \-e " file"
+redirect standard error to \fIfile\fR.
+.TP
+.BI \-f " format"
+specify the format of the histogram.
+.RS
+.TP 3
+0
+for concise, which shows only the value and a single histogram code for each of
+insert (+),
+delete (\-) or
+modify (!)
+.TP 3
+1
+for normal output,
+.TP 3
+2
+to fill in the histogram with dots,
+.TP 3
+4
+to print each value with the histogram.
+.RE
+.IP
+Any nonzero value gives a histogram.
+The dots and individual values can be combined,
+e.g., \fB\-f6\fP gives both.
+.TP
+.B \-h
+prints the usage message and exits.
+.TP
+.B \-k
+suppress the merging of filenames in the report.
+.TP
+.B \-l
+lists only the filenames.
+No histogram is generated.
+.TP
+.B \-m
+merge insert/delete counts from each "chunk" of the patch file to
+approximate a count of the modified lines.
+.TP
+.BI \-n " number"
+specify the minimum width used for filenames.
+If you do not specify this, \fBdiffstat\fP uses the length of the longest
+filename, after stripping common prefixes.
+.TP
+.BI \-N " number"
+specify the maximum width used for filenames.
+Names longer than this limit are truncated on the left.
+If you do not specify this, \fBdiffstat\fP next checks the \fB\-n\fP option.
+.TP
+.BI \-o " file"
+redirect standard output to \fIfile\fR.
+.TP
+.BI \-p " number"
+override the logic that strips common pathnames, simulating the \fBpatch\fP
+"\-p" option.
+.TP
+.B \-q
+suppress the "0 files changed" message for empty diffs.
+.TP
+.B \-r " code"
+provides optional rounding of the data shown in histogram,
+rather than truncating with error adjustments.
+.RS
+.TP 3
+0
+is the default.
+No rounding is performed,
+but accumulated errors are added to following columns.
+.TP 3
+1
+rounds the data
+.TP 3
+2
+rounds the data and adjusts the histogram to ensure that
+it displays something if there are any differences even if
+those would normally be rounded to zero.
+.RE
+.TP
+.B \-R
+Assume patch was created with old and new files swapped.
+.TP
+.BI \-s
+show only the summary line, e.g., number of insertions and deletions.
+.TP
+.BI \-S " source"
+this is like the \fB\-D\fP option, but specifies a location where
+the original files (before applying differences) can be found.
+.TP
+.B \-t
+overrides the histogram,
+generates output of comma separated values.
+.TP
+.B \-u
+suppress the sorting of filenames in the report.
+.TP
+.B \-v
+show progress,
+e.g., if the output is redirected to a file,
+write progress messages to the standard error.
+.TP
+.B \-V
+prints the current version number and exits.
+.TP
+.BI \-w " number"
+specify the maximum width of the histogram.
+The histogram will never be shorter than 10 columns,
+just in case the filenames get too large.
+.SH ENVIRONMENT
+.PP
+\fBDiffstat\fP runs in a portable UNIX\*R environment.
+.PP
+You can override the compiled-in paths of programs used for decompressing
+input files by setting environment variables corresponding to their name:
+.sp
+.RS
+.nf
+DIFFSTAT_BZCAT_PATH
+DIFFSTAT_BZIP2_PATH
+DIFFSTAT_COMPRESS_PATH
+DIFFSTAT_GZIP_PATH
+DIFFSTAT_LZCAT_PATH
+DIFFSTAT_PCAT_PATH
+DIFFSTAT_UNCOMPRESS_PATH
+DIFFSTAT_XZ_PATH
+DIFFSTAT_ZCAT_PATH
+.fi
+.RE
+.PP
+However, \fBdiffstat\fP assumes that the resulting program uses the
+same command-line options, e.g., "\-c" to decompress to the standard output.
+.SH FILES
+.PP
+\fBDiffstat\fP is a single binary module, which uses no auxiliary files.
+.SH BUGS
+.PP
+\fBDiffstat\fP makes a lot of assumptions about the format of a \fBdiff\fP file.
+.PP
+There is no way to obtain a filename from the standard diff between
+two files with no options.
+Context diffs work,
+as well as unified diffs.
+.PP
+There's no easy way to determine the degree of overlap between the
+"before" and "after" displays of modified lines.
+\fBdiffstat\fP simply counts the number of inserted and deleted lines
+to approximate modified lines for the \fB\-m\fP option.
+.SH SEE ALSO
+.PP
+.BR diff (1).
+.SH AUTHOR
+.PP
+Thomas Dickey <dickey@invisible-island.net>.
--- a/diffstat/diffstat.c
+++ b/diffstat/diffstat.c
--- a/diffstat/install-sh
+++ b/diffstat/install-sh
@ -0,0 +1,294 @@
+#! /bin/sh
+#
+# install - install a program, script, or datafile
+#
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd=$cpprog
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd=$stripprog
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "$0: no input file specified" >&2
+	exit 1
+else
+	:
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+
+	if [ -d "$dst" ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=$mkdirprog
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f "$src" ] || [ -d "$src" ]
+	then
+		:
+	else
+		echo "$0: $src does not exist" >&2
+		exit 1
+	fi
+
+	if [ x"$dst" = x ]
+	then
+		echo "$0: no destination specified" >&2
+		exit 1
+	else
+		:
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d "$dst" ]
+	then
+		dst=$dst/`basename "$src"`
+	else
+		:
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+	'
+IFS="${IFS-$defaultIFS}"
+
+oIFS=$IFS
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS=$oIFS
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp=$pathcomp$1
+	shift
+
+	if [ ! -d "$pathcomp" ] ;
+        then
+		$mkdirprog "$pathcomp"
+	else
+		:
+	fi
+
+	pathcomp=$pathcomp/
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd "$dst" &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		dstfile=`basename "$dst" $transformbasename |
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ]
+	then
+		dstfile=`basename "$dst"`
+	else
+		:
+	fi
+
+# Make a couple of temp file names in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+	rmtmp=$dstdir/#rm.$$#
+
+# Trap to clean up temp files at exit.
+
+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+	trap '(exit $?); exit' 1 2 13 15
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd "$src" "$dsttmp" &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+
+# Now remove or move aside any old file at destination location.  We try this
+# two ways since rm can't unlink itself on some systems and the destination
+# file might be busy for other reasons.  In this case, the final cleanup
+# might fail but the new file should still install successfully.
+
+{
+	if [ -f "$dstdir/$dstfile" ]
+	then
+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+		{
+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		  (exit 1); exit
+		}
+	else
+		:
+	fi
+} &&
+
+# Now rename the file to the real destination.
+
+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+
+fi &&
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+
+{
+	(exit 0); exit
+}
--- a/diffstat/makefile.in
+++ b/diffstat/makefile.in
@ -0,0 +1,144 @@
+# $Id: makefile.in,v 1.29 2010/07/15 22:45:54 tom Exp $
+# Makefile-template for 'diffstat'
+
+THIS		= diffstat
+
+#### Start of system configuration section. ####
+
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+DESTDIR		= @DESTDIR@
+prefix		= @prefix@
+exec_prefix	= @exec_prefix@
+
+bindir		= @bindir@
+mandir		= @mandir@
+
+CC		= @CC@
+LINK		= $(CC)
+INSTALL		= @INSTALL@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_DATA	= @INSTALL_DATA@
+
+LINT		= @LINT@
+CTAGS		= @CTAGS@
+ETAGS		= @ETAGS@
+
+CFLAGS		= @CFLAGS@ @EXTRA_CFLAGS@
+CPPFLAGS	= -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
+
+LIBS		= @LIBS@
+LDFLAGS		= @LDFLAGS@
+
+o		= .@OBJEXT@
+x		= @EXEEXT@
+
+BINDIR		= $(DESTDIR)$(bindir)
+MANDIR		= $(DESTDIR)$(mandir)
+
+#### End of system configuration section. ####
+
+SHELL		= /bin/sh
+
+man1dir		= $(MANDIR)/man1
+manext		= 1
+
+PROG		= $(THIS)$x
+
+SRC =		CHANGES \
+		README $(THIS).c $(THIS).1 \
+		config_h.in install-sh \
+		makefile.in configure.in aclocal.m4 \
+		makefile.wnt
+
+PORTFILES =	porting/getopt.c \
+		porting/getopt.h \
+		porting/system.h \
+		porting/wildcard.c
+
+TESTFILES =	testing/README \
+		testing/run_test.sh \
+		testing/case0[1-5]*
+
+DISTFILES =	configure config.guess config.sub $(SRC)
+
+.SUFFIXES: .c $o
+
+.c$o:
+	@RULE_CC@
+	@ECHO_CC@$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+
+all :	$(PROG)
+
+$(PROG) : diffstat$o
+	@ECHO_LD@$(LINK) $(LDFLAGS) -o $@ diffstat$o $(LIBS)
+
+install : all installdirs
+	$(INSTALL_PROGRAM) $(PROG) $(BINDIR)/$(PROG)
+	$(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext)
+
+installdirs :
+	mkdir -p $(BINDIR) $(libdir) $(man1dir)
+
+uninstall :
+	rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext)
+
+mostlyclean :
+	rm -f *.o core *~ *.out *.err *.BAK *.atac
+
+clean : mostlyclean
+	rm -f $(PROG)
+
+distclean : clean
+	rm -f makefile config.log config.cache config.status config.h
+	rm -f tags TAGS # don't remove configure!
+
+realclean : distclean
+
+check :	$(PROG)
+	$(SHELL) -c 'PATH=`pwd`:$${PATH}; export PATH; \
+	    $(SHELL) $(srcdir)/testing/run_test.sh $(srcdir)/testing/case*.pat'
+
+lint :
+	$(LINT) $(CPPFLAGS) $(LINTOPTS) $(THIS).c
+
+tags :
+	$(CTAGS) $(THIS).c $(HDRS)
+
+@MAKE_UPPER_TAGS@TAGS :
+@MAKE_UPPER_TAGS@	$(ETAGS) $(THIS).c $(HDRS)
+
+dist:	makefile $(DISTFILES)
+	# make a list of the files to distribute
+	echo $(THIS)-`sed \
+		-e '/"$$[A-Za-z]*: $(THIS)\.c.*$$"/!d' \
+		-e 's/^.*$(THIS)[^ ]*[ ]*//' \
+		-e 's/[ ].*$$//' \
+		-e q $(srcdir)/$(THIS).c` > .fname
+	rm -rf `cat .fname`
+	# contents of top directory
+	mkdir `cat .fname`
+	for file in $(DISTFILES); do \
+	  ln $(srcdir)/$$file `cat .fname` \
+	    || { echo copying $$file instead; cp -p $$file `cat .fname`; }; \
+	done
+	# contents of top/porting directory
+	mkdir `cat .fname`/porting
+	for file in $(PORTFILES); do \
+	  ln $(srcdir)/$$file `cat .fname`/porting \
+	    || { echo copying $$file instead; cp -p $$file `cat .fname`/porting; }; \
+	done
+	# contents of top/testing directory
+	mkdir `cat .fname`/testing
+	for file in $(TESTFILES); do \
+	  ln $(srcdir)/$$file `cat .fname`/testing \
+	    || { echo copying $$file instead; cp -p $$file `cat .fname`/testing; }; \
+	done
+	# tar and cleanup
+	tar -cf - `cat .fname` | gzip >`cat .fname`.tgz
+	rm -rf `cat .fname` .fname
+
+$(THIS).o :	config.h
+
+$(SRC) :
--- a/diffstat/makefile.wnt
+++ b/diffstat/makefile.wnt
@ -0,0 +1,35 @@
+#
+# makefile for 'diffstat' on WIN32 using Microsoft Visual C++
+#
+# $Id: makefile.wnt,v 1.2 2009/09/01 00:33:28 tom Exp $
+#
+!include <ntwin32.mak>
+
+P = porting
+
+CFLAGS = $(cvars) $(cdebug) -nologo -G4 -W3 -I. -DWIN32 -I$P
+LDFLAGS = -nologo -pdb:none
+
+NAME =	diffstat
+OBJ = 	$(NAME).obj \
+	$P/getopt.obj \
+	$P/wildcard.obj
+
+.c.obj:	
+	$(cc) $(CFLAGS) -c $< -Fo$@ 
+
+all:  $(NAME).exe
+
+$(NAME).exe: 	$(OBJ)
+	$(link) $(LDFLAGS) $(OBJ) setargv.obj $(ldebug) $(conlflags) $(conlibs) -out:$@ user32.lib
+
+$(OBJ) : #system.h
+
+install:  $(NAME).exe
+	copy $(NAME).exe c:\com
+
+clean:
+	- del $(NAME).exe
+	- del /f/s/q *.obj
+	- del /f/s/q *.bak
+	- del /f/s/q *.pdb
--- a/diffstat/package/debian/changelog
+++ b/diffstat/package/debian/changelog
@ -0,0 +1,25 @@
+diffstat (1.55) unstable; urgency=low
+
+  * Add -R option.
+  * Documentation fixes.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 03 Jan 2012 04:39:50 -0500
+
+diffstat (1.54) unstable; urgency=low
+
+  * Fix counts for -S/-D options.
+  * change source format to native.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Oct 2010 14:13:13 -0400
+
+diffstat (1.53) unstable; urgency=low
+
+  * Fix regression in "-c" option.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jul 2010 19:39:36 -0400
+
+diffstat (1.52) unstable; urgency=low
+
+  * Add package scripts to upstream source, for test-builds.
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Thu, 15 Jul 2010 19:39:36 -0400
--- a/diffstat/package/debian/compat
+++ b/diffstat/package/debian/compat
@ -0,0 +1 @@
+5
--- a/diffstat/package/debian/control
+++ b/diffstat/package/debian/control
@ -0,0 +1,15 @@
+Source: diffstat
+Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
+Section: devel
+Priority: extra
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5)
+Homepage: http://invisible-island.net/diffstat/
+
+Package: diffstat
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: generate C function prototypes and convert function definitions
+ Diffstat is is useful for reviewing large, complex patch files.  It reads from
+ one or more input files which contain output from diff, producing a histogram
+ of the total lines changed for each file referenced.
--- a/diffstat/package/debian/copyright
+++ b/diffstat/package/debian/copyright
@ -0,0 +1,109 @@
+Upstream source http://invisible-island.net/diffstat/diffstat.html
+
+/******************************************************************************
+ * Copyright 1994-2009,2010 by Thomas E. Dickey                               *
+ * All Rights Reserved.                                                       *
+ *                                                                            *
+ * Permission to use, copy, modify, and distribute this software and its      *
+ * documentation for any purpose and without fee is hereby granted, provided  *
+ * that the above copyright notice appear in all copies and that both that    *
+ * copyright notice and this permission notice appear in supporting           *
+ * documentation, and that the name of the above listed copyright holder(s)   *
+ * not be used in advertising or publicity pertaining to distribution of the  *
+ * software without specific, written prior permission.                       *
+ *                                                                            *
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD   *
+ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND  *
+ * FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE  *
+ * FOR ANY SPECIAL, 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.                *
+ ******************************************************************************/
+
+-------------------------------------------------------------------------------
+
+Files: aclocal.m4
+Licence: other-BSD
+Copyright:  2003-2009,2010 by Thomas E. Dickey
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, distribute with modifications, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+    
+    The above copyright notice and this permission notice shall be included
+    in all copies or portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+    THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    
+    Except as contained in this notice, the name(s) of the above copyright
+    holders shall not be used in advertising or otherwise to promote the
+    sale, use or other dealings in this Software without prior written
+    authorization.
+
+Files: install-sh
+Copyright:  1994 X Consortium
+Licence: other-BSD
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+    TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the X Consortium shall not
+    be used in advertising or otherwise to promote the sale, use or other deal-
+    ings in this Software without prior written authorization from the X Consor-
+    tium.
+
+    FSF changes to this file are in the public domain.
+
+    Calling this script install-sh is preferred over install.sh, to prevent
+    `make' implicit rules from creating a file called install from it
+    when there is no Makefile.
+
+    This script is compatible with the BSD install script, but was written
+    from scratch.  It can only install one file at a time, a restriction
+    shared with many OS's install programs.
+
+Files: debian/*
+Copyright:  2010 Thomas E. Dickey
+Licence: other-BSD
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and that
+    both that copyright notice and this permission notice appear in
+    supporting documentation, and that the name of the above listed
+    copyright holder(s) not be used in advertising or publicity pertaining
+    to distribution of the software without specific, written prior
+    permission.
+
+    THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+    LIABLE FOR ANY SPECIAL, 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.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in '/usr/share/common-licenses/GPL-2'
--- a/diffstat/package/debian/docs
+++ b/diffstat/package/debian/docs
@ -0,0 +1 @@
+README
--- a/diffstat/package/debian/rules
+++ b/diffstat/package/debian/rules
@ -0,0 +1,92 @@
+#!/usr/bin/make -f
+# MAde with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Cristoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS =
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	CFLAGS="$(CFLAGS)" ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--sysconfdir=/etc
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	[ ! -f Makefile ] || $(MAKE) clean
+
+	rm -f configure-stamp build-stamp install-stamp \
+		config.cache config.h config.status config.log makefile
+
+	rm -f *.o diffstat
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/diffstat
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# No binary-indep target.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installchangelogs CHANGES
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install install-stamp
--- a/diffstat/package/debian/source/format
+++ b/diffstat/package/debian/source/format
@ -0,0 +1 @@
+3.0 (native)
--- a/diffstat/package/debian/watch
+++ b/diffstat/package/debian/watch
@ -0,0 +1,4 @@
+version=3
+
+opts=passive ftp://invisible-island.net/cproto/cproto-(\d+)\.tgz \
+ debian  uupdate
--- a/diffstat/package/diffstat.spec
+++ b/diffstat/package/diffstat.spec
@ -0,0 +1,54 @@
+Summary:  diffstat - make histogram from diff-output
+%define AppProgram diffstat
+%define AppVersion 1.55
+# $XTermId: diffstat.spec,v 1.3 2010/10/10 18:09:56 tom Exp $
+Name: %{AppProgram}
+Version: %{AppVersion}
+Release: 1
+License: MIT
+Group: Applications/Development
+URL: ftp://invisible-island.net/%{AppProgram}
+Source0: %{AppProgram}-%{AppVersion}.tgz
+Packager: Thomas Dickey <dickey@invisible-island.net>
+
+%description
+Diffstat is is useful for reviewing large, complex patch files.  It reads from
+one or more input files which contain output from diff, producing a histogram
+of the total lines changed for each file referenced.
+
+%prep
+
+%setup -q -n %{AppProgram}-%{AppVersion}
+
+%build
+
+INSTALL_PROGRAM='${INSTALL}' \
+	./configure \
+		--target %{_target_platform} \
+		--prefix=%{_prefix} \
+		--bindir=%{_bindir} \
+		--libdir=%{_libdir} \
+		--mandir=%{_mandir}
+
+make
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+make install                    DESTDIR=$RPM_BUILD_ROOT
+
+strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_prefix}/bin/%{AppProgram}
+%{_mandir}/man1/%{AppProgram}.*
+
+%changelog
+# each patch should add its ChangeLog entries here
+
+* Thu Jul 15 2010 Thomas Dickey
+- initial version
--- a/diffstat/porting/getopt.c
+++ b/diffstat/porting/getopt.c
@ -0,0 +1,79 @@
+/* ::[[ @(#) getopt.c 1.5 89/03/11 05:40:23 ]]:: */
+#ifndef LINT
+static const char Id[] = "$Id: getopt.c,v 1.2 2009/09/01 00:41:59 tom Exp $";
+#endif
+
+/*
+ * Here's something you've all been waiting for:  the AT&T public domain
+ * source for getopt(3).  It is the code which was given out at the 1985
+ * UNIFORUM conference in Dallas.  I obtained it by electronic mail
+ * directly from AT&T.  The people there assure me that it is indeed
+ * in the public domain.
+ *
+ * There is no manual page.  That is because the one they gave out at
+ * UNIFORUM was slightly different from the current System V Release 2
+ * manual page.  The difference apparently involved a note about the
+ * famous rules 5 and 6, recommending using white space between an option
+ * and its first argument, and not grouping options that have arguments.
+ * Getopt itself is currently lenient about both of these things White
+ * space is allowed, but not mandatory, and the last option in a group can
+ * have an argument.  That particular version of the man page evidently
+ * has no official existence, and my source at AT&T did not send a copy.
+ * The current SVR2 man page reflects the actual behavor of this getopt.
+ * However, I am not about to post a copy of anything licensed by AT&T.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#define ERR(szz,czz) if(opterr){fprintf(stderr,"%s%s%c\n",argv[0],szz,czz);}
+
+int opterr = 1;
+int optind = 1;
+int optopt;
+char *optarg;
+
+int
+getopt(int argc, char *const *argv, const char *opts)
+{
+    static int sp = 1;
+    register int c;
+    register char *cp;
+
+    if (sp == 1) {
+	if (optind >= argc ||
+	    argv[optind][0] != '-' || argv[optind][1] == '\0')
+	    return (EOF);
+	else if (strcmp(argv[optind], "--") == 0) {
+	    optind++;
+	    return (EOF);
+	}
+    }
+    optopt = c = argv[optind][sp];
+    if (c == ':' || (cp = strchr(opts, c)) == NULL) {
+	ERR(": illegal option -- ", c);
+	if (argv[optind][++sp] == '\0') {
+	    optind++;
+	    sp = 1;
+	}
+	return ('?');
+    }
+    if (*++cp == ':') {
+	if (argv[optind][sp + 1] != '\0')
+	    optarg = &argv[optind++][sp + 1];
+	else if (++optind >= argc) {
+	    ERR(": option requires an argument -- ", c);
+	    sp = 1;
+	    return ('?');
+	} else
+	    optarg = argv[optind++];
+	sp = 1;
+    } else {
+	if (argv[optind][++sp] == '\0') {
+	    sp = 1;
+	    optind++;
+	}
+	optarg = NULL;
+    }
+    return (c);
+}
--- a/diffstat/porting/getopt.h
+++ b/diffstat/porting/getopt.h
@ -0,0 +1,4 @@
+extern char *optarg;
+extern int optind, opterr;
+
+int getopt (int argc, char *const*argv, const char *options);
--- a/diffstat/porting/system.h
+++ b/diffstat/porting/system.h
@ -0,0 +1,85 @@
+/* $Id: system.h,v 1.1 2002/11/22 22:36:56 tom Exp $ */
+
+#ifdef HAVE_CONFIG_H
+
+# include "config.h"
+# define SYS_UNIX 1
+
+#else
+	/* provide values for non-UNIX systems */
+# if defined(vms)
+#  include <stsdef.h>
+#  define SYS_VMS 1
+#  define EXIT_SUCCESS (STS$M_INHIB_MSG | STS$K_SUCCESS)
+#  define EXIT_FAILURE (STS$M_INHIB_MSG | STS$K_ERROR)
+# endif
+
+# if defined(MSDOS) || defined(__MSDOS__)
+#  define SYS_MSDOS 1
+# endif
+
+# if !defined(SYS_VMS) || !defined(SYS_MSDOS) || defined(WIN32)
+#  define SYS_UNIX 1		/* assume we're autoconfiguring */
+# endif
+
+#define HAVE_STRCHR 1
+
+#endif /* HAVE_CONFIG_H */
+
+#ifndef HAVE_GETOPT_H
+#define HAVE_GETOPT_H 0
+#endif
+
+#ifndef HAVE_MALLOC_H
+#define HAVE_MALLOC_H 0
+#endif
+
+#ifndef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+#endif
+
+#ifndef HAVE_STRING_H
+#define HAVE_STRING_H 1
+#endif
+
+#ifndef SYS_MSDOS
+#define SYS_MSDOS 0
+#endif
+
+#ifndef SYS_UNIX
+#define SYS_UNIX 0
+#endif
+
+#ifndef SYS_VMS
+#define SYS_VMS 0
+#endif
+
+#ifndef HAVE_GETOPT_HEADER
+#define HAVE_GETOPT_HEADER 0
+#endif
+
+#ifndef PRINT_ROUNDS_DOWN
+#define PRINT_ROUNDS_DOWN 0
+#endif
+
+#ifdef lint
+#define typeCalloc(type,elts) (type *)(elts)
+#else
+#define typeCalloc(type,elts) (type *)calloc(elts,sizeof(type))
+#endif
+
+#ifndef TRUE
+#define TRUE  (1)
+#define FALSE (0)
+#endif
+
+#undef EOS
+#define EOS	'\0'
+
+	/* On VMS and MSDOS we can fake wildcards by embedding a directory
+	 * scanning loop...
+	 */
+#if !SYS_UNIX
+extern int has_wildcard(char *);
+extern int expand_wildcard(char *, int);
+#endif
--- a/diffstat/porting/wildcard.c
+++ b/diffstat/porting/wildcard.c
@ -0,0 +1,109 @@
+#ifndef NO_IDENT
+static char *Id = "$Id: wildcard.c,v 1.1 2004/05/03 13:12:10 tom Exp $";
+#endif
+
+/*
+ * wildcard.c - perform wildcard expansion for non-UNIX configurations
+ */
+
+#include "system.h"
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+
+#if SYS_MSDOS || SYS_OS2
+# if SYS_MSDOS
+#  include <dos.h>
+#  include <dir.h>		/* defines MAXPATH */
+#  define FILENAME_MAX MAXPATH
+# endif
+# define DeclareFind(p)		struct find_t p
+# define DirEntryStr(p)		p.name
+# define DirFindFirst(path,p)	(!_dos_findfirst(path, 0, &p))
+# define DirFindNext(p)		(!_dos_findnext(&p))
+#endif
+
+#if SYS_VMS
+
+#include <starlet.h>		/* DEC-C (e.g., sys$parse) */
+#include <stdio.h>		/* perror */
+
+#include <rms.h>
+#include <descrip.h>
+
+#endif /* SYS_VMS */
+
+int
+has_wildcard(char *path)
+{
+#if SYS_VMS
+    return (strstr(path, "...") != 0
+	    || strchr(path, '*') != 0
+	    || strchr(path, '?') != 0);
+#else /* SYS_MSDOS, SYS_OS2 */
+    return (strchr(path, '*') != 0
+	    || strchr(path, '?') != 0);
+#endif
+}
+
+int
+expand_wildcard(char *path, int initiate)
+{
+#if SYS_MSDOS || SYS_OS2
+    static DeclareFind(p);
+    static char temp[FILENAME_MAX + 1];
+    register char *leaf;
+
+    if ((leaf = strchr(path, '/')) == 0
+	&& (leaf = strchr(path, '\\')) == 0)
+	leaf = path;
+    else
+	leaf++;
+
+    if ((initiate && DirFindFirst(strcpy(temp, path), p))
+	|| DirFindNext(p)) {
+	(void) strcpy(leaf, DirEntryStr(p));
+	return TRUE;
+    }
+#endif /* SYS_MSDOS || SYS_OS2 */
+#if SYS_VMS
+    static struct FAB zfab;
+    static struct NAM znam;
+    static char my_esa[NAM$C_MAXRSS];	/* expanded: SYS$PARSE */
+    static char my_rsa[NAM$C_MAXRSS];	/* expanded: SYS$SEARCH */
+
+    if (initiate) {
+	zfab = cc$rms_fab;
+	zfab.fab$l_fop = FAB$M_NAM;
+	zfab.fab$l_nam = &znam;	/* FAB => NAM block     */
+	zfab.fab$l_dna = "*.*;";	/* Default-selection    */
+	zfab.fab$b_dns = strlen(zfab.fab$l_dna);
+
+	zfab.fab$l_fna = path;
+	zfab.fab$b_fns = strlen(path);
+
+	znam = cc$rms_nam;
+	znam.nam$b_ess = sizeof(my_esa);
+	znam.nam$l_esa = my_esa;
+	znam.nam$b_rss = sizeof(my_rsa);
+	znam.nam$l_rsa = my_rsa;
+
+	if (sys$parse(&zfab) != RMS$_NORMAL) {
+	    perror(path);
+	    exit(EXIT_FAILURE);
+	}
+    }
+    if (sys$search(&zfab) == RMS$_NORMAL) {
+	strncpy(path, my_rsa, znam.nam$b_rsl)[znam.nam$b_rsl] = '\0';
+	return (TRUE);
+    }
+#endif /* SYS_VMS */
+#if SYS_MSDOS
+#endif
+    return FALSE;
+}
--- a/diffstat/testing/README
+++ b/diffstat/testing/README
@ -0,0 +1,5 @@
+-- $Id: README,v 1.1 2004/12/18 12:19:21 tom Exp $
+
+The files in this directory are used for regression-checks of diffstat.  The
+full test-suite is not distributed since some of the test-data is not freely
+distributable.
--- a/diffstat/testing/case01.pat
+++ b/diffstat/testing/case01.pat
@ -0,0 +1,417 @@
+--------------------------------------------------------------------------------
+--- /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/hp.cf	Sat Feb 10 13:55:35 1996
+++ /build/x11r6/XFree86-current/xc/config/cf/hp.cf	Mon Feb 19 19:10:15 1996
+@@ -59,9 +59,16 @@
+ #define Malloc0ReturnsNull     YES
+ 
+ #ifdef __hp9000s800
+#if HasGcc2
+#define OptimizedCDebugFlags   -O
+#define DefaultCCOptions
+#define SharedLibraryCCOptions	-fPIC
+#define PositionIndependentCFlags -fPIC
+#else
+ #define OptimizedCDebugFlags   +O1
+ #define DefaultCCOptions       -Ae +ESlit
+ #define SharedLibraryCCOptions -Ae
+#endif
+ #define StandardDefines        -Dhpux -DSYSV
+ #define ServerExtraDefines -DXOS -DBSTORE -DSOFTWARE_CURSOR -DNO_ALLOCA -DSCREEN_PIXMAPS -DMERGE_SAVE_UNDERS -DHAS_IFREQ -DFORCE_SEPARATE_PRIVATE
+ 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/hpLib.rules	Sat Jan  6 08:11:01 1996
+++ /build/x11r6/XFree86-current/xc/config/cf/hpLib.rules	Mon Feb 19 19:11:14 1996
+@@ -29,8 +29,10 @@
+ #define InstLibFlags -m 0555
+ #endif
+ #ifndef UseInstalled
+#ifndef HasGcc2
+ /* assert: LdPostLib pulls in -L$(USRLIBDIR), so it doesn't need to be here */
+ #define ExtraLoadFlags -Wl,+s,+b,$(USRLIBDIR)
+#endif
+ #endif
+ 
+ /*
+--- /build/x11r6/XFree86-3.1.2Cf/xc/config/imake/imakemdep.h	Sat Jan  6 08:11:01 1996
+++ /build/x11r6/XFree86-current/xc/config/imake/imakemdep.h	Mon Feb 19 19:15:01 1996
+@@ -41,6 +41,10 @@
+  *     These will be passed to the compile along with the contents of the
+  *     make variable BOOTSTRAPCFLAGS.
+  */
+#if defined(clipper) || defined(__clipper__)
+#define imake_ccflags "-O -DSYSV -DBOOTSTRAPCFLAGS=-DSYSV"
+#endif
+
+ #ifdef hpux
+ #ifdef hp9000s800
+ #define imake_ccflags "-DSYSV"
+@@ -224,6 +228,9 @@
+ #ifdef apollo
+ #define DEFAULT_CPP "/usr/lib/cpp"
+ #endif
+#if defined(clipper) || defined(__clipper__)
+#define DEFAULT_CPP "/usr/lib/cpp"
+#endif
+ #if defined(_IBMR2) && !defined(DEFAULT_CPP)
+ #define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
+ #endif
+@@ -529,6 +536,12 @@
+ struct symtab	predefs[] = {
+ #ifdef apollo
+ 	{"apollo", "1"},
+#endif
+#if defined(clipper) || defined(__clipper__)
+	{"clipper", "1"},
+	{"__clipper__", "1"},
+	{"clix", "1"},
+	{"__clix__", "1"},
+ #endif
+ #ifdef ibm032
+ 	{"ibm032", "1"},
+--- /build/x11r6/XFree86-3.1.2Cf/xc/config/makedepend/main.c	Fri Jan 26 11:43:22 1996
+++ /build/x11r6/XFree86-current/xc/config/makedepend/main.c	Mon Feb 19 19:16:06 1996
+@@ -570,7 +570,7 @@
+ 	return(file);
+ }
+ 
+-#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__)
+#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__) && !defined(clipper) && !defined(__clipper__)
+ int rename (from, to)
+     char *from, *to;
+ {
+--- /build/x11r6/XFree86-3.1.2Cf/xc/include/Xos.h	Fri Jan 26 11:43:22 1996
+++ /build/x11r6/XFree86-current/xc/include/Xos.h	Mon Feb 19 19:18:23 1996
+@@ -77,6 +77,7 @@
+ 
+ #ifndef X_NOT_STDC_ENV
+ 
+#if !(defined(sun) && !defined(SVR4))	/* 'index' is problem with K&R */
+ #include <string.h>
+ #ifndef index
+ #define index(s,c) (strchr((s),(c)))
+@@ -84,10 +85,14 @@
+ #ifndef rindex
+ #define rindex(s,c) (strrchr((s),(c)))
+ #endif
+#endif
+ 
+ #else
+ 
+ #ifdef SYSV
+#if defined(clipper) || defined(__clipper__)
+#include <malloc.h>
+#endif
+ #include <string.h>
+ #define index strchr
+ #define rindex strrchr
+@@ -149,7 +154,7 @@
+ #ifdef CRAY
+ #undef word
+ #endif /* CRAY */
+-#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__)
+#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__)
+ struct timeval {
+     long tv_sec;
+     long tv_usec;
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/import/mijpeg.c	Sun Apr 17 20:34:54 1994
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/import/mijpeg.c	Mon Feb 19 18:48:31 1996
+@@ -114,7 +114,7 @@
+ 
+ /*
+  *  routines referenced by other DDXIE modules
+-/*
+ */
+ int CreateIPhotoJpegBase();
+ int InitializeIPhotoJpegBase();
+ int InitializeICPhotoJpegBase();
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c	Sun Apr 17 20:35:19 1994
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c	Mon Feb 19 18:49:43 1996
+@@ -242,7 +242,7 @@
+     }
+ }
+ /*------------------------------------------------------------------------
+-/*------------------------------------------------------------------------
+--------------------------------------------------------------------------
+ ---------------------------- initialize peTex . . . ----------------------
+ ------------------------------------------------------------------------*/
+ static int InitializeGeomAA(flo,ped)
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c	Sat Jan  6 08:11:01 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c	Mon Feb 19 18:50:29 1996
+@@ -259,7 +259,7 @@
+ }
+ 
+ /*------------------------------------------------------------------------
+-/*------------------------------------------------------------------------
+--------------------------------------------------------------------------
+ ---------------------------- initialize peTex . . . ----------------------
+ ------------------------------------------------------------------------*/
+ static int InitializeGeomNN(flo,ped)
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c	Mon Jan 30 23:07:07 1995
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c	Mon Feb 19 18:51:11 1996
+@@ -431,7 +431,7 @@
+     return FALSE;
+ 
+   id = describe[0];
+-/* printf("fd is %d errno is %d id is %x\n", fd, errno, id);	/*  */
+/* printf("fd is %d errno is %d id is %x\n", fd, errno, id);	*/
+ 
+   num_axes = (describe[1] & HIL_NUM_AXES);
+   if (id == NINE_KNOB_ID && num_axes != 3) id = QUAD_ID;
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/hp/input/hpKeyMap.c	Mon Jan 30 23:06:55 1995
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/hp/input/hpKeyMap.c	Mon Feb 19 18:52:20 1996
+@@ -85,7 +85,7 @@
+  /* code values in comments at line end are actual value reported on HIL.
+     REMEMBER, there is an offset of MIN_KEYCODE+2 applied to this table!
+     The PS2 keyboard table begins at offset 0, the 46021A table begins with
+-    the third row. *./
+    the third row. */
+ 	/* Extend Char Right -- a.k.a. Kanji? */	
+ 	XK_Control_R,		NoSymbol,		NoSymbol,	NoSymbol,	/* 0x00 */
+ 	NoSymbol,		NoSymbol,		NoSymbol,	NoSymbol,	/* 0x01 */
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/accel/i128/i128scrin.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/accel/i128/i128scrin.c	Mon Feb 19 18:53:02 1996
+@@ -348,7 +348,7 @@
+   pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA;
+   pScreen->ResolveColor = cfbResolveColor;
+   pScreen->BitmapToRegion = mfbPixmapToRegion;
+-#if 0  /* What's this for?!  /* *TO*DO* */
+#if 0  /* What's this for?!  *TO*DO* */
+   pScreen->BlockHandler = i128BlockHandler;
+ #endif
+ 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c	Mon Feb 19 18:53:37 1996
+@@ -351,7 +351,7 @@
+   pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA;
+   pScreen->ResolveColor = cfbResolveColor;
+   pScreen->BitmapToRegion = mfbPixmapToRegion;
+-#if 0  /* What's this for?!  /* *TO*DO* */
+#if 0  /* What's this for?!  *TO*DO* */
+   pScreen->BlockHandler = p9000BlockHandler;
+ #endif
+ 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h	Mon Feb 19 18:54:57 1996
+@@ -8,7 +8,7 @@
+  * Hamish Coleman 11/93 hamish@zot.apana.org.au 
+  *
+  * derived from:
+- * bdm2/hgc1280/*
+ * bdm2/hgc1280/...
+  * Pascal Haible 8/93, haible@izfm.uni-stuttgart.de
+  *
+  * see mono/COPYRIGHT for copyright and disclaimers.
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c	Mon Feb 19 18:55:33 1996
+@@ -8,12 +8,12 @@
+  * Hamish Coleman 11/93 hamish@zot.apana.org.au
+  *
+  * derived from:
+- * bdm2/hgc1280/*
+ * bdm2/hgc1280/...
+  * Pascal Haible 8/93, haible@izfm.uni-stuttgart.de
+- * hga2/*
+ * hga2/...
+  * Author:  Davor Matic, dmatic@athena.mit.edu
+  * and
+- * vga256/*
+ * vga256/...
+  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+  *
+  * Thanks to Herb Peyerl (hpeyerl@novatel.ca) for the information on 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c	Mon Feb 19 18:55:54 1996
+@@ -6,10 +6,10 @@
+  * mono/driver/hgc1280/hgc1280driv.c
+  *
+  * derived from:
+- * hga2/*
+ * hga2/...
+  * Author:  Davor Matic, dmatic@athena.mit.edu
+  * and
+- * vga256/*
+ * vga256/...
+  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+  *
+  * see mono/COPYRIGHT for copyright and disclaimers.
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c	Mon Feb 19 18:56:15 1996
+@@ -7,10 +7,10 @@
+  * mono/driver/sigma/sigmadriv.c
+  *
+  * Parts derived from:
+- * hga2/*
+ * hga2/...
+  * Author:  Davor Matic, dmatic@athena.mit.edu
+  * and
+- * vga256/*
+ * vga256/...
+  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+  *
+  * see mono/COPYRIGHT for copyright and disclaimers.
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/mono/mono.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/mono/mono.c	Mon Feb 19 18:56:58 1996
+@@ -6,10 +6,10 @@
+  * mono/mono/mono.c
+  *
+  * derived from:
+- * hga2/*
+ * hga2/...
+  * Author:  Davor Matic, dmatic@athena.mit.edu
+  * and
+- * vga256/*
+ * vga256/...
+  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+  *
+  * see mono/COPYRIGHT for copyright and disclaimers.
+@@ -512,7 +512,7 @@
+     DDXPointRec pixPt;	/* Point: upper left corner */
+     PixmapPtr   pspix;	/* Pointer to the pixmap of the saved screen */
+     ScreenPtr   pScreen = savepScreen;	/* This is the 'old' Screen:
+-				/* real screen on leave, dummy on enter */
+				real screen on leave, dummy on enter */
+ 
+     /* Set up pointer to the saved pixmap (pspix) only if not resetting
+ 						and not exiting */
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/mono/mono.h	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/mono/mono.h	Mon Feb 19 18:57:19 1996
+@@ -6,10 +6,10 @@
+  * mono/mono/mono.h
+  *
+  * derived from:
+- * hga2/*
+ * hga2/...
+  * Author:  Davor Matic, dmatic@athena.mit.edu
+  * and
+- * vga256/*
+ * vga256/...
+  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+  *
+  * see mono/COPYRIGHT for copyright and disclaimers.
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c	Mon Feb 19 18:57:57 1996
+@@ -27,7 +27,7 @@
+ 
+ #include "OScompiler.h"
+ 
+-/* #include "ibmIOArch.h" /* GJA */
+/* #include "ibmIOArch.h" -- GJA */
+ 
+ #include "vgaVideo.h"
+ 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h	Fri Feb  9 13:08:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h	Mon Feb 19 18:58:43 1996
+@@ -679,7 +679,7 @@
+ #define GEN_TEST_CNT_VALUE		0x3f000000	/* Mach64CT/ET */
+ #define GEN_TEST_CC_EN			0x40000000	/* Mach64GX/CX */
+ #define GEN_TEST_CC_STROBE		0x80000000	/* Mach64GX/CX */
+-/*	?				0xc0000000	/* Mach64CT/ET */
+/*	?				0xc0000000 */	/* Mach64CT/ET */
+ #define CONFIG_CNTL		0x6aec
+ #define CFG_MEM_AP_SIZE			0x00000003
+ #define CFG_MEM_VGA_AP_EN		0x00000004
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c	Fri Feb  9 13:08:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c	Mon Feb 19 18:59:33 1996
+@@ -126,7 +126,7 @@
+     /* For the lower byte of the 32-bit color registers, there is no safe
+      * invalid value. We just set them to a specific value (making sure
+      * we don't write to non-existant color registers).
+-     * 
+     */ 
+     cirrusBackgroundColorShadow = 0xffffffff;	/* Defeat the macros. */
+     cirrusForegroundColorShadow = 0xffffffff;
+     if (cirrusChip >= CLGD5422 && cirrusChip <= CLGD5430) {
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c	Mon Feb 19 19:00:02 1996
+@@ -22,7 +22,7 @@
+  * PERFORMANCE OF THIS SOFTWARE.
+  *
+  * Author:  Simon P. Cooper, <scooper@vizlab.rutgers.edu>
+- *
+ */
+ /* $XConsortium: cir_cursor.c /main/8 1995/11/13 08:20:54 kaleb $ */
+ 
+ #define CIRRUS_DEBUG_CURSOR
+--- /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c	Mon Feb  5 12:03:00 1996
+++ /build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c	Mon Feb 19 19:00:52 1996
+@@ -1402,7 +1402,7 @@
+     case OTI37C:
+     default:
+ #ifndef MONOVGA
+-      /* new->std.CRTC[19] = vga256InfoRec.virtualX >> 3; /* 3 in byte mode */
+      /* new->std.CRTC[19] = vga256InfoRec.virtualX >> 3; -- 3 in byte mode */
+       /* much clearer as 0x01 than 0x41, seems odd though... */
+       new->std.Attribute[16] = 0x01; 
+       if ( new->std.NoClock >= 0 ) 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/test/xsuite/xtest/src/bin/mc/files.c	Sun Apr 17 21:00:20 1994
+++ /build/x11r6/XFree86-current/xc/test/xsuite/xtest/src/bin/mc/files.c	Mon Feb 19 19:02:49 1996
+@@ -95,7 +95,7 @@
+ char 	buf[BUFSIZ];
+ 
+ 	/*
+-	 * Look for a corresponding file with name lib/mc/*.mc .
+	 * Look for a corresponding file with name lib/mc/{*}.mc .
+ 	 */
+ 	(void) sprintf(buf, "mc/%s", file);
+ 	file = buf;
+--- /build/x11r6/XFree86-3.1.2Cf/xc/util/patch/malloc.c	Wed Aug 15 01:13:33 1990
+++ /build/x11r6/XFree86-current/xc/util/patch/malloc.c	Mon Feb 19 19:04:28 1996
+@@ -30,10 +30,8 @@
+  * go in the first int of the block, and the returned pointer will point
+  * to the second.
+  *
+-#ifdef MSTATS
+  * nmalloc[i] is the difference between the number of mallocs and frees
+  * for a given block size.
+-#endif /* MSTATS */
+  */
+ 
+ #define ISALLOC ((char) 0xf7)	/* magic byte that implies allocation */
+@@ -208,7 +206,7 @@
+ 		if (--nblks <= 0) break;
+ 		CHAIN ((struct mhead *) cp) = (struct mhead *) (cp + siz);
+ 		cp += siz;}
+-/*	CHAIN ((struct mhead *) cp) = 0;	/* since sbrk() returns cleared core, this is already set */
+/*	CHAIN ((struct mhead *) cp) = 0;	-- since sbrk() returns cleared core, this is already set */
+ 	}
+ 
+ static
+@@ -449,10 +447,10 @@
+ 	return (1 << (p -> mh_index + 3)) - sizeof *p;
+ /**/
+ /*	if (p -> mh_index >= 13)
+-/*	    return (1 << (p -> mh_index + 3)) - sizeof *p;
+-/*	else
+-/*	    return p -> mh_size;
+-/**/
+ *	    return (1 << (p -> mh_index + 3)) - sizeof *p;
+ *	else
+ *	    return p -> mh_size;
+ */
+ #endif /* rcheck */
+ 	}
+ 
+--- /build/x11r6/XFree86-3.1.2Cf/xc/util/patch/pch.c	Sat Jan  6 08:11:01 1996
+++ /build/x11r6/XFree86-current/xc/util/patch/pch.c	Mon Feb 19 19:05:12 1996
+@@ -1,5 +1,5 @@
+ /* oldHeader: pch.c,v 2.0.1.7 88/06/03 15:13:28 lwall Locked $
+-/* $XConsortium: pch.c,v 3.3 94/09/14 21:22:55 gildea Exp $
+ * $XConsortium: pch.c,v 3.3 94/09/14 21:22:55 gildea Exp $
+  *
+  * Revision 2.0.2.0  90/05/01  22:17:51  davison
+  * patch12u: unidiff support added
+--- /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/Imake.cf	Fri Jan 26 11:43:22 1996
+++ /build/x11r6/XFree86-current/xc/config/cf/Imake.cf	Mon Feb 19 19:13:58 1996
+@@ -19,6 +19,13 @@
+  *     4.  Create a .cf file with the name given by MacroFile.
+  */
+ 
+#if defined(clipper) || defined(__clipper__)
+# undef clipper
+# define MacroIncludeFile <ingr.cf>
+# define MacroFile ingr.cf
+# define IngrArchitecture
+#endif /* clipper */
+
+ #ifdef ultrix
+ # define MacroIncludeFile <ultrix.cf>
+ # define MacroFile ultrix.cf
--- a/diffstat/testing/case01.ref
+++ b/diffstat/testing/case01.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 +++++
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 +
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 -
+ include/Xos.h                                                   |    7 ++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ util/patch/malloc.c                                             |   12 +++------
+ util/patch/pch.c                                                |    2 -
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01R.ref
+++ b/diffstat/testing/case01R.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 -----
+ config/cf/hp.cf                                                 |    7 -----
+ config/cf/hpLib.rules                                           |    2 -
+ config/imake/imakemdep.h                                        |   13 ----------
+ config/makedepend/main.c                                        |    2 -
+ include/Xos.h                                                   |    7 -----
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ util/patch/malloc.c                                             |   12 +++++----
+ util/patch/pch.c                                                |    2 -
+ 27 files changed, 36 insertions(+), 68 deletions(-)
--- a/diffstat/testing/case01Rp0.ref
+++ b/diffstat/testing/case01Rp0.ref
@ -0,0 +1,28 @@
+ /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/Imake.cf                                              |    7 -----
+ /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/hp.cf                                                 |    7 -----
+ /build/x11r6/XFree86-3.1.2Cf/xc/config/cf/hpLib.rules                                           |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/config/imake/imakemdep.h                                        |   13 ----------
+ /build/x11r6/XFree86-3.1.2Cf/xc/config/makedepend/main.c                                        |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/include/Xos.h                                                   |    7 -----
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ /build/x11r6/XFree86-3.1.2Cf/xc/util/patch/malloc.c                                             |   12 +++++----
+ /build/x11r6/XFree86-3.1.2Cf/xc/util/patch/pch.c                                                |    2 -
+ 27 files changed, 36 insertions(+), 68 deletions(-)
--- a/diffstat/testing/case01b.ref
+++ b/diffstat/testing/case01b.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 +++++
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 +
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 -
+ include/Xos.h                                                   |    7 ++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ util/patch/malloc.c                                             |   12 +++------
+ util/patch/pch.c                                                |    2 -
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01f0.ref
+++ b/diffstat/testing/case01f0.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 	7 +	0 -	0 !
+ config/cf/hp.cf                                                 |    7 	7 +	0 -	0 !
+ config/cf/hpLib.rules                                           |    2 	2 +	0 -	0 !
+ config/imake/imakemdep.h                                        |   13 	13 +	0 -	0 !
+ config/makedepend/main.c                                        |    2 	1 +	1 -	0 !
+ include/Xos.h                                                   |    7 	6 +	1 -	0 !
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 	1 +	1 -	0 !
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 	1 +	1 -	0 !
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 	3 +	3 -	0 !
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 	2 +	2 -	0 !
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 	2 +	2 -	0 !
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 	3 +	3 -	0 !
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 	2 +	2 -	0 !
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 	1 +	1 -	0 !
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 	1 +	1 -	0 !
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 	1 +	1 -	0 !
+ util/patch/malloc.c                                             |   12 	5 +	7 -	0 !
+ util/patch/pch.c                                                |    2 	1 +	1 -	0 !
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01k.ref
+++ b/diffstat/testing/case01k.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 +++++
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 +
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 -
+ include/Xos.h                                                   |    7 ++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ util/patch/malloc.c                                             |   12 +++------
+ util/patch/pch.c                                                |    2 -
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01p1.ref
+++ b/diffstat/testing/case01p1.ref
@ -0,0 +1,28 @@
+ build/x11r6/XFree86-current/xc/config/cf/Imake.cf                                              |    7 +++++
+ build/x11r6/XFree86-current/xc/config/cf/hp.cf                                                 |    7 +++++
+ build/x11r6/XFree86-current/xc/config/cf/hpLib.rules                                           |    2 +
+ build/x11r6/XFree86-current/xc/config/imake/imakemdep.h                                        |   13 ++++++++++
+ build/x11r6/XFree86-current/xc/config/makedepend/main.c                                        |    2 -
+ build/x11r6/XFree86-current/xc/include/Xos.h                                                   |    7 ++++-
+ build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ build/x11r6/XFree86-current/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ build/x11r6/XFree86-current/xc/test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ build/x11r6/XFree86-current/xc/util/patch/malloc.c                                             |   12 +++------
+ build/x11r6/XFree86-current/xc/util/patch/pch.c                                                |    2 -
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01p9.ref
+++ b/diffstat/testing/case01p9.ref
@ -0,0 +1,28 @@
+ Imake.cf                            |    7 +++++++
+ Xos.h                               |    7 ++++++-
+ accel/i128/i128scrin.c              |    2 +-
+ accel/p9000/p9000scrin.c            |    2 +-
+ bin/mc/files.c                      |    2 +-
+ hp.cf                               |    7 +++++++
+ hpLib.rules                         |    2 ++
+ imakemdep.h                         |   13 +++++++++++++
+ import/mijpeg.c                     |    2 +-
+ input/drivers/hil_driver.c          |    2 +-
+ input/hpKeyMap.c                    |    2 +-
+ main.c                              |    2 +-
+ malloc.c                            |   12 +++++-------
+ mono/drivers/apollo/apolloHW.h      |    2 +-
+ mono/drivers/apollo/apollodriv.c    |    6 +++---
+ mono/drivers/hgc1280/hgc1280driv.c  |    4 ++--
+ mono/drivers/sigma/sigmadriv.c      |    4 ++--
+ mono/mono/mono.c                    |    6 +++---
+ mono/mono/mono.h                    |    4 ++--
+ pch.c                               |    2 +-
+ process/mpgeomaa.c                  |    2 +-
+ process/mpgeomnn.c                  |    2 +-
+ vga16/ibm/vgaImages.c               |    2 +-
+ vga256/drivers/ati/regati.h         |    2 +-
+ vga256/drivers/cirrus/cir_blitter.c |    2 +-
+ vga256/drivers/cirrus/cir_cursor.c  |    2 +-
+ vga256/drivers/oak/oak_driver.c     |    2 +-
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01r1.ref
+++ b/diffstat/testing/case01r1.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 +++++
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 ++
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 +-
+ include/Xos.h                                                   |    7 +++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 +-
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 +-
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 +-
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 +-
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 +-
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 +-
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 +-
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 +-
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 ++--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 +-
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 +-
+ util/patch/malloc.c                                             |   12 ++++-----
+ util/patch/pch.c                                                |    2 +-
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01r2.ref
+++ b/diffstat/testing/case01r2.ref
@ -0,0 +1,28 @@
+ config/cf/Imake.cf                                              |    7 +++++
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 ++
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 +-
+ include/Xos.h                                                   |    7 ++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 +-
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 +-
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 +-
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 +-
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 +-
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 +-
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 +-
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 +-
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +-
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +-
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +-
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 +-
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 +-
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 +-
+ util/patch/malloc.c                                             |   12 ++++-----
+ util/patch/pch.c                                                |    2 +-
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case01u.ref
+++ b/diffstat/testing/case01u.ref
@ -0,0 +1,28 @@
+ config/cf/hp.cf                                                 |    7 +++++
+ config/cf/hpLib.rules                                           |    2 +
+ config/imake/imakemdep.h                                        |   13 ++++++++++
+ config/makedepend/main.c                                        |    2 -
+ include/Xos.h                                                   |    7 ++++-
+ programs/Xserver/XIE/mixie/import/mijpeg.c                      |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomaa.c                   |    2 -
+ programs/Xserver/XIE/mixie/process/mpgeomnn.c                   |    2 -
+ programs/Xserver/hw/hp/input/drivers/hil_driver.c               |    2 -
+ programs/Xserver/hw/hp/input/hpKeyMap.c                         |    2 -
+ programs/Xserver/hw/xfree86/accel/i128/i128scrin.c              |    2 -
+ programs/Xserver/hw/xfree86/accel/p9000/p9000scrin.c            |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apolloHW.h      |    2 -
+ programs/Xserver/hw/xfree86/mono/drivers/apollo/apollodriv.c    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/drivers/hgc1280/hgc1280driv.c  |    4 +--
+ programs/Xserver/hw/xfree86/mono/drivers/sigma/sigmadriv.c      |    4 +--
+ programs/Xserver/hw/xfree86/mono/mono/mono.c                    |    6 ++--
+ programs/Xserver/hw/xfree86/mono/mono/mono.h                    |    4 +--
+ programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c               |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/ati/regati.h         |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_cursor.c  |    2 -
+ programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c     |    2 -
+ test/xsuite/xtest/src/bin/mc/files.c                            |    2 -
+ util/patch/malloc.c                                             |   12 +++------
+ util/patch/pch.c                                                |    2 -
+ config/cf/Imake.cf                                              |    7 +++++
+ 27 files changed, 68 insertions(+), 36 deletions(-)
--- a/diffstat/testing/case02.pat
+++ b/diffstat/testing/case02.pat
@ -0,0 +1,486 @@
+
+Prereq: public-patch-25
+
+*** /tmp/da20646	Wed Nov  3 20:04:26 1993
+--- mit/bug-report	Wed Nov  3 20:04:25 1993
+***************
+*** 2,8 ****
+  Subject: [area]: [synopsis]   [replace with actual area and short description]
+  
+  VERSION:
+!     R5, public-patch-25
+      [MIT public patches will edit this line to indicate the patch level]
+  
+  CLIENT MACHINE and OPERATING SYSTEM:
+--- 2,8 ----
+  Subject: [area]: [synopsis]   [replace with actual area and short description]
+  
+  VERSION:
+!     R5, public-patch-26
+      [MIT public patches will edit this line to indicate the patch level]
+  
+  CLIENT MACHINE and OPERATING SYSTEM:
+*** /tmp/da21897	Thu Nov  4 08:57:24 1993
+--- mit/clients/xterm/misc.c	Thu Nov  4 08:57:23 1993
+***************
+*** 1,5 ****
+  /*
+!  *	$XConsortium: misc.c,v 1.92 92/03/13 17:02:08 gildea Exp $
+   */
+  
+  /*
+--- 1,5 ----
+  /*
+!  *	$XConsortium: misc.c,v 1.95.1.1 93/11/04 08:56:48 gildea Exp $
+   */
+  
+  /*
+***************
+*** 444,449 ****
+--- 444,518 ----
+  	}
+  }
+  
+ #if defined(ALLOWLOGGING) || defined(DEBUG)
+ 
+ #ifndef X_NOT_POSIX
+ #define HAS_WAITPID
+ #endif
+ 
+ /*
+  * create a file only if we could with the permissions of the real user id.
+  * We could emulate this with careful use of access() and following
+  * symbolic links, but that is messy and has race conditions.
+  * Forking is messy, too, but we can't count on setreuid() or saved set-uids
+  * being available.
+  */
+ void
+ creat_as(uid, gid, pathname, mode)
+     int uid;
+     int gid;
+     char *pathname;
+     int mode;
+ {
+     int fd;
+     int waited;
+     int pid;
+ #ifndef HAS_WAITPID
+     int (*chldfunc)();
+ 
+     chldfunc = signal(SIGCHLD, SIG_DFL);
+ #endif
+     pid = fork();
+     switch (pid)
+     {
+     case 0:			/* child */
+ 	setgid(gid);
+ 	setuid(uid);
+ 	fd = open(pathname, O_WRONLY|O_CREAT|O_APPEND, mode);
+ 	if (fd >= 0) {
+ 	    close(fd);
+ 	    _exit(0);
+ 	} else
+ 	    _exit(1);
+     case -1:			/* error */
+ 	return;
+     default:			/* parent */
+ #ifdef HAS_WAITPID
+ 	waitpid(pid, NULL, 0);
+ #else
+ 	waited = wait(NULL);
+ 	signal(SIGCHLD, chldfunc);
+ 	/*
+ 	  Since we had the signal handler uninstalled for a while,
+ 	  we might have missed the termination of our screen child.
+ 	  If we can check for this possibility without hanging, do so.
+ 	*/
+ 	do
+ 	    if (waited == term->screen.pid)
+ 		Cleanup(0);
+ 	while ( (waited=nonblocking_wait()) > 0);
+ #endif
+     }
+ }
+ #endif
+ 
+ #ifdef ALLOWLOGGING
+ /*
+  * logging is a security hole, since it allows a setuid program to
+  * write arbitrary data to an arbitrary file.  So it is disabled
+  * by default.
+  */ 
+ 
+  StartLog(screen)
+  register TScreen *screen;
+  {
+***************
+*** 530,551 ****
+  		return;
+  #endif
+  	} else {
+! 		if(access(screen->logfile, F_OK) == 0) {
+! 			if(access(screen->logfile, W_OK) < 0)
+! 				return;
+! 		} else if(cp = rindex(screen->logfile, '/')) {
+! 			*cp = 0;
+! 			i = access(screen->logfile, W_OK);
+! 			*cp = '/';
+! 			if(i < 0)
+! 				return;
+! 		} else if(access(".", W_OK) < 0)
+  			return;
+! 		if((screen->logfd = open(screen->logfile, O_WRONLY | O_APPEND |
+! 		 O_CREAT, 0644)) < 0)
+! 			return;
+! 		chown(screen->logfile, screen->uid, screen->gid);
+  
+  	}
+  	screen->logstart = screen->TekEmu ? Tbptr : bptr;
+  	screen->logging = TRUE;
+--- 599,618 ----
+  		return;
+  #endif
+  	} else {
+! 		if(access(screen->logfile, F_OK) != 0) {
+! 		    if (errno == ENOENT)
+! 			creat_as(screen->uid, screen->gid,
+! 				 screen->logfile, 0644);
+! 		    else
+  			return;
+! 		}
+  
+ 		if(access(screen->logfile, F_OK) != 0
+ 		   || access(screen->logfile, W_OK) != 0)
+ 		    return;
+ 		if((screen->logfd = open(screen->logfile, O_WRONLY | O_APPEND,
+ 					 0644)) < 0)
+ 			return;
+  	}
+  	screen->logstart = screen->TekEmu ? Tbptr : bptr;
+  	screen->logging = TRUE;
+***************
+*** 587,592 ****
+--- 654,660 ----
+  		CloseLog(screen);
+  }
+  #endif /* ALLOWLOGFILEEXEC */
+ #endif /* ALLOWLOGGING */
+  
+  
+  do_osc(func)
+***************
+*** 626,631 ****
+--- 694,700 ----
+  		Changetitle(buf);
+  		break;
+  
+ #ifdef ALLOWLOGGING
+  	 case 46:	/* new log file */
+  #ifdef ALLOWLOGFILECHANGES
+  		/*
+***************
+*** 643,648 ****
+--- 712,718 ----
+  		Bell();
+  #endif
+  		break;
+ #endif /* ALLOWLOGGING */
+  
+  	case 50:
+  		SetVTFont (fontMenu_fontescape, True, buf, NULL);
+***************
+*** 903,912 ****
+--- 973,984 ----
+      register TScreen *screen = &term->screen;
+  
+      if (screen->TekEmu) {
+ #ifdef ALLOWLOGGING
+  	if (screen->logging) {
+  	    FlushLog (screen);
+  	    screen->logstart = buffer;
+  	}
+ #endif
+  	longjmp(Tekend, 1);
+      } 
+      return;
+***************
+*** 917,926 ****
+--- 989,1000 ----
+      register TScreen *screen = &term->screen;
+  
+      if (!screen->TekEmu) {
+ #ifdef ALLOWLOGGING
+  	if(screen->logging) {
+  	    FlushLog(screen);
+  	    screen->logstart = Tbuffer;
+  	}
+ #endif
+  	screen->TekEmu = TRUE;
+  	longjmp(VTend, 1);
+      } 
+*** /tmp/da17839	Wed Nov  3 18:16:38 1993
+--- mit/clients/xterm/Tekproc.c	Wed Nov  3 18:16:37 1993
+***************
+*** 1,5 ****
+  /*
+!  * $XConsortium: Tekproc.c,v 1.107 91/06/25 19:49:48 gildea Exp $
+   *
+   * Warning, there be crufty dragons here.
+   */
+--- 1,5 ----
+  /*
+!  * $XConsortium: Tekproc.c,v 1.112 93/02/25 17:17:40 gildea Exp $
+   *
+   * Warning, there be crufty dragons here.
+   */
+***************
+*** 46,51 ****
+--- 46,52 ----
+  #include <stdio.h>
+  #include <errno.h>
+  #include <setjmp.h>
+ #include <signal.h>
+  
+  /*
+   * Check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
+***************
+*** 74,80 ****
+  
+  #define TekColormap DefaultColormap( screen->display, \
+  				    DefaultScreen(screen->display) )
+! #define DefaultGCID DefaultGC(screen->display, DefaultScreen(screen->display))->gid
+  
+  /* Tek defines */
+  
+--- 75,81 ----
+  
+  #define TekColormap DefaultColormap( screen->display, \
+  				    DefaultScreen(screen->display) )
+! #define DefaultGCID XGContextFromGC(DefaultGC(screen->display, DefaultScreen(screen->display)))
+  
+  /* Tek defines */
+  
+***************
+*** 188,194 ****
+--- 189,197 ----
+      /* menu actions */
+      { "allow-send-events",	HandleAllowSends },
+      { "set-visual-bell",	HandleSetVisualBell },
+ #ifdef ALLOWLOGGING
+      { "set-logging",		HandleLogging },
+ #endif
+      { "redraw",			HandleRedraw },
+      { "send-signal",		HandleSendSignal },
+      { "quit",			HandleQuit },
+***************
+*** 335,342 ****
+  	register int c, x, y;
+  	char ch;
+  
+! 	for( ; ; )
+! 		switch(Tparsestate[c = input()]) {
+  		 case CASE_REPORT:
+  			/* report address */
+  			if(screen->TekGIN) {
+--- 338,346 ----
+  	register int c, x, y;
+  	char ch;
+  
+! 	for( ; ; ) {
+! 	    c = input();
+! 	    switch(Tparsestate[c]) {
+  		 case CASE_REPORT:
+  			/* report address */
+  			if(screen->TekGIN) {
+***************
+*** 356,365 ****
+--- 360,371 ----
+  			/* special return to vt102 mode */
+  			Tparsestate = curstate;
+  			TekRecord->ptr[-1] = NAK; /* remove from recording */
+ #ifdef ALLOWLOGGING
+  			if(screen->logging) {
+  				FlushLog(screen);
+  				screen->logstart = buffer;
+  			}
+ #endif
+  			return;
+  
+  		 case CASE_SPT_STATE:
+***************
+*** 626,631 ****
+--- 632,638 ----
+  			Tparsestate = curstate;
+  			break;
+  		}
+ 	}
+  }			
+  
+  static int rcnt;
+***************
+*** 667,675 ****
+  				       (int *) NULL, &crocktimeout);
+  #endif
+  			if(Tselect_mask & pty_mask) {
+  				if(screen->logging)
+  					FlushLog(screen);
+! 				Tbcnt = read(screen->respond, Tbptr = Tbuffer, BUF_SIZE);
+  				if(Tbcnt < 0) {
+  					if(errno == EIO)
+  						Cleanup (0);
+--- 674,684 ----
+  				       (int *) NULL, &crocktimeout);
+  #endif
+  			if(Tselect_mask & pty_mask) {
+ #ifdef ALLOWLOGGING
+  				if(screen->logging)
+  					FlushLog(screen);
+! #endif
+! 				Tbcnt = read(screen->respond, (char *)(Tbptr = Tbuffer), BUF_SIZE);
+  				if(Tbcnt < 0) {
+  					if(errno == EIO)
+  						Cleanup (0);
+***************
+*** 1150,1157 ****
+   * The following is called the create the tekWidget
+   */
+  
+! static void TekInitialize(request, new)
+      Widget request, new;
+  {
+      /* look for focus related events on the shell, because we need
+       * to care about the shell's border being part of our focus.
+--- 1159,1168 ----
+   * The following is called the create the tekWidget
+   */
+  
+! static void TekInitialize(request, new, args, num_args)
+      Widget request, new;
+     ArgList args;
+     Cardinal *num_args;
+  {
+      /* look for focus related events on the shell, because we need
+       * to care about the shell's border being part of our focus.
+***************
+*** 1549,1565 ****
+  }
+  
+  
+  /* write copy of screen to a file */
+  
+  TekCopy()
+  {
+- 	register TekLink *Tp;
+- 	register int tekcopyfd;
+  	register TScreen *screen = &term->screen;
+  	register struct tm *tp;
+  	long l;
+  	char buf[32];
+  
+  	time(&l);
+  	tp = localtime(&l);
+  	sprintf(buf, "COPY%02d-%02d-%02d.%02d:%02d:%02d", tp->tm_year,
+--- 1560,1585 ----
+  }
+  
+  
+ #ifndef X_NOT_POSIX
+ #define HAS_WAITPID
+ #endif
+ 
+  /* write copy of screen to a file */
+  
+  TekCopy()
+  {
+  	register TScreen *screen = &term->screen;
+  	register struct tm *tp;
+  	long l;
+  	char buf[32];
+ 	int waited;
+ 	int pid;
+ #ifndef HAS_WAITPID
+ 	int (*chldfunc)();
+  
+ 	chldfunc = signal(SIGCHLD, SIG_DFL);
+ #endif
+ 
+  	time(&l);
+  	tp = localtime(&l);
+  	sprintf(buf, "COPY%02d-%02d-%02d.%02d:%02d:%02d", tp->tm_year,
+***************
+*** 1573,1593 ****
+  		Bell();
+  		return;
+  	}
+! 	if((tekcopyfd = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) {
+! 		Bell();
+! 		return;
+! 	}
+! 	chown(buf, screen->uid, screen->gid);
+! 	sprintf(buf, "\033%c\033%c", screen->page.fontsize + '8',
+! 	 screen->page.linetype + '`');
+! 	write(tekcopyfd, buf, 4);
+! 	Tp = &Tek0; 
+! 	do {
+  		write(tekcopyfd, (char *)Tp->data, Tp->count);
+  		Tp = Tp->next;
+! 	} while(Tp);
+! 	close(tekcopyfd);
+  }
+- 
+- 
+- 
+--- 1593,1645 ----
+  		Bell();
+  		return;
+  	}
+! 
+! 	/* Write the file in an unprivileged child process because
+! 	   using access before the open still leaves a small window
+! 	   of opportunity. */
+! 	pid = fork();
+! 	switch (pid)
+! 	{
+! 	case 0:			/* child */
+! 	{
+! 	    register int tekcopyfd;
+! 	    char initbuf[5];
+! 	    register TekLink *Tp;
+! 
+! 	    setgid(screen->gid);
+! 	    setuid(screen->uid);
+! 	    tekcopyfd = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+! 	    if (tekcopyfd < 0)
+! 		_exit(1);
+! 	    sprintf(initbuf, "\033%c\033%c", screen->page.fontsize + '8',
+! 		    screen->page.linetype + '`');
+! 	    write(tekcopyfd, initbuf, 4);
+! 	    Tp = &Tek0; 
+! 	    do {
+  		write(tekcopyfd, (char *)Tp->data, Tp->count);
+  		Tp = Tp->next;
+! 	    } while(Tp);
+! 	    close(tekcopyfd);
+! 	    _exit(0);
+! 	}
+! 	case -1:		/* error */
+! 	    Bell();
+! 	    return;
+! 	default:		/* parent */
+! #ifdef HAS_WAITPID
+! 	    waitpid(pid, NULL, 0);
+! #else
+! 	    waited = wait(NULL);
+! 	    signal(SIGCHLD, chldfunc);
+! 	    /*
+! 	      Since we had the signal handler uninstalled for a while,
+! 	      we might have missed the termination of our screen child.
+! 	      If we can check for this possibility without hanging, do so.
+! 	      */
+! 	    do
+! 		if (waited == term->screen.pid)
+! 		    Cleanup(0);
+! 	    while ( (waited=nonblocking_wait()) > 0);
+! #endif
+! 	}
+  }
--- a/diffstat/testing/case02.ref
+++ b/diffstat/testing/case02.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 +++++++++++++++++++++++++++++++++++++!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02R.ref
+++ b/diffstat/testing/case02R.ref
@ -0,0 +1,4 @@
+ da17839 |   98 +++------------!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ da20646 |    2 !
+ da21897 |  104 --------------------------------------------------!!!!!!!!!!!!!!
+ 3 files changed, 5 insertions(+), 102 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02Rp0.ref
+++ b/diffstat/testing/case02Rp0.ref
@ -0,0 +1,4 @@
+ /tmp/da17839 |   98 ++------------!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ /tmp/da20646 |    2 !
+ /tmp/da21897 |  104 ----------------------------------------------!!!!!!!!!!!!!
+ 3 files changed, 5 insertions(+), 102 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02b.ref
+++ b/diffstat/testing/case02b.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 +++++++++++++++++++++++++++++++++++++!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02f0.ref
+++ b/diffstat/testing/case02f0.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 	0 +	0 -	2 !
+ clients/xterm/Tekproc.c |   98 	20 +	5 -	73 !
+ clients/xterm/misc.c    |  104 	82 +	0 -	22 !
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02k.ref
+++ b/diffstat/testing/case02k.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 +++++++++++++++++++++++++++++++++++++!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02p1.ref
+++ b/diffstat/testing/case02p1.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 +++++++++++++++++++++++++++++++++++++!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02p9.ref
+++ b/diffstat/testing/case02p9.ref
@ -0,0 +1,4 @@
+ Tekproc.c  |   98 +++++++++++---!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ bug-report |    2 !
+ misc.c     |  104 ++++++++++++++++++++++++++++++++++++++++++++++++!!!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02r1.ref
+++ b/diffstat/testing/case02r1.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 !
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 ++++++++++++++++++++++++++++++++++++++!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02r2.ref
+++ b/diffstat/testing/case02r2.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 !
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ clients/xterm/misc.c    |  104 ++++++++++++++++++++++++++++++++++++++!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case02u.ref
+++ b/diffstat/testing/case02u.ref
@ -0,0 +1,4 @@
+ bug-report              |    2 
+ clients/xterm/misc.c    |  104 +++++++++++++++++++++++++++++++++++++!!!!!!!!!!!
+ clients/xterm/Tekproc.c |   98 +++++++++--!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ 3 files changed, 102 insertions(+), 5 deletions(-), 97 modifications(!)
--- a/diffstat/testing/case03.pat
+++ b/diffstat/testing/case03.pat
@ -0,0 +1,35 @@
+diff -r -c diffstat/config.cache diffstat.orig/config.cache
+*** 1.1				Fri Mar 15 19:27:13 1996
+--- diffstat.orig/config.cache	Fri Mar 15 19:51:02 1996
+***************
+*** 13,28 ****
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+! ac_cv_c_cross=${ac_cv_c_cross='yes'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
+--- 13,28 ----
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
+diff -r -c diffstat/config.h diffstat.orig/config.h
+*** diffstat/config.h	Fri Mar 15 19:27:15 1996
+--- diffstat.orig/config.h	Fri Mar 15 19:51:04 1996
+***************
+*** 6,11 ****
+--- 6,12 ----
+   */
+  
+  
+ #define STDC_HEADERS	1
+  #define HAVE_STDLIB_H	1
+  #define HAVE_UNISTD_H	1
+  #define HAVE_GETOPT_H	1
+Only in diffstat.orig: configure.out
+Binary files diffstat/diffstat and diffstat.orig/diffstat differ
+< nothing
+> nothing again
+Binary files diffstat/diffstat.o and diffstat.orig/diffstat.o differ
--- a/diffstat/testing/case03.ref
+++ b/diffstat/testing/case03.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03R.ref
+++ b/diffstat/testing/case03R.ref
@ -0,0 +1,6 @@
+ diffstat.orig/configure.out |only
+ diffstat/config.cache       |    1 !
+ diffstat/config.h           |    1 -
+ diffstat/diffstat           |binary
+ diffstat/diffstat.o         |binary
+ 5 files changed, 1 deletion(-), 1 modification(!)
--- a/diffstat/testing/case03Rp0.ref
+++ b/diffstat/testing/case03Rp0.ref
@ -0,0 +1,6 @@
+ diffstat.orig/configure.out |only
+ diffstat/config.cache       |    1 !
+ diffstat/config.h           |    1 -
+ diffstat/diffstat           |binary
+ diffstat/diffstat.o         |binary
+ 5 files changed, 1 deletion(-), 1 modification(!)
--- a/diffstat/testing/case03b.ref
+++ b/diffstat/testing/case03b.ref
@ -0,0 +1,4 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ 3 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03f0.ref
+++ b/diffstat/testing/case03f0.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 	0 +	0 -	1 !
+ config.h      |    1 	1 +	0 -	0 !
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03k.ref
+++ b/diffstat/testing/case03k.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03p1.ref
+++ b/diffstat/testing/case03p1.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03p9.ref
+++ b/diffstat/testing/case03p9.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03r1.ref
+++ b/diffstat/testing/case03r1.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03r2.ref
+++ b/diffstat/testing/case03r2.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case03u.ref
+++ b/diffstat/testing/case03u.ref
@ -0,0 +1,6 @@
+ config.cache  |    1 !
+ config.h      |    1 +
+ configure.out |only
+ diffstat      |binary
+ diffstat.o    |binary
+ 5 files changed, 1 insertion(+), 1 modification(!)
--- a/diffstat/testing/case04.pat
+++ b/diffstat/testing/case04.pat
@ -0,0 +1,352 @@
+diff -r -c diffstat/config.cache diffstat.orig/config.cache
+*** diffstat/config.cache	Fri Mar 15 19:27:13 1996
+--- diffstat.orig/config.cache	Fri Mar 15 19:51:02 1996
+***************
+*** 13,28 ****
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+! ac_cv_c_cross=${ac_cv_c_cross='yes'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
+! ac_cv_header_stdc=${ac_cv_header_stdc='no'}
+  ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h='yes'}
+  ac_cv_header_string_h=${ac_cv_header_string_h='yes'}
+  ac_cv_header_unistd_h=${ac_cv_header_unistd_h='yes'}
+  ac_cv_path_install=${ac_cv_path_install='/home/tom/com/install -c'}
+! ac_cv_prog_CC=${ac_cv_prog_CC='atacCC'}
+! ac_cv_prog_CPP=${ac_cv_prog_CPP='atacCC -E'}
+  ac_cv_prog_gcc=${ac_cv_prog_gcc='yes'}
+  ac_cv_prog_gcc_g=${ac_cv_prog_gcc_g='yes'}
+  ac_cv_prog_gcc_traditional=${ac_cv_prog_gcc_traditional='no'}
+--- 13,28 ----
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+! ac_cv_c_cross=${ac_cv_c_cross='no'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
+! ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
+  ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h='yes'}
+  ac_cv_header_string_h=${ac_cv_header_string_h='yes'}
+  ac_cv_header_unistd_h=${ac_cv_header_unistd_h='yes'}
+  ac_cv_path_install=${ac_cv_path_install='/home/tom/com/install -c'}
+! ac_cv_prog_CC=${ac_cv_prog_CC='gcc'}
+! ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'}
+  ac_cv_prog_gcc=${ac_cv_prog_gcc='yes'}
+  ac_cv_prog_gcc_g=${ac_cv_prog_gcc_g='yes'}
+  ac_cv_prog_gcc_traditional=${ac_cv_prog_gcc_traditional='no'}
+diff -r -c diffstat/config.h diffstat.orig/config.h
+*** diffstat/config.h	Fri Mar 15 19:27:15 1996
+--- diffstat.orig/config.h	Fri Mar 15 19:51:04 1996
+***************
+*** 6,11 ****
+--- 6,12 ----
+   */
+  
+  
+ #define STDC_HEADERS	1
+  #define HAVE_STDLIB_H	1
+  #define HAVE_UNISTD_H	1
+  #define HAVE_GETOPT_H	1
+diff -r -c diffstat/config.log diffstat.orig/config.log
+*** diffstat/config.log	Fri Mar 15 19:26:59 1996
+--- diffstat.orig/config.log	Fri Mar 15 19:50:58 1996
+***************
+*** 2,27 ****
+  running configure, to aid debugging if configure makes a mistake.
+  
+  configure:607: sgtty.h: No such file or directory
+! /usr/tmp/atacCC17934/conftest.c:30: warning: missing braces around initializer for `ZUmain[0]'
+! /usr/tmp/atacCC17934/conftest.c:66: warning: function declaration isn't a prototype
+! /usr/tmp/atacCC17934/conftest.c: In function `main':
+! /usr/tmp/atacCC17934/conftest.c:67: warning: implicit declaration of function `aTaC'
+! /usr/tmp/atacCC17934/conftest.c: At top level:
+! /usr/tmp/atacCC17934/conftest.c:76: warning: function declaration isn't a prototype
+! /usr/tmp/atacCC17934/conftest.c: In function `t':
+! /usr/tmp/atacCC17934/conftest.c:97: warning: declaration of `t' shadows global declaration
+! /usr/tmp/atacCC17934/conftest.c:98: warning: unused variable `s'
+! /usr/tmp/atacCC17934/conftest.c:104: warning: declaration of `x' shadows previous local
+! /usr/tmp/atacCC17934/conftest.c:111: warning: declaration of `p' shadows previous local
+! /usr/tmp/atacCC17934/conftest.c:125: warning: unused variable `foo'
+! /usr/tmp/atacCC17934/conftest.c:86: warning: unused variable `zero'
+! /usr/tmp/atacCC17934/conftest.c:80: warning: unused variable `x'
+! /usr/tmp/atacCC17934/conftest.c: At top level:
+! /usr/tmp/atacCC17934/conftest.c:1: warning: `ZIDENT' defined but not used
+! /usr/tmp/atacCC17972/conftest.c:30: warning: missing braces around initializer for `ZUmain[0]'
+! /usr/tmp/atacCC17972/conftest.c:39: warning: return-type defaults to `int'
+! /usr/tmp/atacCC17972/conftest.c:39: warning: function declaration isn't a prototype
+! /usr/tmp/atacCC17972/conftest.c: In function `main':
+! /usr/tmp/atacCC17972/conftest.c:40: warning: implicit declaration of function `aTaC'
+! /usr/tmp/atacCC17972/conftest.c: At top level:
+! /usr/tmp/atacCC17972/conftest.c:1: warning: `ZIDENT' defined but not used
+--- 2,19 ----
+  running configure, to aid debugging if configure makes a mistake.
+  
+  configure:607: sgtty.h: No such file or directory
+! configure:659: warning: function declaration isn't a prototype
+! configure:660: warning: function declaration isn't a prototype
+! configure: In function `t':
+! configure:680: warning: declaration of `t' shadows global declaration
+! configure:681: warning: unused variable `s'
+! configure:686: warning: declaration of `x' shadows previous local
+! configure:692: warning: declaration of `p' shadows previous local
+! configure:701: warning: unused variable `foo'
+! configure:669: warning: unused variable `zero'
+! configure:663: warning: unused variable `x'
+! configure:680: warning: `t' might be used uninitialized in this function
+! configure:698: warning: `b' might be used uninitialized in this function
+! configure:735: warning: return-type defaults to `int'
+! configure:735: warning: function declaration isn't a prototype
+! configure:821: warning: function declaration isn't a prototype
+diff -r -c diffstat/config.status diffstat.orig/config.status
+*** diffstat/config.status	Fri Mar 15 19:27:14 1996
+--- diffstat.orig/config.status	Fri Mar 15 19:51:03 1996
+***************
+*** 4,10 ****
+  # This directory was configured as follows,
+  # on host dickey-ppp:
+  #
+! # ./configure 
+  #
+  # Compiler output produced by configure, useful for debugging
+  # configure, is in ./config.log if it exists.
+--- 4,10 ----
+  # This directory was configured as follows,
+  # on host dickey-ppp:
+  #
+! # ./configure  --verbose --disable-echo --enable-warnings --with-warnings
+  #
+  # Compiler output produced by configure, useful for debugging
+  # configure, is in ./config.log if it exists.
+***************
+*** 14,21 ****
+  do
+    case "$ac_option" in
+    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+!     echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion"
+!     exec ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion ;;
+    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+      echo "./config.status generated by autoconf version 2.3"
+      exit 0 ;;
+--- 14,21 ----
+  do
+    case "$ac_option" in
+    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+!     echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --verbose --disable-echo --enable-warnings --with-warnings --no-create --no-recursion"
+!     exec ${CONFIG_SHELL-/bin/sh} ./configure  --verbose --disable-echo --enable-warnings --with-warnings --no-create --no-recursion ;;
+    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+      echo "./config.status generated by autoconf version 2.3"
+      exit 0 ;;
+***************
+*** 38,53 ****
+  s%@CFLAGS@%-O -Wall -Wshadow -Wconversion -Wstrict-prototypes -Wmissing-prototypes%g
+  s%@CPPFLAGS@%%g
+  s%@CXXFLAGS@%%g
+! s%@DEFS@% -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETOPT_H=1 -DHAVE_STRING_H=1 -DHAVE_MALLOC_H=1 %g
+  s%@LDFLAGS@%%g
+  s%@LIBS@%%g
+  s%@exec_prefix@%${prefix}%g
+  s%@prefix@%/usr/local%g
+  s%@program_transform_name@%s,x,x,%g
+! s%@CC@%atacCC%g
+  s%@INSTALL_PROGRAM@%${INSTALL}%g
+  s%@INSTALL_DATA@%${INSTALL} -m 644%g
+! s%@CPP@%atacCC -E%g
+  
+  CEOF
+  
+--- 38,53 ----
+  s%@CFLAGS@%-O -Wall -Wshadow -Wconversion -Wstrict-prototypes -Wmissing-prototypes%g
+  s%@CPPFLAGS@%%g
+  s%@CXXFLAGS@%%g
+! s%@DEFS@% -DSTDC_HEADERS=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETOPT_H=1 -DHAVE_STRING_H=1 -DHAVE_MALLOC_H=1 %g
+  s%@LDFLAGS@%%g
+  s%@LIBS@%%g
+  s%@exec_prefix@%${prefix}%g
+  s%@prefix@%/usr/local%g
+  s%@program_transform_name@%s,x,x,%g
+! s%@CC@%gcc%g
+  s%@INSTALL_PROGRAM@%${INSTALL}%g
+  s%@INSTALL_DATA@%${INSTALL} -m 644%g
+! s%@CPP@%gcc -E%g
+  
+  CEOF
+  
+Only in diffstat.orig: configure.out
+Binary files diffstat/diffstat and diffstat.orig/diffstat differ
+Binary files diffstat/diffstat.o and diffstat.orig/diffstat.o differ
+diff -r -c diffstat/makefile diffstat.orig/makefile
+*** diffstat/makefile	Fri Mar 15 19:27:15 1996
+--- diffstat.orig/makefile	Fri Mar 15 19:51:04 1996
+***************
+*** 7,13 ****
+  
+  srcdir = .
+  
+! CC		= atacCC
+  LINK		= $(CC)
+  INSTALL		= /home/tom/com/install -c
+  INSTALL_PROGRAM	= ${INSTALL}
+--- 7,13 ----
+  
+  srcdir = .
+  
+! CC		= gcc
+  LINK		= $(CC)
+  INSTALL		= /home/tom/com/install -c
+  INSTALL_PROGRAM	= ${INSTALL}
+Only in diffstat/testing: Xlib-1.patch-
+Only in diffstat/testing: Xlib-1.ref
+Only in diffstat/testing: Xlib-2.patch-
+Only in diffstat/testing: Xlib-2.ref
+Only in diffstat/testing: Xlib-3.patch-
+Only in diffstat/testing: Xlib-3.ref
+Only in diffstat/testing: config-1.ref
+Only in diffstat/testing: nugent.ref
+Only in diffstat/testing: xserver-1.ref
+Only in diffstat/testing: xserver-2.patch-
+Only in diffstat/testing: xserver-2.ref
+Only in diffstat/testing: xterm-1.patch-
+Only in diffstat/testing: xterm-1.ref
+Only in diffstat/testing: xterm-10.patch-
+Only in diffstat/testing: xterm-10.ref
+Only in diffstat/testing: xterm-11.patch-
+Only in diffstat/testing: xterm-11.ref
+Only in diffstat/testing: xterm-2.patch-
+Only in diffstat/testing: xterm-2.ref
+Only in diffstat/testing: xterm-3.patch-
+Only in diffstat/testing: xterm-3.ref
+Only in diffstat/testing: xterm-4.patch-
+Only in diffstat/testing: xterm-4.ref
+Only in diffstat/testing: xterm-5.patch-
+Only in diffstat/testing: xterm-5.ref
+Only in diffstat/testing: xterm-6.patch-
+Only in diffstat/testing: xterm-6.ref
+Only in diffstat/testing: xterm-7.ref
+Only in diffstat/testing: xterm-8.patch-
+Only in diffstat/testing: xterm-8.ref
+Only in diffstat/testing: xterm-9.patch-
+Only in diffstat/testing: xterm-9.ref
+diff -r diffstat/config.cache diffstat.orig/config.cache
+16c16
+< ac_cv_c_cross=${ac_cv_c_cross='yes'}
+---
+> ac_cv_c_cross=${ac_cv_c_cross='no'}
+19c19
+< ac_cv_header_stdc=${ac_cv_header_stdc='no'}
+---
+> ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
+24,25c24,25
+< ac_cv_prog_CC=${ac_cv_prog_CC='atacCC'}
+< ac_cv_prog_CPP=${ac_cv_prog_CPP='atacCC -E'}
+---
+> ac_cv_prog_CC=${ac_cv_prog_CC='gcc'}
+> ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'}
+diff -r diffstat/config.h diffstat.orig/config.h
+8a9
+> #define STDC_HEADERS	1
+diff -r diffstat/config.log diffstat.orig/config.log
+5,27c5,19
+< /usr/tmp/atacCC17934/conftest.c:30: warning: missing braces around initializer for `ZUmain[0]'
+< /usr/tmp/atacCC17934/conftest.c:66: warning: function declaration isn't a prototype
+< /usr/tmp/atacCC17934/conftest.c: In function `main':
+< /usr/tmp/atacCC17934/conftest.c:67: warning: implicit declaration of function `aTaC'
+< /usr/tmp/atacCC17934/conftest.c: At top level:
+< /usr/tmp/atacCC17934/conftest.c:76: warning: function declaration isn't a prototype
+< /usr/tmp/atacCC17934/conftest.c: In function `t':
+< /usr/tmp/atacCC17934/conftest.c:97: warning: declaration of `t' shadows global declaration
+< /usr/tmp/atacCC17934/conftest.c:98: warning: unused variable `s'
+< /usr/tmp/atacCC17934/conftest.c:104: warning: declaration of `x' shadows previous local
+< /usr/tmp/atacCC17934/conftest.c:111: warning: declaration of `p' shadows previous local
+< /usr/tmp/atacCC17934/conftest.c:125: warning: unused variable `foo'
+< /usr/tmp/atacCC17934/conftest.c:86: warning: unused variable `zero'
+< /usr/tmp/atacCC17934/conftest.c:80: warning: unused variable `x'
+< /usr/tmp/atacCC17934/conftest.c: At top level:
+< /usr/tmp/atacCC17934/conftest.c:1: warning: `ZIDENT' defined but not used
+< /usr/tmp/atacCC17972/conftest.c:30: warning: missing braces around initializer for `ZUmain[0]'
+< /usr/tmp/atacCC17972/conftest.c:39: warning: return-type defaults to `int'
+< /usr/tmp/atacCC17972/conftest.c:39: warning: function declaration isn't a prototype
+< /usr/tmp/atacCC17972/conftest.c: In function `main':
+< /usr/tmp/atacCC17972/conftest.c:40: warning: implicit declaration of function `aTaC'
+< /usr/tmp/atacCC17972/conftest.c: At top level:
+< /usr/tmp/atacCC17972/conftest.c:1: warning: `ZIDENT' defined but not used
+---
+> configure:659: warning: function declaration isn't a prototype
+> configure:660: warning: function declaration isn't a prototype
+> configure: In function `t':
+> configure:680: warning: declaration of `t' shadows global declaration
+> configure:681: warning: unused variable `s'
+> configure:686: warning: declaration of `x' shadows previous local
+> configure:692: warning: declaration of `p' shadows previous local
+> configure:701: warning: unused variable `foo'
+> configure:669: warning: unused variable `zero'
+> configure:663: warning: unused variable `x'
+> configure:680: warning: `t' might be used uninitialized in this function
+> configure:698: warning: `b' might be used uninitialized in this function
+> configure:735: warning: return-type defaults to `int'
+> configure:735: warning: function declaration isn't a prototype
+> configure:821: warning: function declaration isn't a prototype
+diff -r diffstat/config.status diffstat.orig/config.status
+7c7
+< # ./configure 
+---
+> # ./configure  --verbose --disable-echo --enable-warnings --with-warnings
+17,18c17,18
+<     echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion"
+<     exec ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion ;;
+---
+>     echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --verbose --disable-echo --enable-warnings --with-warnings --no-create --no-recursion"
+>     exec ${CONFIG_SHELL-/bin/sh} ./configure  --verbose --disable-echo --enable-warnings --with-warnings --no-create --no-recursion ;;
+41c41
+< s%@DEFS@% -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETOPT_H=1 -DHAVE_STRING_H=1 -DHAVE_MALLOC_H=1 %g
+---
+> s%@DEFS@% -DSTDC_HEADERS=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETOPT_H=1 -DHAVE_STRING_H=1 -DHAVE_MALLOC_H=1 %g
+47c47
+< s%@CC@%atacCC%g
+---
+> s%@CC@%gcc%g
+50c50
+< s%@CPP@%atacCC -E%g
+---
+> s%@CPP@%gcc -E%g
+Only in diffstat.orig: configure.out
+Binary files diffstat/diffstat and diffstat.orig/diffstat differ
+Binary files diffstat/diffstat.o and diffstat.orig/diffstat.o differ
+diff -r diffstat/makefile diffstat.orig/makefile
+10c10
+< CC		= atacCC
+---
+> CC		= gcc
+Only in diffstat/testing: Xlib-1.patch-
+Only in diffstat/testing: Xlib-1.ref
+Only in diffstat/testing: Xlib-2.patch-
+Only in diffstat/testing: Xlib-2.ref
+Only in diffstat/testing: Xlib-3.patch-
+Only in diffstat/testing: Xlib-3.ref
+Only in diffstat/testing: config-1.ref
+Only in diffstat/testing: nugent.ref
+Only in diffstat/testing: xserver-1.ref
+Only in diffstat/testing: xserver-2.patch-
+Only in diffstat/testing: xserver-2.ref
+Only in diffstat/testing: xterm-1.patch-
+Only in diffstat/testing: xterm-1.ref
+Only in diffstat/testing: xterm-10.patch-
+Only in diffstat/testing: xterm-10.ref
+Only in diffstat/testing: xterm-11.patch-
+Only in diffstat/testing: xterm-11.ref
+Only in diffstat/testing: xterm-2.patch-
+Only in diffstat/testing: xterm-2.ref
+Only in diffstat/testing: xterm-3.patch-
+Only in diffstat/testing: xterm-3.ref
+Only in diffstat/testing: xterm-4.patch-
+Only in diffstat/testing: xterm-4.ref
+Only in diffstat/testing: xterm-5.patch-
+Only in diffstat/testing: xterm-5.ref
+Only in diffstat/testing: xterm-6.patch-
+Only in diffstat/testing: xterm-6.ref
+Only in diffstat/testing: xterm-7.ref
+Only in diffstat/testing: xterm-8.patch-
+Only in diffstat/testing: xterm-8.ref
+Only in diffstat/testing: xterm-9.patch-
+Only in diffstat/testing: xterm-9.ref
--- a/diffstat/testing/case04.ref
+++ b/diffstat/testing/case04.ref
@ -0,0 +1,41 @@
+ diffstat.orig/config.cache        |   16 ++--!!!!
+ diffstat.orig/config.h            |    2 +
+ diffstat.orig/config.log          |   76 +++++++------------!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.status       |   24 +++---!!!!!!
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    4 -
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04R.ref
+++ b/diffstat/testing/case04R.ref
@ -0,0 +1,41 @@
+ diffstat.orig/configure.out       |only
+ diffstat/config.cache             |   16 ++--!!!!
+ diffstat/config.h                 |    2 -
+ diffstat/config.log               |   76 +++++++++++--------!!!!!!!!!!!!!!!!!!
+ diffstat/config.status            |   24 +++---!!!!!!
+ diffstat/diffstat                 |binary
+ diffstat/diffstat.o               |binary
+ diffstat/makefile                 |    4 -
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 34 insertions(+), 28 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04Rp0.ref
+++ b/diffstat/testing/case04Rp0.ref
@ -0,0 +1,41 @@
+ diffstat.orig/configure.out       |only
+ diffstat/config.cache             |   16 ++--!!!!
+ diffstat/config.h                 |    2 -
+ diffstat/config.log               |   76 +++++++++++--------!!!!!!!!!!!!!!!!!!
+ diffstat/config.status            |   24 +++---!!!!!!
+ diffstat/diffstat                 |binary
+ diffstat/diffstat.o               |binary
+ diffstat/makefile                 |    4 -
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 34 insertions(+), 28 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04b.ref
+++ b/diffstat/testing/case04b.ref
@ -0,0 +1,39 @@
+ diffstat.orig/config.cache        |   16 ++--!!!!
+ diffstat.orig/config.h            |    2 +
+ diffstat.orig/config.log          |   76 +++++++------------!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.status       |   24 +++---!!!!!!
+ diffstat.orig/configure.out       |only
+ diffstat.orig/makefile            |    4 -
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 38 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04f0.ref
+++ b/diffstat/testing/case04f0.ref
@ -0,0 +1,41 @@
+ diffstat.orig/config.cache        |   16 	4 +	4 -	8 !
+ diffstat.orig/config.h            |    2 	2 +	0 -	0 !
+ diffstat.orig/config.log          |   76 	15 +	23 -	38 !
+ diffstat.orig/config.status       |   24 	6 +	6 -	12 !
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    4 	1 +	1 -	2 !
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04k.ref
+++ b/diffstat/testing/case04k.ref
@ -0,0 +1,81 @@
+ diffstat.orig/config.cache        |    8 !!!!!!!!
+ diffstat.orig/config.cache        |    8 ++++----
+ diffstat.orig/config.h            |    1 +
+ diffstat.orig/config.h            |    1 +
+ diffstat.orig/config.log          |   38 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.log          |   38 +++++++++++++++-----------------------
+ diffstat.orig/config.status       |   12 !!!!!!!!!!!!
+ diffstat.orig/config.status       |   12 ++++++------
+ diffstat.orig/configure.out       |only
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    2 !!
+ diffstat.orig/makefile            |    2 +-
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ diffstat/testing/xterm-9.ref      |only
+ 80 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04p1.ref
+++ b/diffstat/testing/case04p1.ref
@ -0,0 +1,41 @@
+ config.cache             |   16 ++--!!!!
+ config.h                 |    2 +
+ config.log               |   76 +++++++++--------------!!!!!!!!!!!!!!!!!!!!!!!
+ config.status            |   24 +++----!!!!!!
+ configure.out            |only
+ diffstat                 |binary
+ diffstat.o               |binary
+ makefile                 |    4 -
+ testing/Xlib-1.patch-    |only
+ testing/Xlib-1.ref       |only
+ testing/Xlib-2.patch-    |only
+ testing/Xlib-2.ref       |only
+ testing/Xlib-3.patch-    |only
+ testing/Xlib-3.ref       |only
+ testing/config-1.ref     |only
+ testing/nugent.ref       |only
+ testing/xserver-1.ref    |only
+ testing/xserver-2.patch- |only
+ testing/xserver-2.ref    |only
+ testing/xterm-1.patch-   |only
+ testing/xterm-1.ref      |only
+ testing/xterm-10.patch-  |only
+ testing/xterm-10.ref     |only
+ testing/xterm-11.patch-  |only
+ testing/xterm-11.ref     |only
+ testing/xterm-2.patch-   |only
+ testing/xterm-2.ref      |only
+ testing/xterm-3.patch-   |only
+ testing/xterm-3.ref      |only
+ testing/xterm-4.patch-   |only
+ testing/xterm-4.ref      |only
+ testing/xterm-5.patch-   |only
+ testing/xterm-5.ref      |only
+ testing/xterm-6.patch-   |only
+ testing/xterm-6.ref      |only
+ testing/xterm-7.ref      |only
+ testing/xterm-8.patch-   |only
+ testing/xterm-8.ref      |only
+ testing/xterm-9.patch-   |only
+ testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04p9.ref
+++ b/diffstat/testing/case04p9.ref
@ -0,0 +1,41 @@
+ Xlib-1.patch-    |only
+ Xlib-1.ref       |only
+ Xlib-2.patch-    |only
+ Xlib-2.ref       |only
+ Xlib-3.patch-    |only
+ Xlib-3.ref       |only
+ config-1.ref     |only
+ config.cache     |   16 ++---!!!!
+ config.h         |    2 +
+ config.log       |   76 ++++++++++-----------------!!!!!!!!!!!!!!!!!!!!!!!!!!
+ config.status    |   24 ++++----!!!!!!!!
+ configure.out    |only
+ diffstat         |binary
+ diffstat.o       |binary
+ makefile         |    4 -
+ nugent.ref       |only
+ xserver-1.ref    |only
+ xserver-2.patch- |only
+ xserver-2.ref    |only
+ xterm-1.patch-   |only
+ xterm-1.ref      |only
+ xterm-10.patch-  |only
+ xterm-10.ref     |only
+ xterm-11.patch-  |only
+ xterm-11.ref     |only
+ xterm-2.patch-   |only
+ xterm-2.ref      |only
+ xterm-3.patch-   |only
+ xterm-3.ref      |only
+ xterm-4.patch-   |only
+ xterm-4.ref      |only
+ xterm-5.patch-   |only
+ xterm-5.ref      |only
+ xterm-6.patch-   |only
+ xterm-6.ref      |only
+ xterm-7.ref      |only
+ xterm-8.patch-   |only
+ xterm-8.ref      |only
+ xterm-9.patch-   |only
+ xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04r1.ref
+++ b/diffstat/testing/case04r1.ref
@ -0,0 +1,41 @@
+ diffstat.orig/config.cache        |   16 ++--!!!!
+ diffstat.orig/config.h            |    2 +
+ diffstat.orig/config.log          |   76 +++++++-----------!!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.status       |   24 +++---!!!!!!
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    4 !
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04r2.ref
+++ b/diffstat/testing/case04r2.ref
@ -0,0 +1,41 @@
+ diffstat.orig/config.cache        |   16 ++--!!!!
+ diffstat.orig/config.h            |    2 +
+ diffstat.orig/config.log          |   76 +++++++-----------!!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.status       |   24 +++---!!!!!!
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    4 !
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case04u.ref
+++ b/diffstat/testing/case04u.ref
@ -0,0 +1,41 @@
+ diffstat.orig/config.cache        |   16 ++--!!!!
+ diffstat.orig/config.h            |    2 +
+ diffstat.orig/config.log          |   76 +++++++------------!!!!!!!!!!!!!!!!!!
+ diffstat.orig/config.status       |   24 +++---!!!!!!
+ diffstat.orig/configure.out       |only
+ diffstat.orig/diffstat            |binary
+ diffstat.orig/diffstat.o          |binary
+ diffstat.orig/makefile            |    4 -
+ diffstat/testing/Xlib-1.patch-    |only
+ diffstat/testing/Xlib-1.ref       |only
+ diffstat/testing/Xlib-2.patch-    |only
+ diffstat/testing/Xlib-2.ref       |only
+ diffstat/testing/Xlib-3.patch-    |only
+ diffstat/testing/Xlib-3.ref       |only
+ diffstat/testing/config-1.ref     |only
+ diffstat/testing/nugent.ref       |only
+ diffstat/testing/xserver-1.ref    |only
+ diffstat/testing/xserver-2.patch- |only
+ diffstat/testing/xserver-2.ref    |only
+ diffstat/testing/xterm-1.patch-   |only
+ diffstat/testing/xterm-1.ref      |only
+ diffstat/testing/xterm-10.patch-  |only
+ diffstat/testing/xterm-10.ref     |only
+ diffstat/testing/xterm-11.patch-  |only
+ diffstat/testing/xterm-11.ref     |only
+ diffstat/testing/xterm-2.patch-   |only
+ diffstat/testing/xterm-2.ref      |only
+ diffstat/testing/xterm-3.patch-   |only
+ diffstat/testing/xterm-3.ref      |only
+ diffstat/testing/xterm-4.patch-   |only
+ diffstat/testing/xterm-4.ref      |only
+ diffstat/testing/xterm-5.patch-   |only
+ diffstat/testing/xterm-5.ref      |only
+ diffstat/testing/xterm-6.patch-   |only
+ diffstat/testing/xterm-6.ref      |only
+ diffstat/testing/xterm-7.ref      |only
+ diffstat/testing/xterm-8.patch-   |only
+ diffstat/testing/xterm-8.ref      |only
+ diffstat/testing/xterm-9.patch-   |only
+ diffstat/testing/xterm-9.ref      |only
+ 40 files changed, 28 insertions(+), 34 deletions(-), 60 modifications(!)
--- a/diffstat/testing/case05.pat
+++ b/diffstat/testing/case05.pat
@ -0,0 +1,17 @@
+diff -r -c diffstat/config.cache diffstat.orig/config.cache
+*** 1.1				Fri Mar 15 19:27:13 1996
+--- diffstat.orig/config.cache	Fri Mar 15 19:51:02 1996
+***************
+*** 13,28 ****
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+- ac_cv_c_cross=${ac_cv_c_cross='yes'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
+--- 13,28 ----
+  # --recheck option to rerun configure.
+  #
+  ac_cv_c_const=${ac_cv_c_const='yes'}
+  ac_cv_header_getopt_h=${ac_cv_header_getopt_h='yes'}
+  ac_cv_header_malloc_h=${ac_cv_header_malloc_h='yes'}
--- a/diffstat/testing/case05.ref
+++ b/diffstat/testing/case05.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05R.ref
+++ b/diffstat/testing/case05R.ref
@ -0,0 +1,2 @@
+ config.cache |    1 +
+ 1 file changed, 1 insertion(+)
--- a/diffstat/testing/case05Rp0.ref
+++ b/diffstat/testing/case05Rp0.ref
@ -0,0 +1,2 @@
+ diffstat/config.cache |    1 +
+ 1 file changed, 1 insertion(+)
--- a/diffstat/testing/case05b.ref
+++ b/diffstat/testing/case05b.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05f0.ref
+++ b/diffstat/testing/case05f0.ref
@ -0,0 +1,2 @@
+ config.cache |    1 	0 +	1 -	0 !
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05k.ref
+++ b/diffstat/testing/case05k.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05p1.ref
+++ b/diffstat/testing/case05p1.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05p9.ref
+++ b/diffstat/testing/case05p9.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05r1.ref
+++ b/diffstat/testing/case05r1.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05r2.ref
+++ b/diffstat/testing/case05r2.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case05u.ref
+++ b/diffstat/testing/case05u.ref
@ -0,0 +1,2 @@
+ config.cache |    1 -
+ 1 file changed, 1 deletion(-)
--- a/diffstat/testing/case06.pat
+++ b/diffstat/testing/case06.pat
@ -0,0 +1,323 @@
+From esr@locke.ccil.org Sat Jan 13 18:02 EST 1996
+Received: from locke.ccil.org (esr@locke.ccil.org [205.164.136.88]) by mail.Clark.Net (8.7.3/8.6.5) with SMTP id SAA07403 for <dickey@clark.net>; Sat, 13 Jan 1996 18:02:54 -0500 (EST)
+Received: (esr@localhost) by locke.ccil.org (8.6.9/8.6.10) id SAA23481; Sat, 13 Jan 1996 18:28:57 -0500
+From: "Eric S. Raymond" <esr@locke.ccil.org>
+Message-Id: <199601132328.SAA23481@locke.ccil.org>
+Subject: patch #283 -- change line-breakout optimization logic
+To: zmbenhal@netcom.com, dickey@clark.net, ncurses-list@netcom.com
+Date: Sat, 13 Jan 1996 18:28:56 -0500 (EST)
+X-Mailer: ELM [version 2.4 PL24]
+Content-Type: text
+Content-Length: 9395
+Status: RO
+
+This patch (#283) changes the logic for line-breakout optimization.
+
+Daniel Barlow complained:
+>According to curs_inopts(3), curses periodically looks at the keyboard
+>while refreshing, and stops immediately if there is input pending.
+>
+>This works too well!  I was playing with emacs to see if it would like
+>to use real ncurses routines to output to the screen instead of just
+>using it as a glorified termcap library, and found that if I held down
+>the `page down' key (which autorepeats), nothing displayed at all
+>until I let go of it again.
+
+This patch addresses the problem.   See the comment leading the lib_doupdate.c
+patch band for details.
+
+This patch also makes a minor change in lib_initscr() to allow the maximum
+escape delay to be set from the environment.  Finally, it includes a
+workaround for the ncurses 'p' test bug.  A real fix is next on my agenda.
+
+Diffs between last version checked in and current workfile(s):
+
+--- NEWS	1996/01/11 19:47:02	1.3
+++ NEWS	1996/01/12 17:10:09
+@@ -6,6 +6,8 @@
+ * fixed broken wsyncup()/wysncdown(), as a result wnoutrefresh() now has
+   copy-changed-lines behavior.
+ * added and documented wresize() code.
+* changed the line-breakout optimization code to allow some lines to be
+  emitted before the first check.
+ 
+ ### ncurses-1.9.7 -> 1.9.8a
+ 
+--- ncurses/lib_doupdate.c	1996/01/12 16:09:44	1.6
+++ ncurses/lib_doupdate.c	1996/01/12 16:50:21
+@@ -43,6 +43,17 @@
+ #include "term.h"
+ 
+ /*
+ * This define controls the line-breakout optimization.  Every once in a
+ * while during screen refresh, we want to check for input and abort the
+ * update if there's some waiting.  CHECK_INTERVAL controls the number of
+ * changed lines to be emitted between input checks.
+ *
+ * Note: Input-check-and-abort is no longer done if the screen is being
+ * updated from scratch.  This is a feature, not a bug.
+ */
+#define CHECK_INTERVAL	6
+
+/*
+  * Enable checking to see if doupdate and friends are tracking the true
+  * cursor position correctly.  NOTE: this is a debugging hack which will
+  * work ONLY on ANSI-compatible terminals!
+@@ -146,6 +157,26 @@
+ 	}
+ }
+ 
+static bool check_pending(void)
+/* check for pending input */
+{
+	if (SP->_checkfd >= 0) {
+	fd_set fdset;
+	struct timeval ktimeout;
+
+		ktimeout.tv_sec =
+		ktimeout.tv_usec = 0;
+
+		FD_ZERO(&fdset);
+		FD_SET(SP->_checkfd, &fdset);
+		if (select(SP->_checkfd+1, &fdset, NULL, NULL, &ktimeout) != 0)
+		{
+			fflush(SP->_ofp);
+			return OK;
+		}
+	}
+}
+
+ /*
+  * No one supports recursive inline functions.  However, gcc is quieter if we
+  * instantiate the recursive part separately.
+@@ -278,22 +309,6 @@
+ 		SP->_endwin = FALSE;
+ 	}
+ 
+-	/* check for pending input */
+-	if (SP->_checkfd >= 0) {
+-	fd_set fdset;
+-	struct timeval ktimeout;
+-
+-		ktimeout.tv_sec =
+-		ktimeout.tv_usec = 0;
+-
+-		FD_ZERO(&fdset);
+-		FD_SET(SP->_checkfd, &fdset);
+-		if (select(SP->_checkfd+1, &fdset, NULL, NULL, &ktimeout) != 0) {
+-			fflush(SP->_ofp);
+-			return OK;
+-		}
+-	}
+-
+ 	/* 
+ 	 * FIXME: Full support for magic-cookie terminals could go in here.
+ 	 * The theory: we scan the virtual screen looking for attribute
+@@ -315,10 +330,15 @@
+ 			ClrUpdate(newscr);
+ 			newscr->_clear = FALSE;
+ 		} else {
+			int changedlines;
+
+ 		        _nc_scroll_optimize();
+ 
+ 			T(("Transforming lines"));
+-			for (i = 0; i < min(screen_lines, newscr->_maxy + 1); i++) {
+			for (i = changedlines = 0;
+			     i < min(screen_lines,newscr->_maxy+1);
+			     i++)
+			{
+ 				/*
+ 				 * newscr->line[i].firstchar is normally set
+ 				 * by wnoutrefresh.  curscr->line[i].firstchar
+@@ -327,17 +347,43 @@
+ 				 */
+ 				if (newscr->_line[i].firstchar != _NOCHANGE
+ 				    || curscr->_line[i].firstchar != _NOCHANGE)
+				{
+ 					TransformLine(i);
+					changedlines++;
+				}
+
+				/* mark line changed successfully */
+				if (i <= newscr->_maxy)
+				{
+					newscr->_line[i].firstchar = _NOCHANGE;
+					newscr->_line[i].lastchar = _NOCHANGE;
+					newscr->_line[i].oldindex = i;
+				}
+				if (i <= curscr->_maxy)
+				{
+					curscr->_line[i].firstchar = _NOCHANGE;
+					curscr->_line[i].lastchar = _NOCHANGE;
+					curscr->_line[i].oldindex = i;
+				}
+
+				/*
+				 * Here is our line-breakout optimization.
+				 */
+				if ((changedlines % CHECK_INTERVAL) == changedlines-1 && check_pending())
+					goto cleanup;
+ 			}
+ 		}
+ 	}
+-	T(("marking screen as updated"));
+-	for (i = 0; i <= newscr->_maxy; i++) {
+
+	/* this code won't be executed often */
+	for (i = screen_lines; i <= newscr->_maxy; i++)
+	{
+ 		newscr->_line[i].firstchar = _NOCHANGE;
+ 		newscr->_line[i].lastchar = _NOCHANGE;
+ 		newscr->_line[i].oldindex = i;
+ 	}
+-	for (i = 0; i <= curscr->_maxy; i++) {
+	for (i = screen_lines; i <= curscr->_maxy; i++)
+	{
+ 		curscr->_line[i].firstchar = _NOCHANGE;
+ 		curscr->_line[i].lastchar = _NOCHANGE;
+ 		curscr->_line[i].oldindex = i;
+@@ -346,10 +392,11 @@
+ 	curscr->_curx = newscr->_curx;
+ 	curscr->_cury = newscr->_cury;
+ 
+	GoTo(curscr->_cury, curscr->_curx);
+
+    cleanup:
+ 	if (curscr->_attrs != A_NORMAL)
+ 		vidattr(curscr->_attrs = A_NORMAL);
+-
+-	GoTo(curscr->_cury, curscr->_curx);
+ 
+ 	fflush(SP->_ofp);
+ 
+--- ncurses/lib_initscr.c	1996/01/12 20:11:34	1.1
+++ ncurses/lib_initscr.c	1996/01/12 20:17:54
+@@ -41,6 +41,10 @@
+   		exit(1);
+ 	}
+ 
+	/* allow user to set maximum escape delay from the environment */
+	if ((name = getenv("ESCDELAY")))
+	    ESCDELAY = atoi(getenv("ESCDELAY"));
+
+ 	def_shell_mode();
+ 
+ 	/* follow the XPG4 requirement to turn echo off at this point */
+--- ncurses/lib_pad.c	1995/12/29 15:34:11	1.2
+++ ncurses/lib_pad.c	1996/01/13 17:56:24
+@@ -107,6 +107,7 @@
+ short	m, n;
+ short	pmaxrow;
+ short	pmaxcol;
+bool	wide;
+ 
+ 	T(("pnoutrefresh(%p, %d, %d, %d, %d, %d, %d) called", 
+ 		win, pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol));
+@@ -140,20 +141,46 @@
+ 
+ 	T(("pad being refreshed"));
+ 
+	/*
+	 * For pure efficiency, we'd want to transfer scrolling information
+	 * from the pad to newscr whenever the window is wide enough that
+	 * its update will dominate the cost of the update for the horizontal
+	 * band of newscr that it occupies.  Unfortunately, this threshold
+	 * tends to be complex to estimate, and in any case scrolling the
+	 * whole band and rewriting the parts outside win's image would look
+	 * really ugly.  So.  What we do is consider the pad "wide" if it
+	 * either (a) occupies the whole width of newscr, or (b) occupies
+	 * all but at most one column on either vertical edge of the screen
+	 * (this caters to fussy people who put boxes around full-screen
+	 * windows).  Note that changing this formula will not break any code,
+	 * merely change the costs of various update cases.
+	 */
+	wide = (sminrow <= 1 && win->_maxx >= (newscr->_maxx - 1));
+
+ 	for (i = pminrow, m = sminrow; i <= pmaxrow; i++, m++) {
+		register struct ldat	*nline = &newscr->_line[m];
+		register struct ldat	*oline = &win->_line[i];
+
+ 		for (j = pmincol, n = smincol; j <= pmaxcol; j++, n++) {
+-		    if (win->_line[i].text[j] != newscr->_line[m].text[n]) {
+-			newscr->_line[m].text[n] = win->_line[i].text[j];
+	    		if (oline->text[j] != nline->text[n]) {
+				nline->text[n] = oline->text[j];
+
+				if (nline->firstchar == _NOCHANGE)
+		   			nline->firstchar = nline->lastchar = n;
+				else if (n < nline->firstchar)
+		   			nline->firstchar = n;
+				else if (n > nline->lastchar)
+		   			nline->lastchar = n;
+			}
+		}
+
+		if (wide) {
+		    int	oind = oline->oldindex;
+ 
+-			if (newscr->_line[m].firstchar == _NOCHANGE)
+-			    newscr->_line[m].firstchar = newscr->_line[m].lastchar = n;
+-			else if (n < newscr->_line[m].firstchar)
+-			    newscr->_line[m].firstchar = n;
+-			else if (n > newscr->_line[m].lastchar)
+-			    newscr->_line[m].lastchar = n;
+-		    }
+		    nline->oldindex = (oind == _NEWINDEX) ? _NEWINDEX : sminrow + oind;
+ 		}
+-		win->_line[i].firstchar = win->_line[i].lastchar = _NOCHANGE;
+		oline->firstchar = oline->lastchar = _NOCHANGE;
+		oline->oldindex = i;
+ 	}
+ 
+ 	win->_begx = smincol;
+@@ -176,6 +203,7 @@
+ 		newscr->_cury = win->_cury - pminrow + win->_begy;
+ 		newscr->_curx = win->_curx - pmincol + win->_begx;
+ 	}
+	win->_flags &= ~_HASMOVED;
+ 	return OK;
+ }
+ 
+--- test/ncurses.c	1996/01/11 19:49:39	1.4
+++ test/ncurses.c	1996/01/13 23:00:26
+@@ -1368,6 +1368,35 @@
+         }
+ 
+ 	mvaddch(porty - 1, portx - 1, ACS_LRCORNER);
+
+	/*
+	 * FIXME: this touchwin should not be necessary!
+	 * There is something not quite right with the pad code
+	 * Thomas Dickey writes:
+	 *
+	 * In the ncurses 'p' test, if I (now) press '<', '>', '<', then the
+	 * right boundary of the box that outlines the pad is blanked.  That's
+	 * because
+	 *
+	 * + the value that marks the right boundary (porty) is incremented,
+	 *
+	 * + a new vertical line is written to stdscr
+	 *
+	 * + stdscr is flushed with wnoutrefresh, clearing its firstchar &
+	 *   lastchar markers.  This writes the change (the new vertical line)
+	 *   to newscr.
+	 *
+	 * => previously stdscr was written to newscr entirely
+	 *
+	 * + the pad is written using prefresh, which writes directly to 
+	 *   newscr, bypassing stdscr entirely.
+	 *
+	 * When I've pressed '>' (see above), this means that stdscr contains
+	 * two columns of ACS_VLINE characters.  The left one (column 79) is
+	 * shadowed by the pad that's written to newscr.
+	 */
+	touchwin(stdscr);
+
+ 	wnoutrefresh(stdscr);
+ 
+ 	prefresh(pad,
+
+End of diffs.
+
+
--- a/diffstat/testing/case06.ref
+++ b/diffstat/testing/case06.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 ++++++++++++++++++++-----
+ test/ncurses.c         |   29 +++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06R.ref
+++ b/diffstat/testing/case06R.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 -
+ ncurses/lib_doupdate.c |   91 +++++++++++--------------------------------------
+ ncurses/lib_initscr.c  |    4 --
+ ncurses/lib_pad.c      |   48 +++++--------------------
+ test/ncurses.c         |   29 ---------------
+ 5 files changed, 32 insertions(+), 142 deletions(-)
--- a/diffstat/testing/case06Rp0.ref
+++ b/diffstat/testing/case06Rp0.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 -
+ ncurses/lib_doupdate.c |   91 +++++++++++--------------------------------------
+ ncurses/lib_initscr.c  |    4 --
+ ncurses/lib_pad.c      |   48 +++++--------------------
+ test/ncurses.c         |   29 ---------------
+ 5 files changed, 32 insertions(+), 142 deletions(-)
--- a/diffstat/testing/case06b.ref
+++ b/diffstat/testing/case06b.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 ++++++++++++++++++++-----
+ test/ncurses.c         |   29 +++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06f0.ref
+++ b/diffstat/testing/case06f0.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 	2 +	0 -	0 !
+ ncurses/lib_doupdate.c |   91 	69 +	22 -	0 !
+ ncurses/lib_initscr.c  |    4 	4 +	0 -	0 !
+ ncurses/lib_pad.c      |   48 	38 +	10 -	0 !
+ test/ncurses.c         |   29 	29 +	0 -	0 !
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06k.ref
+++ b/diffstat/testing/case06k.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 ++++++++++++++++++++-----
+ test/ncurses.c         |   29 +++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06p1.ref
+++ b/diffstat/testing/case06p1.ref
@ -0,0 +1,6 @@
+ NEWS           |    2 +
+ lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++++++++--------------
+ lib_initscr.c  |    4 ++
+ lib_pad.c      |   48 +++++++++++++++++++++++-------
+ ncurses.c      |   29 ++++++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06p9.ref
+++ b/diffstat/testing/case06p9.ref
@ -0,0 +1,6 @@
+ NEWS           |    2 +
+ lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++++++++--------------
+ lib_initscr.c  |    4 ++
+ lib_pad.c      |   48 +++++++++++++++++++++++-------
+ ncurses.c      |   29 ++++++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06r1.ref
+++ b/diffstat/testing/case06r1.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 ++++++++++++++++++++-----
+ test/ncurses.c         |   29 ++++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06r2.ref
+++ b/diffstat/testing/case06r2.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 +++++++++++++++++++++-----
+ test/ncurses.c         |   29 ++++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/diffstat/testing/case06u.ref
+++ b/diffstat/testing/case06u.ref
@ -0,0 +1,6 @@
+ NEWS                   |    2 +
+ ncurses/lib_doupdate.c |   91 +++++++++++++++++++++++++++++++++++++------------
+ ncurses/lib_initscr.c  |    4 ++
+ ncurses/lib_pad.c      |   48 ++++++++++++++++++++-----
+ test/ncurses.c         |   29 +++++++++++++++
+ 5 files changed, 142 insertions(+), 32 deletions(-)
--- a/Show More
+++ b/Show More