.

it includes the patch required for `large file' support with at least
HP-UX's 10.20 /bin/cc.

Makefile.maint

@@ -78,15 +78,16 @@ my-distcheck: writable-files po-check
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"
 
-a_host = alpha.gnu.org
+a_host = fencepost.gnu.org
 b_host = freefriends.org
 
 alpha_subdir = gnu/fetish
 a_url_dir = $(alpha_subdir)
 b_url_dir = $(alpha_subdir)
 
-a_real_dir = /fs/share/ftp/$(alpha_subdir)
-b_real_dir = fetish-ftp
+# This must be the same name on both hosts.
+# Make it a symlink that points to the right place.
+real_dir = fetish-ftp
 
 url_dir_list = $(foreach x,a b,ftp://$($(x)_host)/$($(x)_url_dir))
 
@@ -172,8 +173,9 @@ alpha: writable-files po-check
 	cvs ci -m. $(prev_version_file)
 	@echo =====================================
 	@echo =====================================
-	@echo 'rsync -e ssh --pro -av $(xd-delta) $(distdir).tar.gz \'
-	@echo '  $(b_host):$(b_real_dir)'
+	@echo 'for host in $(a_host) $(b_host); do \'
+	@echo '  rsync -e ssh --pro -av $(xd-delta) $(distdir).tar.gz \'
+	@echo '    $(b_host):$(b_real_dir); done'
 	@echo '# send the /tmp/announcement e-mail'
 	@echo =====================================
 	@echo =====================================

THANKS

@@ -34,6 +34,7 @@ Arne H. Juul                        arnej@solan.unit.no
 Arne Henrik Juul                    arnej@imf.unit.no
 Arthur Pool                         pool@commerce.uq.edu.au
 Austin Donnelly                     Austin.Donnelly@cl.cam.ac.uk
+Axel Kittenberger                   Anshil@gmx.net
 Bauke Jan Douma                     bjdouma@xs4all.nl
 Bengt Martensson                    bengt@mathematik.uni-Bremen.de
 Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
@@ -153,6 +154,7 @@ John Roll                           john@panic.harvard.edu
 John Salmon                         johns@mullet.anu.edu.au
 John Summerfield                    summer@OS2.ami.com.au
 Joost van Baal                      joostvb@xs4all.nl
+Jorge Stolfi                        stolfi@ic.unicamp.br
 Joseph S. Myers                     jsm28@cam.ac.uk
 Jungshik Shin                       jshin@pantheon.yale.edu
 Jürgen Fluk                         louis@dachau.marco.de
@@ -213,6 +215,7 @@ Michael Deutschmann                 michael@talamasca.ocis.net
 Michael Hasselberg                  mikelh@zonta.ping.de
 Michael Hohn                        hohn@math.utah.edu
 Michael J. Croghan                  mcroghan@usatoday.com
+Michael Steffens                    michael.steffens@s.netic.de
 Michael Stone                       mstone@debian.org
 Michael Stutz                       stutz@dsl.org
 Michael Veksler                     mveksler@techunix.technion.ac.il
@@ -226,6 +229,7 @@ Niklas Edmundsson                   nikke@acc.umu.se
 Noah Friedman                       friedman@splode.com
 Noel Cragg                          noel@red-bean.com
 Olav Morkrid                        olav@funcom.com
+Oskar Liljeblad                     osk@hem.passagen.se
 Ørn E. Hansen                       oehansen@daimi.aau.dk
 Paul Eggert                         eggert@twinsun.com
 Paul Nevai                          nevai@ops.mps.ohio-state.edu

lib/ChangeLog

@@ -1,3 +1,22 @@
+2001-02-07  Jim Meyering  <meyering@lucent.com>
+
+	* regex.c: Update from libc.
+
+2001-01-30  Bruno Haible  <haible@clisp.cons.org>
+
+	* config.charset: Update for FreeBSD 4.2.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* quotearg.c: Include stddef.h.
+	* quote.c: Include stddef.h.
+	Reported by Axel Kittenberger.
+
+	* xmalloc.c [HAVE_DONE_WORKING_MALLOC_CHECK]: Enclose error-evoking
+	line in double quotes so that it evokes a better diagnostic.
+	[HAVE_DONE_WORKING_REALLOC_CHECK]: Likewise.
+	Reported by Axel Kittenberger.
+
 2001-01-15  Bruno Haible  <haible@clisp.cons.org>
 
 	* unicodeio.c (print_unicode_char): Cast the second iconv() arg,

lib/config.charset

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -205,27 +205,39 @@ case "$os" in
 	echo "UTF-8 UTF-8"
 	;;
     freebsd*)
-	# FreeBSD 3.3 doesn't have nl_langinfo(CODESET); therefore
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
 	echo "C ASCII"
 	echo "US-ASCII ASCII"
-	for l in lt_LN; do
+	for l in la_LN lt_LN; do
 	  echo "$l.ASCII ASCII"
 	done
 	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-                 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT lt_LN \
-                 nl_BE nl_NL no_NO pt_PT sv_SE; do
+                 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+                 lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
 	  echo "$l.ISO_8859-1 ISO-8859-1"
 	  echo "$l.DIS_8859-15 ISO-8859-15"
 	done
-	for l in hr_HR hu_HU lt_LN pl_PL sl_SI; do
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
 	  echo "$l.ISO_8859-2 ISO-8859-2"
 	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
 	for l in ru_RU ru_SU; do
 	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
 	  echo "$l.CP866 CP866"
 	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SJIS"
+	echo "ja_JP.Shift_JIS SJIS"
+	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.

lib/quote.c

@@ -4,6 +4,9 @@
 # include <config.h>
 #endif
 
+#if HAVE_STDDEF_H
+# include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
+#endif
 #include <sys/types.h>
 #include <quotearg.h>
 #include <quote.h>

lib/quotearg.c

@@ -1,5 +1,5 @@
 /* quotearg.c - quote arguments for output
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,9 @@
 # include <config.h>
 #endif
 
+#if HAVE_STDDEF_H
+# include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
+#endif
 #include <sys/types.h>
 #include <quotearg.h>
 #include <xalloc.h>

lib/xmalloc.c

@@ -47,11 +47,11 @@ void free ();
 #endif
 
 #ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
+"you must run the autoconf test for a properly working malloc -- see malloc.m4"
 #endif
 
 #ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+"you must run the autoconf test for a properly working realloc --see realloc.m4"
 #endif
 
 /* Exit value when the requested amount of memory is not available.

m4/ChangeLog

@@ -1,3 +1,38 @@
+2001-02-07  Jim Meyering  <meyering@lucent.com>
+
+	* regex.m4 (jm_INCLUDED_REGEX): Add a test for the latest bug.
+
+2001-02-05  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4: Require autoconf-2.14d (not yet released), because
+	it includes the patch required for `large file' support with at least
+	HP-UX's 10.20 /bin/cc.
+
+2001-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Restore prior use of
+	AS_IF, now that it works once again (mysteriously).
+	* fsusage.m4 (jm_FILE_SYSTEM_USAGE): Likewise.
+
+2001-01-30  Jim Meyering  <meyering@lucent.com>
+
+	Don't use filenames that are 8.3-equivalent to "conftest" on DOS.
+	* chown.m4: Rename conftestchown to conftest.chown.
+	* rename.m4: s/conftestdir/conftest.d1/ and s/conftestdir2/conftest.d2/.
+	* utimes.m4: s/conftestdata/conftest.data/
+	Inspired by Pavel Roskin's change in autoconf.
+
+2001-01-27  Jim Meyering  <meyering@lucent.com>
+
+	* ls-mntd-fs.m4 (jm_LIST_MOUNTED_FILESYSTEMS): Open-code what was
+	a use of AS_IF.
+	* fsusage.m4 (jm_FILE_SYSTEM_USAGE): Likewise.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* prereq.m4 (jm_PREREQ_QUOTEARG): Check for stddef.h, now that
+	quotearg.c includes it.
+
 2001-01-15  Bruno Haible  <haible@clisp.cons.org>
 
 	* iconv.m4 (jm_ICONV): Also check whether the iconv declaration

m4/chown.m4

@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl Determine whether chown accepts arguments of -1 for uid and gid.
@@ -21,7 +21,7 @@ AC_DEFUN(jm_FUNC_CHOWN,
     int
     main ()
     {
-      char *f = "conftestchown";
+      char *f = "conftest.chown";
       struct stat before, after;
 
       if (creat (f, 0600) < 0)

m4/fsusage.m4

@@ -1,4 +1,4 @@
-#serial 5
+#serial 7
 
 # From fileutils/configure.in
 
@@ -179,14 +179,15 @@ if test $ac_fsusage_space = no; then
 fi
 
 if test $ac_fsusage_space = no; then
-# SVR2
-AC_TRY_CPP([#include <sys/filsys.h>],
-  AC_DEFINE(STAT_READ_FILSYS, 1,
-[  Define if there is no specific function for reading filesystems usage
-   information and you have the <sys/filsys.h> header file.  (SVR2)])
-  ac_fsusage_space=yes)
+  # SVR2
+  AC_TRY_CPP([#include <sys/filsys.h>
+    ],
+    AC_DEFINE(STAT_READ_FILSYS, 1,
+      [Define if there is no specific function for reading filesystems usage
+       information and you have the <sys/filsys.h> header file.  (SVR2)])
+    ac_fsusage_space=yes)
 fi
 
-AS_IF([test $ac_fsusage_space = yes], [$1], [$2])dnl
+AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
 
 ])

m4/jm-macros.m4

@@ -1,10 +1,10 @@
-#serial 31   -*- autoconf -*-
+#serial 32   -*- autoconf -*-
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
 AC_DEFUN(jm_MACROS,
 [
-  AC_PREREQ(2.14a)
+  AC_PREREQ(2.14d)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",

m4/ls-mntd-fs.m4

@@ -1,4 +1,4 @@
-#serial 7
+#serial 9
 
 dnl From Jim Meyering.
 dnl
@@ -237,6 +237,6 @@ if test -z "$ac_list_mounted_fs"; then
   # Can't build mountlist.c or anything that needs its functions
 fi
 
-AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])dnl
+AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
 
   ])

m4/prereq.m4

@@ -1,4 +1,4 @@
-#serial 15
+#serial 16
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
@@ -78,7 +78,7 @@ AC_DEFUN(jm_PREREQ_MEMCHR,
 AC_DEFUN(jm_PREREQ_QUOTEARG,
 [
   AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AC_MBSTATE_T

m4/regex.m4

@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -28,6 +28,7 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	  {
 	    static struct re_pattern_buffer regex;
 	    const char *s;
+	    struct re_registers regs;
 	    re_set_syntax (RE_SYNTAX_POSIX_EGREP);
 	    /* Add this third left square bracket, [, to balance the
 	       three right ones below.  Otherwise autoconf-2.14 chokes.  */
@@ -39,7 +40,20 @@ AC_DEFUN(jm_INCLUDED_REGEX,
 	    /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
 	    s = re_compile_pattern ("{1", 2, &regex);
 
-	    exit (s ? 1 : 0);
+	    if (s)
+	      exit (1);
+
+	    /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <stolfi@ic.unicamp.br>.  */
+	    s = re_compile_pattern ("[anù]*n", 7, &regex);
+	    if (s)
+	      exit (1);
+
+	    /* This should match, but doesn't for e.g. glibc-2.2.1.  */
+	    if (re_match (&regex, "an", 2, 0, &regs) != 2)
+	      exit (1);
+
+	    exit (0);
 	  }
 	],
 	       jm_cv_func_working_re_compile_pattern=yes,

m4/rename.m4

@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 dnl From Volker Borchert.
 dnl Determine whether rename works for source paths with a trailing slash.
@@ -13,15 +13,15 @@ AC_DEFUN(vb_FUNC_RENAME,
  AC_CACHE_CHECK([whether rename is broken],
   vb_cv_func_rename_trailing_slash_bug,
   [
-    rm -rf conftestdir conftestdir2
-    mkdir conftestdir ||
+    rm -rf conftest.d1 conftest.d2
+    mkdir conftest.d1 ||
       AC_MSG_ERROR([cannot create temporary directory])
     AC_TRY_RUN([
 #       include <stdio.h>
         int
         main ()
         {
-          exit (rename ("conftestdir/", "conftestdir2") ? 1 : 0);
+          exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
         }
       ],
       vb_cv_func_rename_trailing_slash_bug=no,
@@ -29,7 +29,7 @@ AC_DEFUN(vb_FUNC_RENAME,
       dnl When crosscompiling, assume rename is broken.
       vb_cv_func_rename_trailing_slash_bug=yes)
 
-      rm -rf conftestdir conftestdir2
+      rm -rf conftest.d1 conftest.d2
   ])
   if test $vb_cv_func_rename_trailing_slash_bug = yes; then
     AC_LIBOBJ(rename)

m4/utimes.m4

@@ -5,7 +5,7 @@ dnl then do case-insensitive s/utime/utimes/.
 
 AC_DEFUN(jm_FUNC_UTIMES_NULL,
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
-[rm -f conftestdata; > conftestdata
+[rm -f conftest.data; > conftest.data
 AC_TRY_RUN([
 /* In case stat has been defined to rpl_stat, undef it here.  */
 #undef stat
@@ -13,9 +13,11 @@ AC_TRY_RUN([
 #include <sys/stat.h>
 main() {
 struct stat s, t;
-exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0
-&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime
-&& t.st_mtime - s.st_mtime < 120));
+exit(!(stat ("conftest.data", &s) == 0
+       && utimes("conftest.data", (long *)0) == 0
+       && stat("conftest.data", &t) == 0
+       && t.st_mtime >= s.st_mtime
+       && t.st_mtime - s.st_mtime < 120));
 }],
   ac_cv_func_utimes_null=yes,
   ac_cv_func_utimes_null=no,

old/fileutils/ChangeLog

@@ -1,3 +1,58 @@
+2001-02-10  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.39.
+
+	* depcomp: New version, from automake.
+
+2001-02-04  Jim Meyering  <meyering@lucent.com>
+
+	* README: Remove note about now-ancient Sequents.
+
+2001-02-03  Jim Meyering  <meyering@lucent.com>
+
+	* src/ln.c (main): Change type of index variable to `unsigned int'
+	to avoid a warning.
+
+	* config.guess: Update from master repository.
+
+	* Makefile.maint (a_host): Use fencepost.
+	(real_dir): Use the same name for both.
+	(alpha): Print commands for both hosts.
+
+	* src/mv.c (long_options): Use `strip-trailing-slashes',
+	per the documetation, not `strip-trailing-slash'.
+	* src/cp.c (long_opts): Likewise.
+	Reported by Oskar Liljeblad.
+
+	* doc/fileutils.texi (mv invocation): Add a warning about how a trailing
+	slash makes a difference.  Prompted by a report from Oskar Liljeblad
+	via Michael Stone (Debian bug#83991).
+
+2001-01-31  Jim Meyering  <meyering@lucent.com>
+
+	* config.sub: Update from master repository.
+	* config.guess: Likewise.
+
+2001-01-28  Jim Meyering  <meyering@lucent.com>
+
+	* Version 4.0.38.
+
+	* configure, aclocal.m4, etc.: Regenerate using autoconf-2.49c.
+
+	* src/ls.c (gobble_file): Add a FIXME comment.
+
+	* TODO: Add a few items.
+
+	* src/ls.c (enum) [FULL_TIME]: Define.
+	(long_options): Use it.
+	(decode_switches): Make --full-time imply -l.
+	Prompted by a report from Karl Eichwalder.
+
+2001-01-22  Jim Meyering  <meyering@lucent.com>
+
+	* src/remove.c (remove_file): Correct an expression to avoid making
+	an unnecessary call to euidaccess for each file.
+
 2001-01-21  Jim Meyering  <meyering@lucent.com>
 
 	* Version 4.0.37.

old/fileutils/NEWS

@@ -1,5 +1,11 @@
 Changes in release 4.01:
+[4.0.39]
+* cp and mv accept --strip-trailing-slashes, not just --strip-trailing-slash
+[4.0.38]
+* ls --full-time now implies -l;  before, without -l it was a no-op
 [4.0.37]
+* portability fixes for SunOS4.1.1, Fujitsu (f300-fujitsu-uxpv4.1_ES),
+    and Unicos (alphaev5-cray-unicosmk2.0.5.X)
 [4.0.36]
 * `mv dir/ new-name' no longer fails on SunOS4.1.1U
 * attempting to use mv to move a symlink onto itself no longer removes
@@ -86,7 +92,7 @@ Changes in release 4.01:
 * cp -p and mv now try to preserve uid even if you're not root, as per POSIX.2.
   This affects behavior only on hosts that let you give files away via chmod.
 * du would fail when given `.' or `..' followed by other command line arguments
-* Using cp's short-named `-P' option evokes the warning that that the
+* Using cp's short-named `-P' option evokes the warning that the
    meaning of `-P' will soon change.  Use `--parents' instead.
 * chgrp, chmod, and chown: when used with the --verbose option, might give an
   invalid diagnostic (due to clobbered errno) when failing.

old/sh-utils/ChangeLog

@@ -1,3 +1,26 @@
+2001-02-04  Jim Meyering  <meyering@lucent.com>
+
+	* src/factor.c (usage): Tweak --help output: it prints the _prime_
+	factors, not just any factors.
+
+2001-02-03  Jim Meyering  <meyering@lucent.com>
+
+	Improve the performance of `factor' (more than 2x speed-up for large N).
+	* src/factor.c (wheel_tab): New global table.
+	(WHEEL_START, WHEEL_END): Define.
+	(factor): Remove the loop that special-cased `2'.
+	Instead of incrementing by `2', use the offsets from the wheel table.
+	From Michael Steffens.
+
+2000-11-27  Prashant TR  <rprash@wilco-int.com>
+
+	* src/test.c (eaccess) [__MSDOS__]: Just use access.
+
+2001-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* src/dirname.c (main): Declare local result as non-const, now
+	that it's freed.
+
 2001-01-20  Jim Meyering  <meyering@lucent.com>
 
 	* configure.in: Remove jm_CHECK_ALL_TYPES.

src/cp.c

@@ -124,7 +124,7 @@ static struct option const long_opts[] =
   {"preserve", no_argument, NULL, 'p'},
   {"recursive", no_argument, NULL, 'R'},
   {"remove-destination", no_argument, NULL, UNLINK_DEST_BEFORE_OPENING},
-  {"strip-trailing-slash", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION},
+  {"strip-trailing-slashes", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION},
   {"suffix", required_argument, NULL, 'S'},
   {"symbolic-link", no_argument, NULL, 's'},
   {"target-directory", required_argument, NULL, TARGET_DIRECTORY_OPTION},

src/dirname.c

@@ -1,5 +1,5 @@
 /* dirname -- strip filename suffix from pathname
-   Copyright (C) 1990-1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -66,8 +66,7 @@ output `.' (meaning the current directory).\n\
 int
 main (int argc, char **argv)
 {
-  const char *result;
-  size_t len;
+  char *result;
 
   program_name = argv[0];
   setlocale (LC_ALL, "");

src/factor.c

@@ -1,5 +1,5 @@
-/* factor -- print factors of n.
-   Copyright (C) 86, 1995-2000 Free Software Foundation, Inc.
+/* factor -- print prime factors of n.
+   Copyright (C) 86, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,6 +45,41 @@
    than 2^128, this constant (and the algorithm :-) will have to change.  */
 #define MAX_N_FACTORS 128
 
+/* The trial divisor increment wheel.  Use it to skip over divisors that
+   are composites of 2, 3, 5, 7, or 11.  The part from WHEEL_START up to
+   WHEEL_END is reused periodically, while the "lead in" is used to test
+   for those primes and to jump onto the wheel.  For more information, see
+   http://www.utm.edu/research/primes/glossary/WheelFactorization.html  */
+
+static const unsigned int wheel_tab[] = {
+  /* lead in: */  1, 2, 2, 4, 2,  /* and the periodic tail: */
+   4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2, 6, 4, 6, 8, 4,
+   2, 4, 2, 4,14, 4, 6, 2,10, 2, 6, 6, 4, 2, 4, 6, 2,10, 2, 4,
+   2,12,10, 2, 4, 2, 4, 6, 2, 6, 4, 6, 6, 6, 2, 6, 4, 2, 6, 4,
+   6, 8, 4, 2, 4, 6, 8, 6,10, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2,
+   6, 4, 2, 6,10, 2,10, 2, 4, 2, 4, 6, 8, 4, 2, 4,12, 2, 6, 4,
+   2, 6, 4, 6,12, 2, 4, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6,10, 2,
+   4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 6, 6, 2, 6, 6, 4, 6,
+   6, 2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 6, 4, 8, 6, 4, 6, 2, 4, 6,
+   8, 6, 4, 2,10, 2, 6, 4, 2, 4, 2,10, 2,10, 2, 4, 2, 4, 8, 6,
+   4, 2, 4, 6, 6, 2, 6, 4, 8, 4, 6, 8, 4, 2, 4, 2, 4, 8, 6, 4,
+   6, 6, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4, 2,10, 2,10, 2,
+   6, 4, 6, 2, 6, 4, 2, 4, 6, 6, 8, 4, 2, 6,10, 8, 4, 2, 4, 2,
+   4, 8,10, 6, 2, 4, 8, 6, 6, 4, 2, 4, 6, 2, 6, 4, 6, 2,10, 2,
+  10, 2, 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 6, 6, 4, 6, 8,
+   4, 2, 4, 2, 4, 8, 6, 4, 8, 4, 6, 2, 6, 6, 4, 2, 4, 6, 8, 4,
+   2, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2,10, 2, 4, 6, 8, 6, 4, 2,
+   6, 4, 6, 8, 4, 6, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6, 6, 4, 6,
+   6, 2, 6, 6, 4, 2,10, 2,10, 2, 4, 2, 4, 6, 2, 6, 4, 2,10, 6,
+   2, 6, 4, 2, 6, 4, 6, 8, 4, 2, 4, 2,12, 6, 4, 6, 2, 4, 6, 2,
+  12, 4, 2, 4, 8, 6, 4, 2, 4, 2,10, 2,10, 6, 2, 4, 6, 2, 6, 4,
+   2, 4, 6, 6, 2, 6, 4, 2,10, 6, 8, 6, 4, 2, 4, 8, 6, 4, 6, 2,
+   4, 6, 2, 6, 6, 6, 4, 6, 2, 6, 4, 2, 4, 2,10,12, 2, 4, 2,10,
+   2, 6, 4, 2, 4, 6, 6, 2,10, 2, 6, 4,14, 4, 2, 4, 2, 4, 8, 6,
+   4, 6, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4,12, 2,12};
+#define WHEEL_START (wheel_tab + 5)
+#define WHEEL_END (wheel_tab + (sizeof wheel_tab / sizeof wheel_tab[0]))
+
 /* The name this program was run with. */
 char *program_name;
 
@@ -62,7 +97,7 @@ Usage: %s [NUMBER]...\n\
 "),
 	      program_name, program_name);
       printf (_("\
-Print factors of each NUMBER; read standard input with no arguments.\n\
+Print the prime factors of each NUMBER.\n\
 \n\
   --help      display this help and exit\n\
   --version   output version information and exit\n\
@@ -82,17 +117,11 @@ factor (uintmax_t n0, int max_n_factors, uintmax_t *factors)
 {
   register uintmax_t n = n0, d, q;
   int n_factors = 0;
+  unsigned int const *w = wheel_tab;
 
   if (n < 1)
     return n_factors;
 
-  while (n % 2 == 0)
-    {
-      assert (n_factors < max_n_factors);
-      factors[n_factors++] = 2;
-      n /= 2;
-    }
-
   /* The exit condition in the following loop is correct because
      any time it is tested one of these 3 conditions holds:
       (1) d divides n
@@ -101,7 +130,7 @@ factor (uintmax_t n0, int max_n_factors, uintmax_t *factors)
      If (1) or (2) obviously the right thing happens.
      If (3), then since n is composite it is >= d^2. */
 
-  d = 3;
+  d = 2;
   do
     {
       q = n / d;
@@ -112,7 +141,9 @@ factor (uintmax_t n0, int max_n_factors, uintmax_t *factors)
 	  n = q;
 	  q = n / d;
 	}
-      d += 2;
+      d += *(w++);
+      if (w == WHEEL_END)
+	w = WHEEL_START;
     }
   while (d <= q);
 

src/ln.c

@@ -1,5 +1,5 @@
 /* `ln' program to create links between files.
-   Copyright (C) 86, 89, 90, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 86, 89, 90, 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -520,7 +520,7 @@ main (int argc, char **argv)
 
   if (target_directory_specified || n_files > 2)
     {
-      int i;
+      unsigned int i;
       unsigned int last_file_idx = (target_directory_specified
 				    ? n_files - 1
 				    : n_files - 2);

src/ls.c

@@ -671,6 +671,7 @@ enum
   BLOCK_SIZE_OPTION = CHAR_MAX + 1,
   COLOR_OPTION,
   FORMAT_OPTION,
+  FULL_TIME,
   INDICATOR_STYLE_OPTION,
   QUOTING_STYLE_OPTION,
   SHOW_CONTROL_CHARS_OPTION,
@@ -684,7 +685,7 @@ static struct option const long_options[] =
   {"escape", no_argument, 0, 'b'},
   {"directory", no_argument, 0, 'd'},
   {"dired", no_argument, 0, 'D'},
-  {"full-time", no_argument, &full_time, 1},
+  {"full-time", no_argument, 0, FULL_TIME},
   {"human-readable", no_argument, 0, 'h'},
   {"inode", no_argument, 0, 'i'},
   {"kilobytes", no_argument, 0, 'k'},
@@ -1288,6 +1289,11 @@ decode_switches (int argc, char **argv)
 	  format = XARGMATCH ("--format", optarg, format_args, format_types);
 	  break;
 
+	case FULL_TIME:
+	  format = long_format;
+	  full_time = 1;
+	  break;
+
 	case COLOR_OPTION:
 	  if (optarg)
 	    i = XARGMATCH ("--color", optarg, color_args, color_types);
@@ -1896,6 +1902,10 @@ gobble_file (const char *name, enum filetype type, int explicit_arg,
   files[files_index].linkmode = 0;
   files[files_index].linkok = 0;
 
+  /* FIXME: this use of ls: `mkdir a; touch a/{b,c,d}; ls -R a'
+     shouldn't require that ls stat b, c, and d -- at least
+     not on systems with usable d_type.  The problem is that
+     format_needs_stat is set, because of the -R.  */
   if (explicit_arg || format_needs_stat
       || (format_needs_type && type == unknown))
     {

src/mv.c

@@ -72,7 +72,7 @@ static struct option const long_options[] =
   {"backup", optional_argument, NULL, 'b'},
   {"force", no_argument, NULL, 'f'},
   {"interactive", no_argument, NULL, 'i'},
-  {"strip-trailing-slash", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION},
+  {"strip-trailing-slashes", no_argument, NULL, STRIP_TRAILING_SLASHES_OPTION},
   {"suffix", required_argument, NULL, 'S'},
   {"target-directory", required_argument, NULL, TARGET_DIRECTORY_OPTION},
   {"update", no_argument, NULL, 'u'},

src/remove.c

@@ -1,5 +1,5 @@
 /* remove.c -- core functions for removing files and directories
-   Copyright (C) 88, 90, 91, 1994-2000 Free Software Foundation, Inc.
+   Copyright (C) 88, 90, 91, 1994-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -615,7 +615,7 @@ remove_file (struct File_spec *fs, const struct rm_options *x)
   int asked = 0;
   char *pathname = fs->filename;
 
-  if (!x->ignore_missing_files && (x->interactive || x->stdin_tty)
+  if (!x->ignore_missing_files && x->interactive && x->stdin_tty
       && euidaccess (pathname, W_OK))
     {
       if (!S_ISLNK (fspec_filetype_mode (fs)))

src/wheel-gen.pl

@@ -0,0 +1,97 @@
+#!/usr/bin/perl -w
+# -*- perl -*-
+
+eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+    if 0;
+
+use strict;
+(my $program_name = $0) =~ s|.*/||;
+
+sub END
+{
+  use POSIX qw (_exit);
+  # This is required if the code might send any output to stdout
+  # E.g., even --version or --help.  So it's best to do it unconditionally.
+  close STDOUT
+    or (warn "$program_name: closing standard output: $!\n"), _exit (1);
+}
+
+sub is_prime ($)
+{
+  my ($n) = @_;
+  use integer;
+
+  $n == 2
+    and return 1;
+
+  my $d = 2;
+  my $w = 1;
+  while (1)
+    {
+      my $q = $n / $d;
+      $n == $q * $d
+        and return 0;
+      $d += $w;
+      $q < $d
+	and last;
+      $w = 2;
+    }
+  return 1;
+}
+
+{
+  @ARGV == 1
+    or die "$program_name: missing argument\n";
+
+  my $wheel_size = $ARGV[0];
+
+  my @primes = (2);
+  my $product = $primes[0];
+  my $n_primes = 1;
+  for (my $i = 3; ; $i += 2)
+    {
+      if (is_prime $i)
+	{
+	  push @primes, $i;
+	  $product *= $i;
+	  ++$n_primes == $wheel_size
+	    and last;
+	}
+    }
+
+  my $ws_m1 = $wheel_size - 1;
+  print <<EOF;
+/* The first $ws_m1 elements correspond to the incremental offsets of the
+   first $wheel_size primes (@primes).  The $wheel_size(th) element is the
+   difference between that last prime and the next largest integer
+   that is not a multiple of those primes.  The remaining numbers
+   define the wheel.  For more information, see
+   http://www.utm.edu/research/primes/glossary/WheelFactorization.html.  */
+EOF
+
+  my @increments;
+  my $prev = 2;
+  for (my $i = 3; ; $i += 2)
+    {
+      my $rel_prime = 1;
+      foreach my $divisor (@primes)
+	{
+	  $i != $divisor && $i % $divisor == 0
+	    and $rel_prime = 0;
+	}
+
+      if ($rel_prime)
+	{
+	  #warn $i, ' ', $i - $prev, "\n";
+	  push @increments, $i - $prev;
+	  $prev = $i;
+
+	  $product + 1 < $i
+	    and last;
+	}
+    }
+
+  print join (",\n", @increments), "\n";
+
+  exit 0;
+}

tests/basename/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -150,6 +148,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -274,12 +273,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/date/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -181,6 +179,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -307,12 +306,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n

tests/factor/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -150,6 +148,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -274,12 +273,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/seq/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -150,6 +148,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -274,12 +273,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/stty/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -144,6 +142,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -268,12 +267,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

tests/test/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4c from Makefile.am
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.
@@ -67,8 +67,6 @@ CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
 DF_PROG = @DF_PROG@
@@ -195,6 +193,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 tags: TAGS
 TAGS:
 
+
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
@@ -321,12 +320,12 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: tags check-TESTS distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am all-redirect check check-TESTS check-am clean \
+clean-generic distclean distclean-generic distdir dvi dvi-am info \
+info-am install install-am install-data install-data-am install-exec \
+install-exec-am install-strip installcheck installcheck-am installdirs \
+maintainer-clean maintainer-clean-generic mostlyclean \
+mostlyclean-generic uninstall uninstall-am
 
 $(srcdir)/$x-tests: $(mk_script) Test.pm
 	$(PERL) -I$(srcdir) -w -- $(mk_script) ../../src/$x > $@.n