diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/ChangeLog findutils-4.1/ChangeLog --- find-4.0/ChangeLog Wed Nov 2 15:57:56 1994 +++ findutils-4.1/ChangeLog Sat Nov 5 09:52:35 1994 @@ -1,2 +1,15 @@ +Thu Nov 3 09:23:33 1994 David J. MacKenzie + + * Version 4.1. + + * locate/Makefile.am: Move updatedb from LIBSCRIPTS to SCRIPTS. + + * Makefile.am (distname): Change distribution name from find to + findutils. + + * testsuite/config/unix.exp: Don't abuse xfail; simulate it correctly. + + * locate/Makefile.am (CLEANFILES): Fix typo. + Wed Nov 2 15:11:52 1994 David J. MacKenzie diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/Makefile.am findutils-4.1/Makefile.am --- find-4.0/Makefile.am Tue Oct 18 00:06:03 1994 +++ findutils-4.1/Makefile.am Thu Nov 3 23:13:43 1994 @@ -4,3 +4,3 @@ distname: - echo find-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q find/version.c` > $@ + echo findutils-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q find/version.c` > $@ diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/Makefile.in findutils-4.1/Makefile.in --- find-4.0/Makefile.in Wed Nov 2 16:46:08 1994 +++ findutils-4.1/Makefile.in Sat Nov 5 09:45:56 1994 @@ -138,3 +138,3 @@ distname: - echo find-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q find/version.c` > $@ + echo findutils-`sed -e '/version_string/!d' -e 's/[^0-9.]*\([0-9.]*\).*/\1/' -e q find/version.c` > $@ diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/NEWS findutils-4.1/NEWS --- find-4.0/NEWS Wed Nov 2 16:00:48 1994 +++ findutils-4.1/NEWS Fri Nov 4 10:25:54 1994 @@ -1,2 +1,9 @@ +Major changes in release 4.1: + +* Distribution renamed to findutils. +* updatedb is now a user command, installed in $exec_prefix/bin + instead of $exec_prefix/libexec. +* A few problems in Makefiles and testsuite corrected. + Major changes in release 4.0: diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/doc/Makefile.in findutils-4.1/doc/Makefile.in --- find-4.0/doc/Makefile.in Wed Nov 2 16:47:27 1994 +++ findutils-4.1/doc/Makefile.in Sat Nov 5 09:44:12 1994 @@ -48,5 +48,6 @@ TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr -INFOS = find.info +INFOS = find.info* +INFO_DEPS = find.info DVIS = find.dvi SOURCES = @@ -67,5 +68,5 @@ TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $< -info:: $(INFOS) +info:: $(INFO_DEPS) dvi:: $(DVIS) @@ -73,5 +74,5 @@ install:: install-info -install-info: $(INFOS) +install-info: $(INFO_DEPS) $(top_srcdir)/mkinstalldirs $(infodir) cd $(srcdir); for file in *.info*; do \ @@ -97,5 +98,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/doc/find.texi findutils-4.1/doc/find.texi --- find-4.0/doc/find.texi Wed Nov 2 17:06:00 1994 +++ findutils-4.1/doc/find.texi Thu Nov 3 23:13:50 1994 @@ -7,6 +7,6 @@ @c %**end of header -@set EDITION 1.0 -@set VERSION 4.0 +@set EDITION 1.1 +@set VERSION 4.1 @set UPDATED November 1994 @@ -104,9 +104,18 @@ principal programs that you use to perform these tasks are @code{find}, @code{locate}, and @code{xargs}. Some of the examples in this manual -use capabilities specific to the GNU versions of those programs. If you -come up with short, interesting uses for these programs that aren't -mentioned in this manual, please email your ideas to -@code{djm@@gnu.ai.mit.edu}. The power and flexibility of these programs -encourages creative applications. +use capabilities specific to the GNU versions of those programs. + +GNU @code{find} was originally written by Eric Decker, with enhancements +by David MacKenzie, Jay Plett, and Tim Wood. GNU @code{xargs} was +originally written by Mike Rendell, with enhancements by David +MacKenzie. GNU @code{locate} and its associated utilities were +originally written by James Woods, with enhancements by David MacKenzie. +The idea for @samp{find -print0} and @samp{xargs -0} came from Dan +Bernstein. Many other people have contributed bug fixes, small +improvements, and helpful suggestions. Thanks! + +Mail suggestions and bug reports for these programs to +@code{bug-gnu-utils@@prep.ai.mit.edu}. Please include the version +number, which you can get by running @samp{find --version}. @menu @@ -119,4 +128,23 @@ @section Scope +For brevity, the word @dfn{file} in this manual means a regular file, a +directory, a symbolic link, or any other kind of node that has a +directory entry. A directory entry is also called a @dfn{file name}. A +file name may contain some, all, or none of the directories in a path +that leads to the file. These are all examples of what this manual +calls ``file names'': + +@example +parser.c +README +./budget/may-94.sc +fred/.cshrc +/usr/local/include/termcap.h +@end example + +A @dfn{directory tree} is a directory and the files it contains, all of +its subdirectories and the files they contain, etc. It can also be a +single non-directory file. + These programs enable you to find the files in one or more directory trees that: @@ -170,19 +198,4 @@ @section Overview -For brevity, the word @dfn{file} in this manual means a regular file, a -directory, a symbolic link, or any other kind of node that has a -directory entry. A directory entry is also called a @dfn{file name}. A -file name may contain some, all, or none of the directories in a path -that leads to the file. These are all examples of what this manual -calls ``file names'': - -@example -parser.c -README -./budget/may-94.sc -fred/.cshrc -/usr/local/include/termcap.h -@end example - The principal programs used for making lists of files that match given criteria and running commands on them are @code{find}, @code{locate}, @@ -2016,4 +2029,7 @@ greater than 0 if errors occur. +@xref{Primary Index}, for a summary of all of the tests, actions, and +options that the expression can contain. + @code{find} also recognizes two options for administrative use: @@ -2109,7 +2125,5 @@ whitespace, and the quotes and backslash are not special (every character is taken literally). Disables the end of file string, which -is treated like any other argument. Useful when arguments might -contain white space, quote marks, or backslashes. The GNU @code{find} -@samp{-print0} option produces input suitable for this mode. +is treated like any other argument. @item --eof@r{[}=@var{eof-str}@r{]} @@ -2177,6 +2191,5 @@ Run up to @var{max-procs} processes at a time; the default is 1. If @var{max-procs} is 0, @code{xargs} will run as many processes as -possible at a time. Use the @samp{-n} option with @samp{-P}; otherwise -chances are that only one exec will be done. +possible at a time. @end table @@ -2184,7 +2197,7 @@ @unnumbered @code{find} Primary Index -This is a list of all of the primaries that make up @code{find} -expressions for selecting files. @xref{find Expressions}, for more -information on expressions. +This is a list of all of the primaries (tests, actions, and options) +that make up @code{find} expressions for selecting files. @xref{find +Expressions}, for more information on expressions. @printindex fn diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/find/Makefile.in findutils-4.1/find/Makefile.in --- find-4.0/find/Makefile.in Wed Nov 2 16:46:46 1994 +++ findutils-4.1/find/Makefile.in Sat Nov 5 09:43:52 1994 @@ -132,5 +132,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/find/version.c findutils-4.1/find/version.c --- find-4.0/find/version.c Wed Nov 2 15:13:20 1994 +++ findutils-4.1/find/version.c Thu Nov 3 23:19:16 1994 @@ -1 +1 @@ -char *version_string = "4.0"; +char *version_string = "4.1"; diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/lib/Makefile.in findutils-4.1/lib/Makefile.in --- find-4.0/lib/Makefile.in Wed Nov 2 16:47:10 1994 +++ findutils-4.1/lib/Makefile.in Sat Nov 5 09:43:58 1994 @@ -109,5 +109,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/lib/getline.c findutils-4.1/lib/getline.c --- find-4.0/lib/getline.c Mon Sep 26 19:11:00 1994 +++ findutils-4.1/lib/getline.c Fri Nov 4 10:16:50 1994 @@ -23,4 +23,5 @@ #endif +#include #include #define NDEBUG @@ -45,5 +46,5 @@ getstr (lineptr, n, stream, terminator, offset) char **lineptr; - int *n; + size_t *n; FILE *stream; char terminator; @@ -119,5 +120,5 @@ getline (lineptr, n, stream) char **lineptr; - int *n; + size_t *n; FILE *stream; { diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/locate/Makefile.am findutils-4.1/locate/Makefile.am --- find-4.0/locate/Makefile.am Mon Oct 24 19:04:49 1994 +++ findutils-4.1/locate/Makefile.am Thu Nov 3 23:28:44 1994 @@ -4,10 +4,10 @@ PROGRAMS = locate LIBPROGRAMS = frcode code bigram -LIBSCRIPTS = updatedb +SCRIPTS = updatedb MANS = locate.1 updatedb.1 locatedb.5 CONFIG_HEADER = ../config.h DIST_OTHER = locatedb.h updatedb.sh -CLEANFILES = updatedb.sh +CLEANFILES = updatedb INCLUDES = -I.. -I$(top_srcdir)/lib -DLOCATE_DB=\"$(LOCATE_DB)\" diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/locate/Makefile.in findutils-4.1/locate/Makefile.in --- find-4.0/locate/Makefile.in Wed Nov 2 16:47:00 1994 +++ findutils-4.1/locate/Makefile.in Sat Nov 5 09:44:08 1994 @@ -73,10 +73,10 @@ PROGRAMS = locate LIBPROGRAMS = frcode code bigram -LIBSCRIPTS = updatedb +SCRIPTS = updatedb MANS = locate.1 updatedb.1 locatedb.5 CONFIG_HEADER = ../config.h DIST_OTHER = locatedb.h updatedb.sh -CLEANFILES = updatedb.sh +CLEANFILES = updatedb INCLUDES = -I.. -I$(top_srcdir)/lib -DLOCATE_DB=\"$(LOCATE_DB)\" @@ -174,5 +174,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/testsuite/Makefile.in findutils-4.1/testsuite/Makefile.in --- find-4.0/testsuite/Makefile.in Wed Nov 2 16:47:33 1994 +++ findutils-4.1/testsuite/Makefile.in Sat Nov 5 09:44:25 1994 @@ -71,5 +71,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/testsuite/config/unix.exp findutils-4.1/testsuite/config/unix.exp --- find-4.0/testsuite/config/unix.exp Tue Oct 4 12:13:20 1994 +++ findutils-4.1/testsuite/config/unix.exp Thu Nov 3 09:31:40 1994 @@ -43,5 +43,4 @@ # Called by individual test scripts. proc xargs_start { passfail options infile } { - global xfail_flag global verbose global XARGS @@ -54,7 +53,5 @@ } - if [string match "f*" $passfail] then { - set xfail_flag 1 - } + set fail_good [string match "f*" $passfail] set scriptname [uplevel {info script}] @@ -81,5 +78,9 @@ send_user "$comp_output\n" } - fail "$testname, $comp_output" + if $fail_good then { + pass "$testname" + } else { + fail "$testname, $comp_output" + } return } diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure find-4.0/xargs/Makefile.in findutils-4.1/xargs/Makefile.in --- find-4.0/xargs/Makefile.in Wed Nov 2 16:47:18 1994 +++ findutils-4.1/xargs/Makefile.in Sat Nov 5 09:44:18 1994 @@ -131,5 +131,5 @@ realclean: distclean - rm -f TAGS + rm -f TAGS $(INFOS) dist: $(DIST_FILES) $(DIST_DIRS)