*** empty log message ***

Reported by Don Parsons.

THANKS

@@ -9,6 +9,7 @@ Bengt Martensson: bengt@mathematik.uni-Bremen.de
 Bjorn Helgaas: helgaas@rsn.hp.com
 Charles Karney: karney@pppl.gov
 Dirk Lattermann: dlatt@t-online.de
+Don Parsons: dparsons@synapse.kent.edu
 Eirik Fuller: eirik@netcom.com
 Eli Zaretskii: eliz@is.elta.co.il
 Emile LeBlanc: leblanc@math.toronto.edu

old/fileutils/ChangeLog

@@ -1,3 +1,43 @@
+1998-05-31  Jim Meyering  <meyering@ascend.com>
+
+	* Version 3.16p.
+
+	* src/install.c (main): Fix argv-handling bug in my 1998-05-09 change.
+	Reported by Don Parsons.
+
+1998-05-30  Jim Meyering  <meyering@ascend.com>
+
+	* tests/ls/time-1: Clean up ctime test.  Note that it fails also
+	on Solaris5.5.1 tmpfs file systems.
+
+	Solve the `rm -f rm' problem more cleanly.
+	* src/.rm-warning: Remove file.
+	* src/automake-wrap: New file.
+	* src/Makefile.am (AUTOMAKE): Define to use automake-wrap.
+	(Makefile.in): Depend on automake-wrap.
+	(EXTRA_DIST): Add automake-wrap.
+	(DISTCLEANFILES): Remove definition.
+	(rm_DEPENDENCIES): Likewise.
+	(.rm-warn-stamp): Remove rule.
+
+1998-05-27  Jim Meyering  <meyering@ascend.com>
+
+	* tests/ls/Makefile.am (TESTS): s/cr-1/rt-1/
+	* tests/ls/rt-1: New file, renamed from cr-1.
+
+1998-05-26  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* src/Makefile.am (.rm-warn-stamp): Cope with $(srcdir) != ".".
+
+	* tests/ls/cr-1: Don't use the ctime for testing, it is impossible
+	to set it reliably.
+
+1998-05-25  Jim Meyering  <meyering@ascend.com>
+
+	* configure.in (_GNU_SOURCE): AC_DEFINE it here.
+	* acconfig.h (_GNU_SOURCE): Remove definition from @TOP@ section.
+	[!_GNU_SOURCE]: Add #undef instead.
+
 1998-05-24  Jim Meyering  <meyering@ascend.com>
 
 	* Version 3.16o.

old/fileutils/NEWS

@@ -1,4 +1,7 @@
 Changes in release 3.17:
+[3.16p]
+* fix install bug introduced in 3.16o
+* build/test changes only
 [3.16o]
 * chown accepts new option, --dereference.  --no-dereference is now the default.
 * install now shares core copying code with mv and cp

src/install.c

@@ -370,11 +370,18 @@ main (int argc, char **argv)
       else
 	{
 	  int i;
-	  if (!isdir (file[1]))
-	    usage (1);
+	  const char *dest = file[n_files - 1];
+	  if (!isdir (dest))
+	    {
+	      error (0, 0,
+		     _("installing multiple files, but last argument (%s) \
+is not a directory"),
+		     dest);
+	      usage (1);
+	    }
 	  for (i = 0; i < n_files - 1; i++)
 	    {
-	      errors |= install_file_in_dir (file[i], file[n_files - 1], &x);
+	      errors |= install_file_in_dir (file[i], dest, &x);
 	    }
 	}
     }

src/test.c

@@ -2,7 +2,7 @@
 
 /* Modified to run with the GNU shell by bfox. */
 
-/* Copyright (C) 1987-1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1987-1996, 1997, 1998 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -880,7 +880,9 @@ two_arguments (void)
 
   if (STREQ (argv[pos], "!"))
     value = strlen (argv[pos+1]) == 0;
-  else if ((argv[pos][0] == '-') && (argv[pos][2] == '\0'))
+  else if (argv[pos][0] == '-'
+	   && argv[pos][1] != '\0'
+	   && argv[pos][2] == '\0')
     {
       if (unop (argv[pos][1]))
 	value = unary_operator ();

tests/ls/Makefile.am

@@ -2,6 +2,6 @@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-TESTS = cr-1 time-1
+TESTS = rt-1 time-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = LS=../../src/ls TOUCH=../../src/touch

tests/ls/Makefile.in

@@ -92,7 +92,7 @@ l = @l@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-TESTS = cr-1 time-1
+TESTS = rt-1 time-1
 EXTRA_DIST = $(TESTS)
 TESTS_ENVIRONMENT = LS=../../src/ls TOUCH=../../src/touch
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

tests/ls/rt-1

@@ -40,10 +40,10 @@ fi
 
 fail=0
 
-set `$LS -c a b c`
+set `$LS -t a b c`
 test "$*" = 'a b c' && : || fail=1
 
-set `$LS -rc a b c`
+set `$LS -rt a b c`
 test "$*" = 'c b a' && : || fail=1
 
 cd ..

tests/ls/time-1

@@ -40,13 +40,21 @@ $TOUCH -m -d "$t3" a || test_failure=1
 $TOUCH -m -d "$t2" b || test_failure=1
 $TOUCH -m -d "$t1" c || test_failure=1
 
-$TOUCH -a -d "$u1" a || test_failure=1
-$TOUCH -a -d "$u2" b || test_failure=1
 $TOUCH -a -d "$u3" c || test_failure=1
+$TOUCH -a -d "$u2" b || test_failure=1
+# Make sure A has ctime at least 1 second more recent than C's.
+sleep 2
+$TOUCH -a -d "$u1" a || test_failure=1
+
+fail=0
+
+# A has ctime more recent than C.
+set `$LS -c a c`
+test "$*" = 'a c' || fail=1
 
 # Sleep so long in an attempt to avoid spurious failures
 # due to NFS caching and/or clock skew.
-sleep 5
+sleep 2
 
 # Create a link, updating c's ctime.
 ln c d || test_failure=1
@@ -56,22 +64,23 @@ if test $test_failure = 1; then
   exit 1
 fi
 
-fail=0
-
 set `$LS -u a b c`
 test "$*" = 'c b a' && : || fail=1
 
 set `$LS -t a b c`
 test "$*" = 'a b c' && : || fail=1
 
-# C has newer ctime.
+# Now, C should have ctime more recent than A.
 set `$LS -c a c`
 if test "$*" = 'c a'; then
   : ok
 else
   # In spite of documentation, (e.g., stat(2)), neither link nor chmod
   # update a file's st_ctime on SunOS4.1.4.
-  echo "failed ls ctime test -- this is expected at least for SunOS4.1.4" >&2
+  cat >&2 << \EOF
+failed ls ctime test -- this is expected at least for SunOS4.1.4
+and for tmpfs file systems on Solaris 5.5.1.
+EOF
   fail=1
 fi