This file contains unidiffs from version 1.2 to version 1.3 of GNU hello. Changes in files generated by TeX, etags, and makeinfo have been omitted. diff -ruN hello-1.2/ChangeLog hello-1.3/ChangeLog --- hello-1.2/ChangeLog Fri May 21 20:04:39 1993 +++ hello-1.3/ChangeLog Sat May 22 21:37:31 1993 @@ -1,3 +1,19 @@ +Sat May 22 20:36:28 1993 The King (elvis@graceland.gnu.ai.mit.edu) + + * Version 1.3 released. + + * Makefile.in (DISTFILES): Add hello.?? and hello.??s. + (dist): Use tar's o flag to make compatible archives. + + * hello.c (main): Exit with 0, not 1, under -h and -v. + + * Makefile.in (DISTFILES): Add mkinstalldirs. + + * Makefile.in (binprefix): New variable. + (install): Use it. + + * Makefile.in (all): Don't depend on info. + Fri May 21 20:04:14 1993 The King (elvis@graceland.gnu.ai.mit.edu) * Version 1.2 released. diff -ruN hello-1.2/Makefile.in hello-1.3/Makefile.in --- hello-1.2/Makefile.in Wed May 19 22:20:31 1993 +++ hello-1.3/Makefile.in Sat May 22 21:37:13 1993 @@ -40,6 +40,9 @@ bindir = $(exec_prefix)/bin infodir = $(prefix)/info +# Prefix to be prepended to each installed program, normally empty or `g'. +binprefix = + #### End of system configuration section. #### SHELL = /bin/sh @@ -48,10 +51,11 @@ OBJS = hello.o version.o getopt.o getopt1.o @ALLOCA@ HDRS = getopt.h DISTFILES = $(SRCS) $(HDRS) COPYING ChangeLog NEWS Makefile.in \ - README INSTALL hello.texi gpl.texinfo configure configure.in \ - texinfo.tex hello.info testdata TAGS + README INSTALL hello.texi hello.?? hello.??s gpl.texinfo \ + configure configure.in \ + mkinstalldirs texinfo.tex hello.info testdata TAGS -all: hello info +all: hello .PHONY: all .PHONY: info dvi @@ -63,7 +67,7 @@ .PHONY: install installdirs install: installdirs hello hello.info - $(INSTALL_PROGRAM) hello $(bindir)/hello + $(INSTALL_PROGRAM) hello $(bindir)/$(binprefix)hello -$(INSTALL_DATA) $(srcdir)/hello.info $(infodir)/hello.info installdirs: ${srcdir}/mkinstalldirs $(bindir) $(infodir) @@ -112,7 +116,7 @@ rm -rf `cat .fname` mkdir `cat .fname` ln $(DISTFILES) `cat .fname` - tar chzf `cat .fname`.tar.z `cat .fname` + tar chozf `cat .fname`.tar.z `cat .fname` rm -rf `cat .fname` .fname # Prevent GNU make v3 from overflowing arg limit on SysV. diff -ruN hello-1.2/NEWS hello-1.3/NEWS --- hello-1.2/NEWS Fri May 21 19:58:31 1993 +++ hello-1.3/NEWS Sat May 22 20:51:56 1993 @@ -1,9 +1,15 @@ -GNU Hello NEWS -- history of user-visible changes. 16 September 1992 +GNU Hello NEWS -- history of user-visible changes. 22 May 1993 Copyright (C) 1992, 1993 Free Software Foundation, Inc. See the end for copying conditions. Please send GNU Hello bug reports to bug-gnu-hello@prep.ai.mit.edu. + +Version 1.3 + +* GNU hello now exits immediately and successfully after printing its + version number and/or usage message under the `--version' (or `-v') and + `--help' (or `-h') options. Version 1.2 diff -ruN hello-1.2/hello.c hello-1.3/hello.c --- hello-1.2/hello.c Wed May 19 22:47:08 1993 +++ hello-1.3/hello.c Sat May 22 20:43:29 1993 @@ -130,7 +130,7 @@ /* Print version number. */ fprintf (stderr, "%s\n", version); if (! h) - exit (1); + exit (0); } if (h) @@ -145,7 +145,7 @@ stderr); fputs (" -v, --version\t\t\tPrint the version number\n", stderr); fputs (" -m, --mail\t\t\tPrint your mail\n", stderr); - exit (1); + exit (0); } /* Print greeting message and exit. */ diff -ruN hello-1.2/hello.texi hello-1.3/hello.texi --- hello-1.2/hello.texi Wed May 19 22:04:20 1993 +++ hello-1.3/hello.texi Sat May 22 21:27:15 1993 @@ -6,9 +6,9 @@ @setchapternewpage odd @c %**end of header -@set EDITION 1.02 -@set VERSION 1.2 -@set UPDATED 19 May 1993 +@set EDITION 1.03 +@set VERSION 1.3 +@set UPDATED 22 May 1993 @ifinfo This file documents the the GNU @code{hello} command for printing a @@ -84,6 +84,9 @@ @node Instructions, Copying, , Top @chapter How to Read This Manual +@cindex reading +@cindex manual, how to read +@cindex how to read To read this manual, begin at the beginning, reading from left to right and top to bottom, until you get to the end. Then stop. You may pause for a beer anywhere in the middle as well, if you wish. (Please note, @@ -123,16 +126,16 @@ @example This is GNU Hello, THE greeting printing program. -usage: hello [-htv] [--help] [--traditional] [--version] +Usage: hello [-htvm] [--help] [--traditional] [--version] [--mail] -h, --help Print a summary of the options - -t, --traditional Use traditional greeting format + -t, --traditional Use traditional greeting format -v, --version Print the version number + -m, --mail Print your mail @end example -This is the output of the command @samp{hello --version --traditional}: +This is the output of the command @samp{hello --traditional}: @example -GNU Hello, version 1.1 hello, world @end example @@ -140,6 +143,10 @@ @chapter Invoking @code{hello} @cindex invoking @cindex version +@cindex options +@cindex usage +@cindex help +@cindex getting help The format for running the @code{hello} program is: @@ -152,21 +159,34 @@ @table @samp @item --help @itemx -h -Print an informative help message describing the options. +Print an informative help message describing the options and then exit. @item --version @itemx -v -Print the version number of @code{hello} on the standard error output. +Print the version number of @code{hello} on the standard error output +and then exit. @item --traditional @itemx -t +@cindex traditional +@cindex modern Use the traditional greeting message @samp{hello, world} rather than the more modern @samp{Hello, world!}. + +@item --mail +@itemx -m +@cindex mail +@cindex creeping feature +@cindex feature, creeping +@cindex feeping creature +@cindex creature, feeping +Print your mail on the standard output. @end table @node Problems, Concept Index, Invoking hello, Top @chapter Reporting Bugs @cindex bugs +@cindex problems If you find a bug in GNU @code{hello}, please send electronic mail to @w{@samp{bug-gnu-hello@@prep.ai.mit.edu}}. Include the version @@ -182,6 +202,7 @@ @node Concept Index, , Problems, Top @unnumbered Concept Index +@cindex tail recursion @printindex cp @shortcontents diff -ruN hello-1.2/mkinstalldirs hello-1.3/mkinstalldirs --- hello-1.2/mkinstalldirs +++ hello-1.3/mkinstalldirs Sat May 22 20:14:19 1993 @@ -0,0 +1,33 @@ +#!/bin/sh +# Make directory hierarchy. +# Written by Noah Friedman +# Public domain. + +defaultIFS=' +' +IFS="${IFS-${defaultIFS}}" + +for file in ${1+"$@"} ; do + oIFS="${IFS}" + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set - `echo ${file} | sed -e 's@/@%@g' -e 's@^%@/@'` + IFS="${oIFS}" + test ".${1}" = "." && shift + + pathcomp='' + + while test $# -ne 0 ; do + pathcomp="${pathcomp}${1}" + shift + + if test ! -d "${pathcomp}"; then + echo "mkdir $pathcomp" 1>&2 + mkdir "${pathcomp}" + fi + + pathcomp="${pathcomp}/" + done +done + +# eof diff -ruN hello-1.2/version.c hello-1.3/version.c --- hello-1.2/version.c Wed May 19 22:47:31 1993 +++ hello-1.3/version.c Sat May 22 20:43:58 1993 @@ -1 +1 @@ -char version[] = "GNU Hello, version 1.2"; +char version[] = "GNU Hello, version 1.3";