.

variables: src_sb_no_link, dst_sb_no_link.

doc/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -155,7 +155,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
-$(srcdir)/version.texi: stamp-vti
+$(srcdir)/version.texi: $(srcdir)/stamp-vti
 	@:
 
 $(srcdir)/stamp-vti: fileutils.texi $(top_srcdir)/configure.in
@@ -180,8 +180,8 @@ distclean-vti:
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 
-fileutils.info: fileutils.texi version.texi
-fileutils.dvi: fileutils.texi version.texi
+fileutils.info: fileutils.texi $(srcdir)/version.texi
+fileutils.dvi: fileutils.texi $(srcdir)/version.texi
 
 
 DVIPS = dvips

lib/ChangeLog

@@ -1,3 +1,9 @@
+2000-12-24  Jim Meyering  <meyering@lucent.com>
+
+	* hash.c (is_prime): Return explicit boolean values.
+	(hash_get_first): Return NULL to appease Irix5.6's 89.
+	Reported by Nelson Beebe.
+
 2000-10-31  Bruno Haible  <haible@clisp.cons.org>
 
 	* localcharset.c (locale_charset): Add support for Win32.

lib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -257,7 +257,7 @@ OBJECTS = $(am_libfetish_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .c .o .sed .sin .y
+.SUFFIXES: .sed .sin .c .o .y
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile
 
@@ -575,6 +575,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $$here
+
 mostlyclean-tags:
 
 clean-tags:
@@ -735,6 +740,9 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
+all-recursive-am: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
 install-exec-am: install-exec-local
 install-exec: install-exec-am
 
@@ -799,12 +807,12 @@ maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
 maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
 maintainer-clean-tags mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-local install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-local all-redirect all-am \
-all install-strip installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+installcheck-am installcheck all-recursive-am install-exec-local \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-local uninstall-am uninstall all-local all-redirect \
+all-am all install-strip installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 lstat.c: xstat.in
 	sed \

lib/hash.c

@@ -263,6 +263,7 @@ hash_get_first (const Hash_table *table)
       return bucket->data;
 
   assert (0);
+  return NULL;
 }
 
 /* Return the user data for the entry following ENTRY, where ENTRY has been
@@ -422,7 +423,7 @@ is_prime (unsigned long candidate)
       divisor++;
     }
 
-  return candidate % divisor != 0;
+  return (candidate % divisor ? true : false);
 }
 
 /* Round a given CANDIDATE number up to the nearest prime, and return that

m4/ChangeLog

@@ -1,3 +1,8 @@
+2000-12-26  Jim Meyering  <meyering@lucent.com>
+
+	* dos.m4 (jm_AC_DOS): Rewrite (though it's still a stub) to work better
+	with autoheader.
+
 2000-12-17  Jim Meyering  <meyering@lucent.com>
 
 	* dos.m4 (jm_AC_DOS): New file and macro.

m4/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

m4/dos.m4

@@ -1,4 +1,4 @@
-# serial 1
+# serial 2
 
 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.
@@ -11,17 +11,31 @@ AC_DEFUN(jm_AC_DOS,
     # like this:
     #if defined _WIN32 || defined __WIN32__ || defined __MSDOS__
 
-    ac_fspl_def="((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)"
-    ac_fspl_def=0
-    AC_DEFINE_UNQUOTED([FILESYSTEM_PREFIX_LEN(Filename)], $ac_fspl_def,
-      [On systems for which file names may have a so-called `drive letter'
-       prefix, define this to compute the length of that prefix, including
-       the colon.  Otherwise, define it to zero.])
+    AH_VERBATIM(FILESYSTEM_PREFIX_LEN,
+    [#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+# define FILESYSTEM_PREFIX_LEN(Filename) \
+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
+else
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif])
 
-    ac_isslash_def="((C) == '/' || (C) == '\\')"
-    ac_isslash_def="((C) == '/')"
-    AC_DEFINE_UNQUOTED([ISSLASH(C)], $ac_isslash_def,
-      [Define to return nonzero for any character that may serve as
-       a file name component separator.  On POSIX systems, it is the
-       slash character.  Some other systems also accept backslash.])
+    ac_fs_accepts_drive_letter_prefix=0
+    AC_DEFINE_UNQUOTED([FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
+      $ac_fs_accepts_drive_letter_prefix,
+      [Define on systems for which file names may have a so-called
+       `drive letter' prefix, define this to compute the length of that
+       prefix, including the colon.])
+
+    AH_VERBATIM(ISSLASH,
+    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
+# define ISSLASH(C) ((C) == '/' || (C) == '\\\\')
+#else
+# define ISSLASH(C) ((C) == '/')
+#endif])
+
+    ac_fs_backslash_is_file_name_separator=0
+    AC_DEFINE_UNQUOTED([FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
+      $ac_fs_backslash_is_file_name_separator,
+      [Define if the backslash character may also serve as a file name
+       component separator.])
   ])

man/help2man

@@ -27,7 +27,7 @@ use Text::Tabs qw(expand);
 use POSIX qw(strftime setlocale LC_TIME);
 
 my $this_program = 'help2man';
-my $this_version = '1.23';
+my $this_version = '1.24';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
@@ -59,18 +59,20 @@ EOT
 
 my $section = 1;
 my ($opt_name, @opt_include, $opt_output, $opt_no_info);
-
-# Parse options.
-Getopt::Long::config('bundling');
-GetOptions (
+my %opt_def = (
     'n|name=s'		=> \$opt_name,
     's|section=s'	=> \$section,
     'i|include=s'	=> sub { push @opt_include, [ pop, 1 ] },
     'I|opt-include=s'	=> sub { push @opt_include, [ pop, 0 ] },
     'o|output=s'	=> \$opt_output,
     'N|no-info'		=> \$opt_no_info,
-    help		=> sub { print $help_info; exit },
-    version		=> sub { print $version_info; exit },
+);
+
+# Parse options.
+Getopt::Long::config('bundling');
+GetOptions (%opt_def,
+    help    => sub { print $help_info; exit },
+    version => sub { print $version_info; exit },
 ) or die $help_info;
 
 die $help_info unless @ARGV == 1;
@@ -93,9 +95,9 @@ BEGIN { eval q(sub qr { '' =~ $_[0]; $_[0] }) if $] < 5.005 }
 #   verbatim text
 #
 
-for (@opt_include)
+while (@opt_include)
 {
-    my ($inc, $required) = @$_;
+    my ($inc, $required) = @{shift @opt_include};
 
     next unless -f $inc or $required;
     die "$this_program: can't open `$inc' ($!)\n"
@@ -134,9 +136,20 @@ for (@opt_include)
 	    next;
 	}
 
-	# Silently ignore anything before the first
-	# section--allows for comments and revision info.
-	next unless $key;
+	# Check for options before the first section--anything else is
+	# silently ignored, allowing the first for comments and
+	# revision info.
+	unless ($key)
+	{
+	    # handle options
+	    if (/^-/)
+	    {
+		local @ARGV = split;
+		GetOptions %opt_def;
+	    }
+
+	    next;
+	}
 
 	$hash->{$key} ||= '';
 	$hash->{$key} .= $_;

old/fileutils/ChangeLog

@@ -1,3 +1,41 @@
+2000-12-26  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.35.
+
+	* Regenerate build/config framework to use automake-1.4b and
+	the latest CVS version autoconf.
+	
+	* tests/mkdir/perm: Disable the test if the working directory has
+	the sticky bit set.
+	* tests/cp/cp-parents: Likewise.
+	Reported by Nelson Beebe.
+
+2000-12-25  Jim Meyering  <meyering@lucent.com>
+
+	Clean-up to avoid warnings from Irix's c89.
+	* src/remove.c (hash_compare_active_dir_ents): Return explicit `true'
+	or `false', rather than relying on implicit int-to-enum cast.
+	* src/copy.c (same_file_ok): Remove declaration and set of unused
+	variables: src_sb_no_link, dst_sb_no_link.
+	* src/ls.c (extract_dirs_from_files): Remove unused variable.
+	Reported by Nelson Beebe.
+
+	* src/ls.c (gobble_file): Move decl of local, val, into the scope
+	where it's used.
+
+2000-12-24  Jim Meyering  <meyering@lucent.com>
+
+	For both ln and install, when using `--backup=simple --suffix=S',
+	the suffix `S' wasn't used.
+
+	* src/ln.c (main): Actually use the local variable,
+	`backup_suffix_string'.
+	* src/install.c (main): Likewise.
+	Nelson Beebe reported the unused variables.
+	* tests/ln/misc: Add a test for this (for all of cp, mv, ln, install).
+
+	* man/help2man: Update to version 1.24.
+
 2000-12-22  Jim Meyering  <meyering@lucent.com>
 
 	* Version 4.0.34.

old/fileutils/NEWS

@@ -1,4 +1,7 @@
 Changes in release 4.01:
+[4.0.35]
+* ln --backup=simple --suffix=SUFFIX once again uses SUFFIX
+* install: Likewise.
 [4.0.34]
 * fix a bug (introduced in 4.0z) that made `chown 123:456 file' act like
     `chown 123:123 file'.  Other uses with a numeric group ID would cause

old/textutils/ChangeLog

@@ -1,3 +1,7 @@
+2000-12-23  Jim Meyering  <meyering@lucent.com>
+
+	* src/sys2.h [HAVE_INTTYPES_H]: Include <inttypes.h>.
+
 2000-12-19  Jim Meyering  <meyering@lucent.com>
 
 	* Version 2.0.11.

src/copy.c

@@ -392,8 +392,6 @@ same_file_ok (const char *src_path, const struct stat *src_sb,
 {
   const struct stat *src_sb_link;
   const struct stat *dst_sb_link;
-  const struct stat *src_sb_no_link;
-  const struct stat *dst_sb_no_link;
 
   int same_link;
   int same = (SAME_INODE (*src_sb, *dst_sb));
@@ -527,13 +525,6 @@ same_file_ok (const char *src_path, const struct stat *src_sb,
 	  *return_now = 1;
 	  return 1;
 	}
-      src_sb_no_link = &tmp_src_sb;
-      dst_sb_no_link = &tmp_dst_sb;
-    }
-  else
-    {
-      src_sb_no_link = src_sb;
-      dst_sb_no_link = dst_sb;
     }
 
   return 0;

src/install.c

@@ -273,8 +273,13 @@ main (int argc, char **argv)
     error (1, 0,
 	   _("the strip option may not be used when installing a directory"));
 
-  if (make_backups)
-    x.backup_type = xget_version ("backup type", version_control_string);
+  if (backup_suffix_string)
+    simple_backup_suffix = xstrdup (backup_suffix_string);
+
+  x.backup_type = (make_backups
+		   ? xget_version (_("backup type"),
+				   version_control_string)
+		   : none);
 
   n_files = argc - optind;
   file = argv + optind;

src/ln.c

@@ -511,6 +511,9 @@ main (int argc, char **argv)
       usage (1);
     }
 
+  if (backup_suffix_string)
+    simple_backup_suffix = xstrdup (backup_suffix_string);
+
   backup_type = (make_backups
 		 ? xget_version (_("backup type"), version_control_string)
 		 : none);

src/ls.c

@@ -1860,7 +1860,6 @@ gobble_file (const char *name, enum filetype type, int explicit_arg,
 	     const char *dirname)
 {
   register uintmax_t blocks;
-  register int val;
   register char *path;
 
   if (files_index == nfiles)
@@ -1878,6 +1877,7 @@ gobble_file (const char *name, enum filetype type, int explicit_arg,
       || (format_needs_type && type == unknown))
     {
       /* `path' is the absolute pathname of this file. */
+      int val;
 
       if (name[0] == '/' || dirname[0] == 0)
 	path = (char *) name;
@@ -2068,9 +2068,7 @@ static void
 extract_dirs_from_files (const char *dirname, int recursive)
 {
   register int i, j;
-  int dirlen;
 
-  dirlen = strlen (dirname) + 2;
   /* Queue the directories last one first, because queueing reverses the
      order.  */
   for (i = files_index - 1; i >= 0; i--)

src/remove.c

@@ -171,7 +171,7 @@ hash_compare_active_dir_ents (void const *x, void const *y)
 {
   struct active_dir_ent const *a = x;
   struct active_dir_ent const *b = y;
-  return SAME_INODE (*a, *b);
+  return SAME_INODE (*a, *b) ? true : false;
 }
 
 /* A hash function for null-terminated char* strings using

tests/chgrp/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/chmod/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/cp/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/cp/cp-parents

@@ -14,9 +14,16 @@ tmp=cp-parents.$$
 trap 'status=$?; cd $pwd; exec 1>&2; rm -rf $tmp && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
+framework_failure=0
+
+# Record absolute path of srcdir and cd back to current dir.
+cd $srcdir || framework_failure=1
+abs_srcdir=`pwd`
+cd $pwd || framework_failure=1
+
+. $abs_srcdir/../sticky-check
 . $srcdir/../envvar-check
 
-framework_failure=0
 mkdir $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 mkdir foo bar || framework_failure=1

tests/dd/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/dircolors/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/du/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/install/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/ln/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/ln/misc

@@ -1,17 +1,19 @@
 #!/bin/sh
 
-tmp=t2-ln.$$
-
 if test "$VERBOSE" = yes; then
   set -x
   ln --version
 fi
 
+pwd=`pwd`
+tmp=t2-ln.$$
+trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
 framework_failure=0
 mkdir $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 
-
 t=tln-symlink
 d=tln-subdir
 ld=tln-symlink-to-subdir
@@ -113,8 +115,16 @@ fi
 rm -rf a symlink hard-to-sym hard-to-dangle
 # ===================================================
 
-cd ..
-../../src/rm -rf $tmp
+# Make sure ln can make simple backups.
+# This was fixed in 4.0.34.  Broken in 4.0r.
+for cmd in ln cp mv ginstall; do
+  rm -rf a x a.orig
+  touch a x || framework_failure=1
+  $cmd --backup=simple --suffix=.orig x a || fail=1
+  test -f a.orig || fail=1
+done
+
+# ===================================================
 
 if test $framework_failure = 1; then
   echo 'failure in testing framework' 1>&2

tests/ls-2/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/ls/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/mkdir/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/mkdir/perm

@@ -13,6 +13,12 @@ trap 'status=$?; cd $pwd; chmod -R u+rwx $tmp; rm -rf $tmp && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 framework_failure=0
+
+# Record absolute path of srcdir and cd back to current dir.
+cd $srcdir || framework_failure=1
+abs_srcdir=`pwd`
+cd $pwd || framework_failure=1
+
 mkdir $tmp || framework_failure=1
 cd $tmp || framework_failure=1
 
@@ -21,6 +27,8 @@ if test $framework_failure = 1; then
   (exit 1); exit
 fi
 
+. $abs_srcdir/../sticky-check
+
 fail=0
 
 #                         parent        parent/dir

tests/mv/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/rm/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/rmdir/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/shred/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

tests/touch/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4b from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.