version 8.4

* NEWS: Record release date.

.gitattributes

@@ -5,3 +5,5 @@
 # # Derived from the regexp in emacs' lisp/add-log.el.
 # [diff "texinfo"]
 #         funcname = "^@node[ \t][ \t]*\\([^,][^,]*\\)"
+
+gl/lib/*.diff -whitespace

.gitignore

@@ -1,9 +1,10 @@
-*.1
 *.I[12]
 *.[EIOX]
+*.bak
 *.o
 */.deps
 *~
+._bootmp
 .gdb-history
 .kludge-stamp
 .tarball-version
@@ -44,19 +45,25 @@ coreutils-*.tar.lzma.sig
 gnulib-tests
 lib/.cvsignore
 lib/.gitignore
+lib/arg-nonnull.h
 lib/arpa
 lib/binary-io.h
 lib/charset.alias
 lib/configmake.h
+lib/glthread
 lib/libcoreutils.a
+lib/link-warning.h
 lib/printf.c
 lib/progname.c
 lib/progname.h
 lib/selinux
+lib/unistr
 lib/uniwidth
+lib/unused-parameter.h
 m4/.cvsignore
 m4/.gitignore
 maint.mk
+man/*.1
 po/*.gmo
 po/*.po
 po/.gitignore
@@ -72,3 +79,5 @@ src/version.c
 src/version.h
 stamp-h1
 tests/*/*.log
+tests/t?
+tests/test-suite.log

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "gnulib"]
-	path = gnulib
-	url = git://git.sv.gnu.org/gnulib.git
+        path = gnulib
+        url = git://git.sv.gnu.org/gnulib.git

.prev-version

@@ -1 +1 @@
-7.4
+8.3

.vg-suppressions

@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.
 
-# Copyright (C) 2003, 2004, 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2006-2010 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

.x-sc_prohibit_fail_0

@@ -0,0 +1,3 @@
+\.mk$
+/Makefile\.am$
+^tests/test-lib\.sh$

.x-sc_prohibit_magic_number_exit

@@ -0,0 +1,3 @@
+configure.ac
+*.m4
+ChangeLog*

.x-sc_prohibit_tab_based_indentation

@@ -0,0 +1,7 @@
+^GNUMakefile$
+Makefile\.am$
+\.mk$
+^tests/pr/
+ChangeLog.*
+^man/help2man$
+^gl/lib/.*\.c\.diff$

.x-sc_space_tab

@@ -9,3 +9,4 @@ m4/lib-prefix.m4
 m4/po.m4
 aclocal.m4
 src/c99-to-c89.diff
+^gl/lib/.*\.c\.diff$

AUTHORS

@@ -46,11 +46,12 @@ md5sum: Ulrich Drepper, Scott Miller, David Madore
 mkdir: David MacKenzie
 mkfifo: David MacKenzie
 mknod: David MacKenzie
-mktemp: Jim Meyering
+mktemp: Jim Meyering, Eric Blake
 mv: Mike Parker, David MacKenzie, Jim Meyering
 nice: David MacKenzie
 nl: Scott Bartram, David MacKenzie
 nohup: Jim Meyering
+nproc: Giuseppe Scrivano
 od: Jim Meyering
 paste: David M. Ihnat, David MacKenzie
 pathchk: Paul Eggert, David MacKenzie, Jim Meyering

ChangeLog-2005

@@ -11609,7 +11609,7 @@
 
 	-----
 
-	Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2002-2005, 2009-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

ChangeLog-2006

@@ -4033,7 +4033,7 @@
 
 	-----
 
-	Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

ChangeLog-2007

@@ -4015,7 +4015,7 @@
 
 	-----
 
-	Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+	Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

ChangeLog-2008

@@ -372,7 +372,7 @@
 
 	-----
 
-	Copyright (C) 2008-2009 Free Software Foundation, Inc.
+	Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

HACKING

@@ -233,21 +233,26 @@ Try to make the summary line fit one of the following forms:
   maint: change-description
 
 
-Use SPACE-only indentation in new files.
-========================================
-In any new file, eliminate all leading TABs (e.g., via running GNU indent
-with --no-tabs) and put these lines at the end of the file:
+Use SPACE-only indentation in all[*] files
+==========================================
+We use space-only indentation in nearly all files.
+If you use Emacs and your coreutils working directory name matches,
+this code enables the right mode:
+
+  ;; In coreutils, indent with spaces everywhere (not TABs).
+  ;; Exceptions: Makefile and ChangeLog modes.
+  (add-hook 'find-file-hook '(lambda ()
+    (if (and buffer-file-name
+             (string-match "/coreutils\\>" (buffer-file-name))
+             (not (string-equal mode-name "Change Log"))
+             (not (string-equal mode-name "Makefile")))
+        (setq indent-tabs-mode nil))))
+
+[*] Makefile and ChangeLog files are exempt, of course.
+
 [FIXME: suggest vim syntax to do same thing, if it can be done safely.
  Most distros now "set nomodeline" by default for a good reason. ]
 
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * End:
- */
-
-Do not change TABs to spaces or vice versa in any existing file.
-
 
 Send patches to the address listed in --help output
 ===================================================
@@ -437,8 +442,8 @@ Miscellaneous useful git commands
     its SHA1 and then tag it or cherry-pick it onto an existing branch.
     For example, run this:
       git fsck --lost-found HEAD && cd .git/lost-found/commit \
-	&& for i in *; do git show $i|grep SOME_IDENTIFYING_STRING \
-	&& echo $i; done
+        && for i in *; do git show $i|grep SOME_IDENTIFYING_STRING \
+        && echo $i; done
     The "git fsck ..." command creates the .git/lost-found/... hierarchy
     listing all unreachable objects.  Then the for loop
     print SHA1s for commits that match via log or patch.
@@ -476,10 +481,10 @@ Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.
 
 ========================================================================
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2009-2010 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free

Makefile.am

@@ -1,6 +1,6 @@
 # Make coreutils.					-*-Makefile-*-
 
-# Copyright (C) 1990, 1993-2009 Free Software Foundation, Inc.
+# Copyright (C) 1990, 1993-2010 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
@@ -47,8 +47,11 @@ syntax_check_exceptions =		\
   .x-sc_po_check			\
   .x-sc_program_name			\
   .x-sc_prohibit_atoi_atof		\
+  .x-sc_prohibit_fail_0			\
+  .x-sc_prohibit_magic_number_exit	\
   .x-sc_prohibit_stat_st_blocks		\
   .x-sc_prohibit_strcmp			\
+  .x-sc_prohibit_tab_based_indentation	\
   .x-sc_require_config_h		\
   .x-sc_require_config_h_first		\
   .x-sc_space_tab			\
@@ -97,20 +100,20 @@ rm_subst = \
 
 BUILT_SOURCES = .version
 .version:
-	echo $(VERSION) > $@-t && mv $@-t $@
+	$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
 # The perl substitution is to change some key uses of "rm" to "/bin/rm".
 # See the rm_subst comment for details.
 dist-hook: gen-ChangeLog
-	echo $(VERSION) > $(distdir)/.tarball-version
-	perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in
+	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+	$(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in
 
 gen_start_date = 2008-02-08
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	if test -d .git; then						\
+	$(AM_V_GEN)if test -d .git; then				\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
 	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
 	  rm -f $(distdir)/ChangeLog;					\
@@ -120,11 +123,12 @@ gen-ChangeLog:
 ALL_RECURSIVE_TARGETS += distcheck-hook
 distcheck-hook: check-ls-dircolors
 	$(MAKE) my-distcheck
+	$(MAKE) taint-distcheck
 
 DISTCLEANFILES = VERSION
 MAINTAINERCLEANFILES = THANKS-to-translators
 THANKS-to-translators: po/LINGUAS THANKStt.in
-	(								\
+	$(AM_V_GEN)(							\
 	  cat $(srcdir)/THANKStt.in;					\
 	  for lang in `cat $(srcdir)/po/LINGUAS`; do			\
 	    echo http://translationproject.org/team/$$lang.html;	\
@@ -135,7 +139,7 @@ THANKS-to-translators: po/LINGUAS THANKStt.in
 # remain in sync.
 .PHONY: check-ls-dircolors
 check-ls-dircolors:
-	dc=$$(sed -n '/static.*ls_codes\[/,/};'/p		\
+	$(AM_V_GEN)dc=$$(sed -n '/static.*ls_codes\[/,/};'/p	\
 	    $(srcdir)/src/dircolors.c				\
 	  |sed -n '/^  *"/p'|tr , '\n'|sed 's/^  *//'		\
 	  |sed -n 's/^"\(..\)"/\1/p'|sort -u);			\

NEWS

@@ -1,5 +1,349 @@
 GNU coreutils NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release 8.4 (2010-01-13) [stable]
+
+** Bug fixes
+
+  nproc --all is now guaranteed to be as large as the count
+  of available processors, which may not have been the case
+  on GNU/Linux systems with neither /proc nor /sys available.
+  [bug introduced in coreutils-8.1]
+
+** Build-related
+
+  Work around a build failure when using buggy <sys/capability.h>.
+  Alternatively, configure with --disable-libcap.
+
+  Compilation would fail on systems using glibc-2.7..2.9 due to changes in
+  gnulib's wchar.h that tickled a bug in at least those versions of glibc's
+  own <wchar.h> header.  Now, gnulib works around the bug in those older
+  glibc <wchar.h> headers.
+
+  Building would fail with a link error (cp/copy.o) when XATTR headers
+  were installed without the corresponding library.  Now, configure
+  detects that and disables xattr support, as one would expect.
+
+
+* Noteworthy changes in release 8.3 (2010-01-07) [stable]
+
+** Bug fixes
+
+  cp -p, install -p, mv, and touch -c could trigger a spurious error
+  message when using new glibc coupled with an old kernel.
+  [bug introduced in coreutils-6.12].
+
+  ls -l --color no longer prints "argetm" in front of dangling
+  symlinks when the 'LINK target' directive was given to dircolors.
+  [bug introduced in fileutils-4.0]
+
+  pr's page header was improperly formatted for long file names.
+  [bug introduced in coreutils-7.2]
+
+  rm -r --one-file-system works once again.
+  The rewrite to make rm use fts introduced a regression whereby
+  a commmand of the above form would fail for all subdirectories.
+  [bug introduced in coreutils-8.0]
+
+  stat -f recognizes more file system types: k-afs, fuseblk, gfs/gfs2, ocfs2,
+  and rpc_pipefs. Also Minix V3 is displayed correctly as minix3, not minux3.
+  [bug introduced in coreutils-8.1]
+
+  tail -f (inotify-enabled) once again works with remote files.
+  The use of inotify with remote files meant that any changes to those
+  files that was not done from the local system would go unnoticed.
+  [bug introduced in coreutils-7.5]
+
+  tail -F (inotify-enabled) would abort when a tailed file is repeatedly
+  renamed-aside and then recreated.
+  [bug introduced in coreutils-7.5]
+
+  tail -F (inotify-enabled) could fail to follow renamed files.
+  E.g., given a "tail -F a b" process, running "mv a b" would
+  make tail stop tracking additions to "b".
+  [bug introduced in coreutils-7.5]
+
+  touch -a and touch -m could trigger bugs in some file systems, such
+  as xfs or ntfs-3g, and fail to update timestamps.
+  [bug introduced in coreutils-8.1]
+
+  wc now prints counts atomically so that concurrent
+  processes will not intersperse their output.
+  [the issue dates back to the initial implementation]
+
+
+* Noteworthy changes in release 8.2 (2009-12-11) [stable]
+
+** Bug fixes
+
+  id's use of mgetgroups no longer writes beyond the end of a malloc'd buffer
+  [bug introduced in coreutils-8.1]
+
+  id no longer crashes on systems without supplementary group support.
+  [bug introduced in coreutils-8.1]
+
+  rm once again handles zero-length arguments properly.
+  The rewrite to make rm use fts introduced a regression whereby
+  a command like "rm a '' b" would fail to remove "a" and "b", due to
+  the presence of the empty string argument.
+  [bug introduced in coreutils-8.0]
+
+  sort is now immune to the signal handling of its parent.
+  Specifically sort now doesn't exit with an error message
+  if it uses helper processes for compression and its parent
+  ignores CHLD signals. [bug introduced in coreutils-6.9]
+
+  tail without -f no longer access uninitialized memory
+  [bug introduced in coreutils-7.6]
+
+  timeout is now immune to the signal handling of its parent.
+  Specifically timeout now doesn't exit with an error message
+  if its parent ignores CHLD signals. [bug introduced in coreutils-7.6]
+
+  a user running "make distcheck" in the coreutils source directory,
+  with TMPDIR unset or set to the name of a world-writable directory,
+  and with a malicious user on the same system
+  was vulnerable to arbitrary code execution
+  [bug introduced in coreutils-5.0]
+
+
+* Noteworthy changes in release 8.1 (2009-11-18) [stable]
+
+** Bug fixes
+
+  chcon no longer exits immediately just because SELinux is disabled.
+  Even then, chcon may still be useful.
+  [bug introduced in coreutils-8.0]
+
+  chcon, chgrp, chmod, chown and du now diagnose an ostensible directory cycle
+  and arrange to exit nonzero.  Before, they would silently ignore the
+  offending directory and all "contents."
+
+  env -u A=B now fails, rather than silently adding A to the
+  environment.  Likewise, printenv A=B silently ignores the invalid
+  name.  [the bugs date back to the initial implementation]
+
+  ls --color now handles files with capabilities correctly.  Previously
+  files with capabilities were often not colored, and also sometimes, files
+  without capabilites were colored in error. [bug introduced in coreutils-7.0]
+
+  md5sum now prints checksums atomically so that concurrent
+  processes will not intersperse their output.
+  This also affected sum, sha1sum, sha224sum, sha384sum and sha512sum.
+  [the bug dates back to the initial implementation]
+
+  mktemp no longer leaves a temporary file behind if it was unable to
+  output the name of the file to stdout.
+  [the bug dates back to the initial implementation]
+
+  nice -n -1 PROGRAM now runs PROGRAM even when its internal setpriority
+  call fails with errno == EACCES.
+  [the bug dates back to the initial implementation]
+
+  nice, nohup, and su now refuse to execute the subsidiary program if
+  they detect write failure in printing an otherwise non-fatal warning
+  message to stderr.
+
+  stat -f recognizes more file system types: afs, cifs, anon-inode FS,
+  btrfs, cgroupfs, cramfs-wend, debugfs, futexfs, hfs, inotifyfs, minux3,
+  nilfs, securityfs, selinux, xenfs
+
+  tail -f (inotify-enabled) now avoids a race condition.
+  Before, any data appended in the tiny interval between the initial
+  read-to-EOF and the inotify watch initialization would be ignored
+  initially (until more data was appended), or forever, if the file
+  were first renamed or unlinked or never modified.
+  [The race was introduced in coreutils-7.5]
+
+  tail -F (inotify-enabled) now consistently tails a file that has been
+  replaced via renaming.  That operation provokes either of two sequences
+  of inotify events.  The less common sequence is now handled as well.
+  [The bug came with the implementation change in coreutils-7.5]
+
+  timeout now doesn't exit unless the command it is monitoring does,
+  for any specified signal. [bug introduced in coreutils-7.0].
+
+** Changes in behavior
+
+  chroot, env, nice, and su fail with status 125, rather than 1, on
+  internal error such as failure to parse command line arguments; this
+  is for consistency with stdbuf and timeout, and avoids ambiguity
+  with the invoked command failing with status 1.  Likewise, nohup
+  fails with status 125 instead of 127.
+
+  du (due to a change in gnulib's fts) can now traverse NFSv4 automounted
+  directories in which the stat'd device number of the mount point differs
+  during a traversal.  Before, it would fail, because such a mismatch would
+  usually represent a serious error or a subversion attempt.
+
+  echo and printf now interpret \e as the Escape character (0x1B).
+
+  rm -f /read-only-fs/nonexistent now succeeds and prints no diagnostic
+  on systems with an unlinkat syscall that sets errno to EROFS in that case.
+  Before, it would fail with a "Read-only file system" diagnostic.
+  Also, "rm /read-only-fs/nonexistent" now reports "file not found" rather
+  than the less precise "Read-only file system" error.
+
+** New programs
+
+  nproc: Print the number of processing units available to a process.
+
+** New features
+
+  env and printenv now accept the option --null (-0), as a means to
+  avoid ambiguity with newlines embedded in the environment.
+
+  md5sum --check now also accepts openssl-style checksums.
+  So do sha1sum, sha224sum, sha384sum and sha512sum.
+
+  mktemp now accepts the option --suffix to provide a known suffix
+  after the substitution in the template.  Additionally, uses such as
+  "mktemp fileXXXXXX.txt" are able to infer an appropriate --suffix.
+
+  touch now accepts the option --no-dereference (-h), as a means to
+  change symlink timestamps on platforms with enough support.
+
+
+* Noteworthy changes in release 8.0 (2009-10-06) [beta]
+
+** Bug fixes
+
+  cp --preserve=xattr and --archive now preserve extended attributes even
+  when the source file doesn't have write access.
+  [bug introduced in coreutils-7.1]
+
+  touch -t [[CC]YY]MMDDhhmm[.ss] now accepts a timestamp string ending in .60,
+  to accommodate leap seconds.
+  [the bug dates back to the initial implementation]
+
+  ls --color now reverts to the color of a base file type consistently
+  when the color of a more specific type is disabled.
+  [bug introduced in coreutils-5.90]
+
+  ls -LR exits with status 2, not 0, when it encounters a cycle
+
+  ls -is is now consistent with ls -lis in ignoring values returned
+  from a failed stat/lstat.  For example ls -Lis now prints "?", not "0",
+  for the inode number and allocated size of a dereferenced dangling symlink.
+
+  tail --follow --pid now avoids a race condition where data written
+  just before the process dies might not have been output by tail.
+  Also, tail no longer delays at all when the specified pid is not live.
+  [The race was introduced in coreutils-7.5,
+   and the unnecessary delay was present since textutils-1.22o]
+
+** Portability
+
+  On Solaris 9, many commands would mistakenly treat file/ the same as
+  file.  Now, even on such a system, path resolution obeys the POSIX
+  rules that a trailing slash ensures that the preceeding name is a
+  directory or a symlink to a directory.
+
+** Changes in behavior
+
+  id no longer prints SELinux " context=..." when the POSIXLY_CORRECT
+  environment variable is set.
+
+  readlink -f now ignores a trailing slash when deciding if the
+  last component (possibly via a dangling symlink) can be created,
+  since mkdir will succeed in that case.
+
+** New features
+
+  ln now accepts the options --logical (-L) and --physical (-P),
+  added by POSIX 2008.  The default behavior is -P on systems like
+  GNU/Linux where link(2) creates hard links to symlinks, and -L on
+  BSD systems where link(2) follows symlinks.
+
+  stat: without -f, a command-line argument of "-" now means standard input.
+  With --file-system (-f), an argument of "-" is now rejected.
+  If you really must operate on a file named "-", specify it as
+  "./-" or use "--" to separate options from arguments.
+
+** Improvements
+
+  rm: rewrite to use gnulib's fts
+  This makes rm -rf significantly faster (400-500%) in some pathological
+  cases, and slightly slower (20%) in at least one pathological case.
+
+  rm -r deletes deep hierarchies more efficiently.  Before, execution time
+  was quadratic in the depth of the hierarchy, now it is merely linear.
+  However, this improvement is not as pronounced as might be expected for
+  very deep trees, because prior to this change, for any relative name
+  length longer than 8KiB, rm -r would sacrifice official conformance to
+  avoid the disproportionate quadratic performance penalty.  Leading to
+  another improvement:
+
+  rm -r is now slightly more standards-conformant when operating on
+  write-protected files with relative names longer than 8KiB.
+
+
+* Noteworthy changes in release 7.6 (2009-09-11) [stable]
+
+** Bug fixes
+
+  cp, mv now ignore failure to preserve a symlink time stamp, when it is
+  due to their running on a kernel older than what was implied by headers
+  and libraries tested at configure time.
+  [bug introduced in coreutils-7.5]
+
+  cp --reflink --preserve now preserves attributes when cloning a file.
+  [bug introduced in coreutils-7.5]
+
+  cp --preserve=xattr no longer leaks resources on each preservation failure.
+  [bug introduced in coreutils-7.1]
+
+  dd now exits with non-zero status when it encounters a write error while
+  printing a summary to stderr.
+  [bug introduced in coreutils-6.11]
+
+  dd cbs=N conv=unblock would fail to print a final newline when the size
+  of the input was not a multiple of N bytes.
+  [the non-conforming behavior dates back to the initial implementation]
+
+  df no longer requires that each command-line argument be readable
+  [bug introduced in coreutils-7.3]
+
+  ls -i now prints consistent inode numbers also for mount points.
+  This makes ls -i DIR less efficient on systems with dysfunctional readdir,
+  because ls must stat every file in order to obtain a guaranteed-valid
+  inode number.  [bug introduced in coreutils-6.0]
+
+  tail -f (inotify-enabled) now flushes any initial output before blocking.
+  Before, this would print nothing and wait: stdbuf -o 4K tail -f /etc/passwd
+  Note that this bug affects tail -f only when its standard output is buffered,
+  which is relatively unusual.
+  [bug introduced in coreutils-7.5]
+
+  tail -f once again works with standard input.  inotify-enabled tail -f
+  would fail when operating on a nameless stdin.  I.e., tail -f < /etc/passwd
+  would say "tail: cannot watch `-': No such file or directory", yet the
+  relatively baroque tail -f /dev/stdin < /etc/passwd would work.  Now, the
+  offending usage causes tail to revert to its conventional sleep-based
+  (i.e., not inotify-based) implementation.
+  [bug introduced in coreutils-7.5]
+
+** Portability
+
+  ln, link: link f z/ would mistakenly succeed on Solaris 10, given an
+  existing file, f, and nothing named "z".  ln -T f z/ has the same problem.
+  Each would mistakenly create "z" as a link to "f".  Now, even on such a
+  system, each command reports the error, e.g.,
+  link: cannot create link `z/' to `f': Not a directory
+
+** New features
+
+  cp --reflink accepts a new "auto" parameter which falls back to
+  a standard copy if creating a copy-on-write clone is not possible.
+
+** Changes in behavior
+
+  tail -f now ignores "-" when stdin is a pipe or FIFO.
+  tail-with-no-args now ignores -f unconditionally when stdin is a pipe or FIFO.
+  Before, it would ignore -f only when no file argument was specified,
+  and then only when POSIXLY_CORRECT was set.  Now, :|tail -f - terminates
+  immediately.  Before, it would block indefinitely.
+
+
 * Noteworthy changes in release 7.5 (2009-08-20) [stable]
 
 ** Bug fixes
@@ -2562,10 +2906,10 @@ packages, see ./old/*/NEWS.
 
 ========================================================================
 
-Copyright (C) 2001-2009 Free Software Foundation, Inc.
+Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free

README

@@ -11,7 +11,7 @@ The programs that can be built with this package are:
   csplit cut date dd df dir dircolors dirname du echo env expand expr
   factor false fmt fold groups head hostid hostname id install join kill
   link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
-  od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
+  nproc od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
   runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
   sleep sort split stat stdbuf stty su sum sync tac tail tee test timeout
   touch tr true truncate tsort tty uname unexpand uniq unlink uptime users
@@ -229,10 +229,10 @@ the address on the last line of --help output.
 
 ========================================================================
 
-Copyright (C) 1998, 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 1998, 2002-2010 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
 Texts.  A copy of the license is included in the ``GNU Free

README-hacking

@@ -35,7 +35,7 @@ which are extracted from other source packages:
 
 And there you are!  Just
 
-        $ ./configure #[--enable-gcc-warnings]
+        $ ./configure --quiet #[--enable-gcc-warnings] [*]
         $ make
         $ make check
 
@@ -48,9 +48,15 @@ should output no difference.
 
 Enjoy!
 
+[*] The --enable-gcc-warnings option is useful only with glibc
+and with a very recent version of gcc.  You'll probably also have
+to use recent system headers.  If you configure with this option,
+and spot a problem, please be sure to send the report to the bug
+reporting address of this package, and not to that of gnulib, even
+if the problem seems to originate in a gnulib-provided file.
 -----
 
-Copyright (C) 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 2002-2010 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
@@ -64,7 +70,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Local Variables:
-indent-tabs-mode: nil
-End:

README-prereq

@@ -17,11 +17,15 @@ Note please try to install/build official packages for your system.
 If these are not available then one can make them available only to
 the coreutils build using the following instructions.  Even if the
 official packages for your system are too old, please install them
-as they may be required to build the newer versions.
+as they may be required to build the newer versions.  The examples
+below build into $HOME/coreutils/deps/, so first ensure that your
+$PATH is set correctly, which can be done for the current shell like:
+
+  export PATH=$HOME/coreutils/deps/bin:$PATH
 
 * autoconf *
 
-  # Note Autoconf 2.62 or newer is needed to build automake-1.11
+  # Note Autoconf 2.62 or newer is needed to build automake-1.11.1
   git clone --depth=1 git://git.sv.gnu.org/autoconf.git
   git checkout v2.62
   autoreconf -vi
@@ -33,7 +37,7 @@ as they may be required to build the newer versions.
   # Note help2man is required to build automake fully
   git clone git://git.sv.gnu.org/automake.git
   cd automake
-  git checkout -b branch-1.11 --track origin/branch-1.11
+  git checkout v1.11.1
   ./bootstrap
   ./configure --prefix=$HOME/coreutils/deps
   make install
@@ -50,7 +54,4 @@ requires version 1.10a or newer, as well as the xz program itself.
   ./configure --prefix=$HOME/coreutils/deps
   make install
 
-Now we can build coreutils as described in README-hacking
-as long as $PATH starts with $HOME/coreutils/deps/bin, which
-one can set for the current shell like:
-  $ export PATH=$HOME/coreutils/deps/bin:$PATH
+Now one can build coreutils as described in README-hacking.

README-release

@@ -7,19 +7,18 @@ Here are most of the steps we (maintainers) follow when making a release.
 * Run ./configure && make maintainer-clean
 
 * Ensure that the desired versions of autoconf, automake, bison, etc.
-  are in your PATH.  See HACKING for the complete list.
+  are in your PATH.  See the buildreq list in bootstrap.conf for
+  the complete list.
 
 * Ensure that you're on "master" with no uncommitted diffs.
   This should produce no output: git checkout master; git diff
 
-* Make sure your local gnulib directory is up to date.
-
-* Run bootstrap, (assuming your local copy of gnulib is in /gnulib):
-  ./bootstrap --gnulib-srcdir=/gnulib
+* Run bootstrap: ./bootstrap
 
 FIXME: enable excluded programs like arch? to get their manual pages?
 
 * Pre-release testing:
+  Ensure that make check syntax-check succeeds.
   On at least one SELinux-enabled (enforcing) and one non-SELinux system,
     run all tests, both root-only and regular.
   Run *all* non-root tests, including expensive and very expensive ones i.e.,
@@ -30,19 +29,17 @@ FIXME: enable excluded programs like arch? to get their manual pages?
 
 * Run "make distcheck"
 
-* Manually set the date, version number, and [stable/alpha/beta] on
-  line 3 of NEWS, then do e.g.,:
+* Set the date, version number, and release type [stable/alpha/beta] on
+  line 3 of NEWS, commit that, and tag the release by running e.g.,
 
-    v=7.3
-    git commit -F <(printf 'version '$v'\n\n* NEWS: Record release date.\n') -a
-    git tag -s -m "coreutils $v" v$v HEAD
+    build-aux/do-release-commit-and-tag 8.1 beta
 
 * Run the following to create release tarballs.  Your choice selects the
   corresponding upload-to destination in the emitted gnupload command.
   The different destinations are specified in cfg.mk.  See the definitions
-  of gnu_ftp_host-{alpha,beta,major}.
+  of gnu_ftp_host-{alpha,beta,stable}.
 
-    # "TYPE" must be major, beta or alpha
+    # "TYPE" must be stable, beta or alpha
     make TYPE
 
 * Test the tarball.  copy it to a few odd-ball systems and ensure that
@@ -53,19 +50,22 @@ FIXME: enable excluded programs like arch? to get their manual pages?
 
 Once all the builds and tests have passed,
 
-* Run the gnupload command that was suggested by your "make major" run above.
+* Run the gnupload command that was suggested by your "make stable" run above.
 
 * Wait a few minutes (maybe up to 30?) and then use the release URLs to
   download all tarball/signature pairs and use gpg --verify to ensure
   that they're all valid.
 
 * Push the new tag:
-  git push origin tag v<JUST_RELEASED_VERSION_NUMBER>
+
+    v=$(cat .prev-version)
+    git push origin tag v$v
 
 * Send the gpg-signed announcement mail, e.g.,
+
     To: info-gnu@gnu.org, coreutils-announce@gnu.org
     Cc: coordinator@translationproject.org, bug-coreutils@gnu.org
-    Subject: coreutils-7.1 released [stable]
+    Subject: coreutils-8.0 released [beta]
 
 * Approve the announcement here:
   http://lists.gnu.org/mailman/admindb/coreutils-announce
@@ -74,25 +74,21 @@ Once all the builds and tests have passed,
   From here:
     https://savannah.gnu.org/projects/coreutils/
   click on the "submit news", then write something like the following:
+  (If there is no such button, then enable "News" for the project via
+   the Main -> "Select Features" menu item, or via this link:
+   https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=coreutils)
 
-    Subject: coreutils-7.2 released [stable]
+    Subject: coreutils-0.0 released [beta]
     The announcement is here:
-      http://article.gmane.org/gmane.comp.gnu.core-utils.announce/49
+      http://article.gmane.org/gmane.comp.gnu.core-utils.announce/54
 
   Then go here to approve it:
     https://savannah.gnu.org/news/approve.php?group=coreutils
 
-* For non-alpha releases, update the on-line manual at
+* After each non-alpha release, update the on-line manual accessible via
 
     http://www.gnu.org/software/coreutils/manual/
 
-  Run `make web-manual', then copy the contents of doc/manual
-  into a CVS checkout of the coreutils manual repository.
-  Also edit coreutils.html (FIXME? why?) before doing a CVS commit.
+  by running this:
 
-    CVS_RSH=ssh \
-    cvs -d:ext:$USER@cvs.savannah.gnu.org:/web/coreutils co coreutils
-
-  Be sure to "cvs add -ko" any files that "cvs status" marks with "?".
-  That is necessary whenever a new texinfo node is added.  Each becomes
-  a new file in html_node that must then be "cvs add"ed.
+    build-aux/gnu-web-doc-update

README-valgrind

@@ -1,7 +1,7 @@
 #! /bin/bash
 # Convert this package for use with valgrind.
 
-# Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2006, 2009-2010 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

THANKS

@@ -52,6 +52,7 @@ Andy Longton                        alongton@metamark.com
 Anthony Thyssen                     anthony@griffith.edu.au
 Antonio Rendas                      ajrendas@yahoo.com
 Ariel Faigon                        ariel@cthulhu.engr.sgi.com
+Arjan Opmeer                        arjan.opmeer@gmail.com
 Arne H. Juul                        arnej@solan.unit.no
 Arne Henrik Juul                    arnej@imf.unit.no
 Arnold Robbins                      arnold@skeeve.com
@@ -66,8 +67,9 @@ Barry Kelly                         http://barrkel.blogspot.com/
 Bauke Jan Douma                     bjdouma@xs4all.nl
 Ben Elliston                        bje@air.net.au
 Ben Harris                          bjh21@netbsd.org
-Benjamin Cutler                     cutlerbc@simla.colostate.edu
 Bengt Martensson                    bengt@mathematik.uni-Bremen.de
+Benjamin Cutler                     cutlerbc@simla.colostate.edu
+Benno Schulenberg                   bensberg@justemail.net
 Bernard Giroud                      bernard.giroud@creditlyonnais.ch
 Bernd Eckenfels                     ecki@debian.org
 Bernd Leibing                       bernd.leibing@rz.uni-ulm.de
@@ -78,6 +80,7 @@ Bernhard Rosenkraenzer              bero@redhat.de
 Bernhard Voelker                    bernhard.voelker@siemens-enterprise.com
 Bert Deknuydt                       Bert.Deknuydt@esat.kuleuven.ac.be
 Bert Wesarg                         bert.wesarg@googlemail.com
+Bill Brelsford                      wb@k2di.net
 Bill Peters                         peters@gaffel.as.arizona.edu
 Bjorn Helgaas                       helgaas@rsn.hp.com
 Bob McCracken                       kerouac@ravenet.com
@@ -99,8 +102,10 @@ Carlos Canau                        Carlos.Canau@relay.puug.pt
 Charles Karney                      karney@pppl.gov
 Charles Randall                     crandall@matchlogic.com
 Chip Salzenberg                     chip@valinux.com
+Chris Clayton                       chris2553@googlemail.com
 Chris Faylor                        cgf@cygnus.com
 Chris J. Bednar                     cjb@AdvancedDataSolutions.com
+Chris Jones                         cjns1989@gmail.com
 Chris Lesniewski                    ctl@mit.edu
 Chris Sylvain                       csylvain@umm.edu
 Chris Yeo                           cyeo@biking.org
@@ -147,6 +152,7 @@ Dawson Engler                       engler@stanford.edu
 Dean Gaudet                         dean-savannah@arctic.org
 Deepak Goel                         deego@gnufans.org
 Denis Excoffier                     denis.excoffier@airbus.com
+Denis McKeon                        dmckeon@swcp.com
 Dennis Henriksen                    opus@flamingo.osrl.dk
 Dennis Smit                         ds@nerds-incorporated.org
 Derek Clegg                         dclegg@next.com
@@ -185,6 +191,7 @@ Felix Rauch Valenti                 frauch@cse.unsw.edu.au
 Ferdinand                           fw@scenic.mine.nu
 Fletcher Mattox                     fletcher@cs.utexas.edu
 Florent Bayle                       florent@sarcelle.net
+Florian Schlichting                 fschlich@cis.fu-berlin.de
 Florin Iucha                        fiucha@hsys.mic.ro
 Francesco Montorsi                  fr_m@hotmail.com
 François Pinard                     pinard@iro.umontreal.ca
@@ -207,6 +214,7 @@ Geoff Whale                         geoffw@cse.unsw.EDU.AU
 Gerald Pfeifer                      gerald@pfeifer.com
 Gerhard Poul                        gpoul@gnu.org
 Germano Leichsenring                germano@jedi.cs.kobe-u.ac.jp
+Gilles Espinasse                    g.esp@free.fr
 Glen Lenker                         glen.lenker@gmail.com
 Göran Uddeborg                      goeran@uddeborg.se
 Guochun Shi                         gshi@ncsa.uiuc.edu
@@ -243,12 +251,14 @@ Ian Turner                          vectro@pipeline.com
 Iida Yosiaki                        iida@gnu.org
 Ilya N. Golubev                     gin@mo.msk.ru
 Ingo Saitz                          ingo@debian.org
+Ivan Labath                         labath3@st.fmph.uniba.sk
 Ivo Timmermans                      ivo@debian.org
 James                               james@albion.glarp.com
 James Antill                        jmanti%essex.ac.uk@seralph21.essex.ac.uk
 James Lemley                        James.Lemley@acxiom.com
 James Hunt                          jamesodhunt@hotmail.com
 James Ralston                       ralston@pobox.com
+James R. Van Zandt                  jrvz@comcast.net
 James Sneeringer                    jvs@ocslink.com
 James Tanis                         jtt@soscorp.com
 James Youngman                      jay@gnu.org
@@ -258,6 +268,7 @@ Jan Engelhardt                      jengelh@medozas.de
 Jan Fedak                           J.Fedak@sh.cvut.cz
 Jan Moringen                        jan.moringen@uni-bielefeld.de
 Jan Nieuwenhuizen                   janneke@gnu.org
+Jan-Pawel Wrozstinski               jpwroz@gmail.com
 Janos Farkas                        chexum@shadow.banki.hu
 Jarkko Hietaniemi                   jhi@epsilon.hut.fi
 Jarod Wilson                        jwilson@redhat.com
@@ -292,6 +303,7 @@ John Kodis                          kodis@acm.org
 John Murphy                         jam@philabs.research.philips.com
 John Roll                           john@panic.harvard.edu
 John Salmon                         johns@mullet.anu.edu.au
+John Stanley                        johnstops@verizon.net
 John Summerfield                    summer@OS2.ami.com.au
 Jon Peatfield                       J.S.Peatfield@damtp.cam.ac.uk
 Joost van Baal                      joostvb@xs4all.nl
@@ -326,12 +338,14 @@ Kirk Kelsey                         kirk.kelsey@0x4b.net
 Kristin E Thomas                    kristint@us.ibm.com
 Kjetil Torgrim Homme                kjetilho@ifi.uio.no
 Kristoffer Rose                     kris@diku.dk
+Ladislav Hagara                     ladislav.hagara@unob.cz
 Larry McVoy                         lm@sgi.com
 Lars Hecking                        lhecking@nmrc.ucc.ie
 Leah Q                              eequor@earthlink.net
 Lehti Rami                          rammer@cs.tut.fi
 Leonard N. Zubkoff                  lnz@dandelion.com
 Leonardo Milano                     lmilano@udel.edu
+Lluís Batlle                        viriketo@gmail.com
 Lorne Baker                         lbaker@nitro.avint.net
 Luke Hassell                        lukehassell@yahoo.com
 Luke Kendall                        lukekendall@optushome.com.au
@@ -363,6 +377,7 @@ Martin                              martin@dresden.nacamar.de
 Martin Buck                         martin.buck@ascom.ch
 Martin Gallant                      martyg@goodbit.net
 Martin Hippe                        martin.hippe@schlund.de
+Martin Jacobs                       martin.jacobs@arcor.de
 Martin Michlmayr                    tbm@cyrius.com
 Martin Mitchell                     martin@debian.org
 Martin P.J. Zinser                  zinser@decus.de
@@ -370,6 +385,7 @@ Marty Leisner                       leisner@sdsp.mc.xerox.com
 Masami Takikawa                     takikawm@CS.ORST.EDU
 Mate Wierdl                         mw@moni.msci.memphis.edu
 Matej Vela                          mvela@public.srce.hr
+Matias A. Fonzo                     selk@dragora.org
 Matt Kraai                          kraai@ftbfs.org
 Matt Perry                          matt@primefactor.com
 Matt Pham                           mattvpham@gmail.com
@@ -385,12 +401,13 @@ Matthew Swift                       swift@alum.mit.edu
 Matthew Woehlke                     mw_triad@users.sourceforge.net
 Matthias Urlichs                    smurf@noris.de
 Matti Aarnio                        matti.aarnio@zmailer.org
+Mathias Brodala                     info@noctus.net
 Mattias Wadenstein                  maswan@acc.umu.se
 Max Chang                           maxchang@ucla.edu
 Meelis Roos                         mroos@tartu.cyber.ee
 Michael                             michael@aplatform.com
 Michael ???                         michael@roka.net
-Michael Bacarella                   mbac@netgraft.com>
+Michael Bacarella                   mbac@netgraft.com
 Michael Deutschmann                 michael@talamasca.ocis.net
 Michael Elizabeth Chastain          mec.gnu@mindspring.com
 Michael Gaughen                     mgaughen@polyserve.com
@@ -439,6 +456,7 @@ Olatunji Oluwabukunmi Ruwase        tjruwase@stanford.edu
 Olav Morkrid                        olav@funcom.com
 Ole Laursen                         olau@hardworking.dk
 Oliver Kiddle                       okiddle@yahoo.co.uk
+Olivier Fourdan                     ofourdan@redhat.com
 Ørn E. Hansen                       oehansen@daimi.aau.dk
 Oskar Liljeblad                     osk@hem.passagen.se
 Otavio Salvador                     otavio@ossystems.com.br
@@ -486,6 +504,7 @@ Ralph Loader                        loader@maths.ox.ac.uk
 Raul Miller                         moth@magenta.com
 Raúl Núñez de Arenas Coronado       raul@pleyades.net
 Reuben Thomas                       rrt@sc3d.org
+Yang Ren                            ryang@redhat.com
 Richard A Downing                   richard.downing@bcs.org.uk
 Richard Braakman                    dark@xs4all.nl
 Richard Dawe                        rich@phekda.freeserve.co.uk
@@ -495,9 +514,11 @@ Richard Sharman                     rsharman@magmacom.com
 Rick Sladkey                        jrs@world.std.com
 Rik Faith                           faith@cs.unc.edu
 Risto Kankkunen                     kankkune@lingsoft.fi
+Rob Wortman                         wyrm@haell.com
 Robert H. de Vries                  robert@and.nl
 Robert Lindgren                     robert@orcafat.com
 Robert Millan                       zeratul2@wanadoo.es
+Robert Schwebel                     r.schwebel@pengutronix.de
 Rogier Wolff                        R.E.Wolff@BitWizard.nl
 Roland Huebner                      ro-huebner@gmx.de
 Roland Turner                       raz.tah.bet@raz.cx
@@ -514,6 +535,7 @@ Samuli Karkkainen                   Samuli.Karkkainen@hut.fi
 Sander van Malssen                  svm@kozmix.ow.nl
 Santiago Vila Doncel                sanvila@unex.es
 Savochkin Andrey Vladimirovich      saw@msu.ru
+Scott Harrison                      scott.gnu.2009@scottrix.co.uk
 Scott Lurndal                       slurn@griffin.engr.sgi.com
 Sébastien Maret                     smaret@umich.edu
 Sergei Steshenko                    sergstesh@yahoo.com
@@ -523,6 +545,7 @@ Solar Designer                      solar@owl.openwall.com
 Stanislav Ievlev                    inger@altlinux.ru
 Stavros Passas                      stabat@ics.forth.gr
 Stéphane Chazelas                   Stephane_CHAZELAS@yahoo.fr
+Stéphane Raimbault                  stephane.raimbault@makina-corpus.com
 Stephen Depooter                    sbdep@myrealbox.com
 Stephen Eglen                       eglen@pcg.wustl.edu
 Stephen Gildea                      gildea@stop.mail-abuse.org
@@ -530,11 +553,13 @@ Stephen Smoogen                     smooge@mindspring.com
 Steve McConnel                      steve@acadcomp.sil.org
 Steve McIntyre                      steve@einval.com
 Steve Ward                          planet36@gmail.com
+Steven Drake                        sbd@users.sourceforge.net
 Steven G. Johnson                   stevenj@alum.mit.edu
 Steven Mocking                      ufo@quicknet.nl
 Steven Parkes                       smparkes@smparkes.net
 Steven Schveighoffer                schveiguy@yahoo.com
 Steven P Watson                     steven@magelico.net
+Stuart Citrin                       ctrn3e8@gmail.com
 Stuart Kemp                         skemp@peter.bmc.com
 Stuart Shelton                      stuart@shelton.me
 Sven Joachim                        svenjoac@gmx.de
@@ -560,6 +585,7 @@ Tim Waugh                           twaugh@redhat
 Tobias Stoeckmann                   tobias@bugol.de
 Toby Peterson                       toby@opendarwin.org
 Todd A. Jacobs                      tjacobs@codegnome.org
+Tom Fitzhenry                       tom@tom-fitzhenry.me.uk
 Tom Haynes                          thomas@netapp.com
 Tom Quinn                           trq@dionysos.thphys.ox.ac.uk
 Tomas Pospisek                      tpo@sourcepole.ch
@@ -602,6 +628,7 @@ Wis Macomson                        wis.macomson@intel.com
 Wojciech Purczynski                 cliph@isec.pl
 Wolfram Kleff                       kleff@cs.uni-bonn.de
 Won-kyu Park                        wkpark@chem.skku.ac.kr
+Yanko Kaneti                        yaneti@declera.com
 Yann Dirson                         dirson@debian.org
 Zvi Har'El                          rl@math.technion.ac.il
 

TODO

@@ -12,7 +12,6 @@ Modify chmod so that it does not change an inode's st_ctime
   Discussed more recently on <http://bugs.debian.org/497514>.
 
 document the following in coreutils.texi:
-  mktemp
   [
   pinky
 
@@ -60,10 +59,6 @@ Integrate use of sendfile, suggested here:
   http://mail.gnu.org/archive/html/bug-fileutils/2003-03/msg00030.html
 I don't plan to do that, since a few tests demonstrate no significant benefit.
 
-Should printf '\0123' print "\n3"?
-  per report from TAKAI Kousuke on Mar 27
-  http://mail.gnu.org/archive/html/bug-coreutils/2003-03/index.html
-
 printf: consider adapting builtins/printf.def from bash
 
 tail: don't use xlseek; it *exits*.
@@ -170,7 +165,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer
 
 -----
 
-Copyright (C) 2002-2009 Free Software Foundation, Inc.
+Copyright (C) 2002-2010 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

bootstrap

@@ -2,7 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 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
@@ -34,7 +34,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
-  echo >&2 "\
+  cat <<EOF
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
@@ -56,7 +56,7 @@ For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
 are honored.
 
 Running without arguments will suffice in most cases.
-"
+EOF
 }
 
 # Configuration.
@@ -70,6 +70,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
 # The command to download all .po files for a specified domain into
 # a specified directory.  Fill in the first %s is the domain name, and
 # the second with the destination directory.  Use rsync's -L and -r
@@ -148,6 +152,45 @@ copy=false
 # on which version control system (if any) is used in the source directory.
 vc_ignore=auto
 
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program.  Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run (i.e.,
+# supports --version).  If found, set ENVVAR to the program name,
+# die otherwise.
+find_tool ()
+{
+  # Find sha1sum, named gsha1sum on MacPorts.
+  find_tool_envvar=$1
+  shift
+  find_tool_names=$@
+  eval "find_tool_res=\$$find_tool_envvar"
+  if test x"$find_tool_res" = x; then
+    for i
+    do
+      if ($i --version </dev/null) >/dev/null 2>&1; then
+       find_tool_res=$i
+       break
+      fi
+    done
+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "
+  fi
+  if test x"$find_tool_res" = x; then
+    echo >&2 "$0: one of these is required: $find_tool_names"
+    exit 1
+  fi
+  ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
+    echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    exit 1
+  }
+  eval "$find_tool_envvar=\$find_tool_res"
+  eval "export $find_tool_envvar"
+}
+
+# Find sha1sum, named gsha1sum on MacPorts.
+find_tool SHA1SUM sha1sum gsha1sum
+
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -271,10 +314,20 @@ get_version() {
   $app --version >/dev/null 2>&1 || return 1
 
   $app --version 2>&1 |
-  sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p
+  sed -n '# extract version within line
+          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
           t done
+
+          # extract version at start of line
+          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
           d
+
           :done
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
           q'
 }
 
@@ -374,7 +427,7 @@ case ${GNULIB_SRCDIR--} in
         git_modules_config submodule.gnulib.url >/dev/null; then
     git submodule init
     GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
-    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    git_modules_config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
     echo "$0: getting gnulib files..."
     git submodule update || exit $?
     GNULIB_SRCDIR=gnulib
@@ -420,11 +473,11 @@ update_po_files() {
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
         ! test -f "$po_dir/$po.po" ||
-        ! ${SHA1SUM-sha1sum} -c --status "$cksum_file" \
+        ! $SHA1SUM -c --status "$cksum_file" \
             < "$new_po" > /dev/null; then
       echo "updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
-          && ${SHA1SUM-sha1sum} < "$new_po" > "$cksum_file"
+          && $SHA1SUM < "$new_po" > "$cksum_file"
     fi
   done
 }
@@ -690,6 +743,10 @@ find "$m4_base" "$source_base" \
 
 # Reconfigure, getting other files.
 
+# Skip autoheader if it's not needed.
+grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
 for command in \
   libtool \
   "${ACLOCAL-aclocal} --force -I m4" \
@@ -758,14 +815,6 @@ if test $with_gettext = yes; then
   fi
 fi
 
-# Horrible, coreutils-specific kludges.
-# Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
-m=gnulib-tests/gnulib.mk
-sed 's,\.\./\.\.,..,g' $m > $m-t
-mv -f $m-t $m
+bootstrap_epilogue
 
 echo "$0: done.  Now you can run './configure'."
-
-# Local Variables:
-# indent-tabs-mode: nil
-# End:

bootstrap.conf

@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010 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
@@ -20,7 +20,6 @@
 avoided_gnulib_modules='
   --avoid=canonicalize-lgpl
   --avoid=dummy
-  --avoid=lock
 '
 
 # These modules are obsolete and can probably be removed soon,
@@ -31,7 +30,6 @@ obsolete_gnulib_modules='
   memcpy
   memmove
   memset
-  rename
   strcspn
   strtod
   strtol
@@ -73,11 +71,14 @@ gnulib_modules="
   diacrit
   dirfd
   dirname
+  do-release-commit-and-tag
   dup2
+  environ
   error
   euidaccess
   exclude
   exitfail
+  faccessat
   fchdir
   fcntl
   fcntl-safer
@@ -90,12 +91,14 @@ gnulib_modules="
   fnmatch-gnu
   fopen-safer
   fprintftime
+  freopen
+  freopen-safer
   fseeko
   fsusage
+  fsync
   ftello
   ftruncate
   fts
-  gendocs
   getdate
   getgroups
   gethrxtime
@@ -113,6 +116,7 @@ gnulib_modules="
   git-version-gen
   gitlog-to-changelog
   gnu-make
+  gnu-web-doc-update
   gnumakefile
   gnupload
   group-member
@@ -126,11 +130,14 @@ gnulib_modules="
   inttostr
   inttypes
   isapipe
+  isblank
   lchmod
   lchown
   lib-ignore
   linebuffer
+  link
   link-follow
+  linkat
   long-options
   lstat
   maintainer-makefile
@@ -153,6 +160,7 @@ gnulib_modules="
   modechange
   mountlist
   mpsort
+  nproc
   obstack
   pathmax
   perl
@@ -175,9 +183,9 @@ gnulib_modules="
   readutmp
   realloc
   regex
-  rename-dest-slash
+  remove
+  rename
   rmdir
-  rmdir-errno
   root-dev-ino
   rpmatch
   safe-read
@@ -196,20 +204,22 @@ gnulib_modules="
   stdlib-safer
   stpcpy
   stpncpy
-  strdup
+  strdup-posix
   strftime
   strpbrk
+  strsignal
   strtoimax
   strtoumax
-  strverscmp
+  symlink
   sys_stat
   timespec
   tzset
+  uname
   unicodeio
   unistd-safer
   unlink-busy
-  unlinkdir
   unlocked-io
+  unsetenv
   update-copyright
   uptime
   useless-if-before-free
@@ -221,7 +231,6 @@ gnulib_modules="
   verify
   verror
   version-etc-fsf
-  warnings
   wcwidth
   winsz-ioctl
   winsz-termios
@@ -234,6 +243,7 @@ gnulib_modules="
   xnanosleep
   xprintf
   xprintf-posix
+  xreadlink
   xstrtod
   xstrtoimax
   xstrtol
@@ -290,7 +300,6 @@ if test $gettext_external = 1; then
       m4/glibc2.m4
       m4/intdiv0.m4
       m4/lcmessage.m4
-      m4/lock.m4
       m4/uintmax_t.m4
       m4/ulonglong.m4
       m4/visibility.m4
@@ -301,8 +310,8 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
 
 # Build prerequisites
 buildreq="\
-autoconf   2.61
-automake   1.11
+autoconf   2.62
+automake   1.11.1
 autopoint  -
 bison      -
 gettext    -
@@ -316,4 +325,12 @@ tar        -
 "
 
 # Automake requires that ChangeLog exist.
-touch ChangeLog
+touch ChangeLog || exit 1
+
+bootstrap_epilogue()
+{
+  # Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
+  m=gnulib-tests/gnulib.mk
+  sed 's,\.\./\.\.,..,g' $m > $m-t
+  mv -f $m-t $m
+}

build-aux/ChangeLog-2007

@@ -234,7 +234,7 @@
 
 	-----
 
-	Copyright (C) 2002-2009 Free Software Foundation, Inc.
+	Copyright (C) 2002-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

build-aux/cvsu

@@ -27,20 +27,20 @@ use Time::Local;
 use strict;
 
 use vars qw($list_types %messages %options @batch_list $batch_cmd
-	    $no_recurse $explain_type $find_mode $short_print
-	    $no_cvsignore $nolinks $file $single_filename $curr_dir
-	    @common_ignores $ignore_rx %entries %subdirs %removed);
+            $no_recurse $explain_type $find_mode $short_print
+            $no_cvsignore $nolinks $file $single_filename $curr_dir
+            @common_ignores $ignore_rx %entries %subdirs %removed);
 
 use constant SUBDIR_FOUND => 1;
 use constant SUBDIR_CVS   => 2;
 
 # This list comes from the CVS manual.
 use constant STANDARD_IGNORES =>
-	('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags',
-	 'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*',
-	 "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej',
-	 '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe',
-	 '*.Z', '*.elc', '*.ln', 'core');
+        ('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags',
+         'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*',
+         "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej',
+         '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe',
+         '*.Z', '*.elc', '*.ln', 'core');
 
 # 3-letter month names in POSIX locale, for fast date decoding
 my %months = (
@@ -62,20 +62,20 @@ my %months = (
 sub usage ()
 {
     print "Usage:\n" .
-	"  cvsu [OPTIONS] [FILE] ...\n" .
-	"Options:\n" .
-	"  --local		Disable recursion\n" .
-	"  --explain		Verbosely print status of files\n" .
-	"  --find		Emulate find - filenames only\n" .
-	"  --short		Don't print paths\n" .
-	"  --ignore		Don't read .cvsignore\n" .
-	"  --messages		List known file types and long messages\n" .
-	"  --nolinks		Disable recognizing hard and soft links\n" .
-	"  --types=[^]LIST	Print only file types [not] from LIST\n" .
-	"  --batch=COMMAND	Execute this command on files\n" .
-	"  --help		Print this usage information\n" .
-	"  --version		Print version number\n" .
-	"Abbreviations and short options are supported\n";
+        "  cvsu [OPTIONS] [FILE] ...\n" .
+        "Options:\n" .
+        "  --local		Disable recursion\n" .
+        "  --explain		Verbosely print status of files\n" .
+        "  --find		Emulate find - filenames only\n" .
+        "  --short		Don't print paths\n" .
+        "  --ignore		Don't read .cvsignore\n" .
+        "  --messages		List known file types and long messages\n" .
+        "  --nolinks		Disable recognizing hard and soft links\n" .
+        "  --types=[^]LIST	Print only file types [not] from LIST\n" .
+        "  --batch=COMMAND	Execute this command on files\n" .
+        "  --help		Print this usage information\n" .
+        "  --version		Print version number\n" .
+        "Abbreviations and short options are supported\n";
     exit 0;
 }
 
@@ -90,11 +90,11 @@ sub version ()
 sub adjust_types ()
 {
     if ($list_types =~ m{^\^(.*)$}) {
-	$list_types = "";
-	foreach (keys %messages) {
-	    $list_types .= $_
-		if (index ($1, $_) < 0);
-	}
+        $list_types = "";
+        foreach (keys %messages) {
+            $list_types .= $_
+                if (index ($1, $_) < 0);
+        }
     }
 }
 
@@ -104,12 +104,12 @@ sub list_messages ()
     my $default_mark;
     print "Recognizable file types are:\n";
     foreach (sort keys %messages) {
-	if (index($list_types, $_) >= 0) {
-	    $default_mark = "*";
-	} else {
-	    $default_mark = " ";
-	}
-	print "  $default_mark $_ $messages{$_}\n";
+        if (index($list_types, $_) >= 0) {
+            $default_mark = "*";
+        } else {
+            $default_mark = " ";
+        }
+        print "  $default_mark $_ $messages{$_}\n";
     }
     print "* indicates file types listed by default\n";
     exit 0;
@@ -124,28 +124,28 @@ sub init_ignores ()
     push @common_ignores, STANDARD_IGNORES;
 
     unless (defined($HOME)) {
-	return;
+        return;
     }
 
     my $home_cvsignore = "${HOME}/.cvsignore";
 
     if (-f "$home_cvsignore") {
 
-	unless (open (CVSIGNORE, "< $home_cvsignore")) {
-	    error ("couldn't open $home_cvsignore: $!");
-	}
+        unless (open (CVSIGNORE, "< $home_cvsignore")) {
+            error ("couldn't open $home_cvsignore: $!");
+        }
 
-	while (<CVSIGNORE>) {
-	    push (@common_ignores, split);
-	}
+        while (<CVSIGNORE>) {
+            push (@common_ignores, split);
+        }
 
-	close (CVSIGNORE);
+        close (CVSIGNORE);
     }
 
     my $CVSIGNOREENV = $ENV{"CVSIGNORE"};
 
     unless (defined($CVSIGNOREENV)) {
-	return;
+        return;
     }
 
     my @ignores_var = split (/ /, $CVSIGNOREENV);
@@ -157,15 +157,15 @@ sub init_ignores ()
 # Newline is added at the end.
 sub error ($)
 {
-	print STDERR "cvsu: ERROR: " . shift(@_) . "\n";
-	exit 1;
+        print STDERR "cvsu: ERROR: " . shift(@_) . "\n";
+        exit 1;
 }
 
 # execute commands from @exec_list with $exec_cmd
 sub do_batch ()
 {
-	my @cmd_list = split (' ', $batch_cmd);
-	system (@cmd_list,  @batch_list);
+        my @cmd_list = split (' ', $batch_cmd);
+        system (@cmd_list,  @batch_list);
 }
 
 # print files status
@@ -177,34 +177,34 @@ sub file_status ($)
     my $pathfile;
 
     return
-	if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/;
+        if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/;
 
     return
-	if (index($list_types, $type) < 0);
+        if (index($list_types, $type) < 0);
 
     $pathfile = $curr_dir . $file;
 
     if (defined($batch_cmd)) {
-	push (@batch_list, $pathfile);
-	# 1000 items in the command line might be too much for HP-UX
-	if ($#batch_list > 1000) {
-	    do_batch();
-	    undef @batch_list;
-	}
+        push (@batch_list, $pathfile);
+        # 1000 items in the command line might be too much for HP-UX
+        if ($#batch_list > 1000) {
+            do_batch();
+            undef @batch_list;
+        }
     }
 
     if ($short_print) {
-	$item = $file;
+        $item = $file;
     } else {
-	$item = $pathfile;
+        $item = $pathfile;
     }
 
     if ($find_mode) {
-	print "$item\n";
+        print "$item\n";
     } else {
-	$type = $messages{$type}
-	    if ($explain_type);
-	print "$type $item\n";
+        $type = $messages{$type}
+            if ($explain_type);
+        print "$type $item\n";
     }
 }
 
@@ -219,28 +219,28 @@ sub load_entries ($)
     my %ent = ();
 
     unless (open (ENTRIES, "< $entries_file")) {
-	error ("couldn't open $entries_file: $!");
+        error ("couldn't open $entries_file: $!");
     }
     while (<ENTRIES>) {
-	chomp;
-	$ent{$_} = 1;
+        chomp;
+        $ent{$_} = 1;
     }
     close (ENTRIES);
 
     if (open (ENTRIES, "< $entries_log_file")) {
-	while (<ENTRIES>) {
-	    chomp;
-	    if ( m{^A (.+)} ) {
-		$ent{$1} = 1;
-	    } elsif ( m{^R (.+)} ) {
-		delete $ent{$1};
-	    } else {
-		# Note: "cvs commit" helps even when you are offline
-		error ("$entries_log_file:$.: unrecognizable line, " .
-			"try \"cvs commit\"");
-	    }
-	}
-	close (ENTRIES);
+        while (<ENTRIES>) {
+            chomp;
+            if ( m{^A (.+)} ) {
+                $ent{$1} = 1;
+            } elsif ( m{^R (.+)} ) {
+                delete $ent{$1};
+            } else {
+                # Note: "cvs commit" helps even when you are offline
+                error ("$entries_log_file:$.: unrecognizable line, " .
+                        "try \"cvs commit\"");
+            }
+        }
+        close (ENTRIES);
     }
 
     return keys %ent;
@@ -260,28 +260,28 @@ sub process_arg ($)
     local $single_filename = 0;
 
     if ( $arg eq "" or -d $arg ) {
-	$curr_dir = $arg;
-	my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir;
+        $curr_dir = $arg;
+        my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir;
 
-	error ("$real_curr_dir is not a directory")
-	    unless ( -d $real_curr_dir );
+        error ("$real_curr_dir is not a directory")
+            unless ( -d $real_curr_dir );
 
-	# Scan present files.
-	file_status (".");
-	opendir (DIR, $real_curr_dir) ||
-	    error ("couldn't open directory $real_curr_dir: $!");
-	foreach (readdir (DIR)) {
-	    $found_files {$_} = 1;
-	}
-	closedir (DIR);
+        # Scan present files.
+        file_status (".");
+        opendir (DIR, $real_curr_dir) ||
+            error ("couldn't open directory $real_curr_dir: $!");
+        foreach (readdir (DIR)) {
+            $found_files {$_} = 1;
+        }
+        closedir (DIR);
     } else {
-	$single_filename = basename $arg;
-	$curr_dir = dirname $arg;
-	$found_files{$single_filename} = 1 if lstat $arg;
+        $single_filename = basename $arg;
+        $curr_dir = dirname $arg;
+        $found_files{$single_filename} = 1 if lstat $arg;
     }
 
     $curr_dir .= "/"
-	unless ( $curr_dir eq "" || $curr_dir =~ m{/$} );
+        unless ( $curr_dir eq "" || $curr_dir =~ m{/$} );
 
     # Scan CVS/Entries.
     my %entries = ();
@@ -289,118 +289,118 @@ sub process_arg ($)
     my %removed = ();
 
     foreach ( load_entries ("${curr_dir}CVS/Entries") ) {
-	if ( m{^D/([^/]+)/} ) {
-	    $subdirs{$1} = SUBDIR_FOUND if !$single_filename;
-	} elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) {
-	    if ( !$single_filename or $single_filename eq $1 ) {
-		$entries{$1} = $3;
-		$removed{$1} = 1
-		    if $2 eq '-';
-	    }
-	} elsif ( m{^D$} ) {
-	    next;
-	} else {
-	    error ("${curr_dir}CVS/Entries: unrecognizable line");
-	}
+        if ( m{^D/([^/]+)/} ) {
+            $subdirs{$1} = SUBDIR_FOUND if !$single_filename;
+        } elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) {
+            if ( !$single_filename or $single_filename eq $1 ) {
+                $entries{$1} = $3;
+                $removed{$1} = 1
+                    if $2 eq '-';
+            }
+        } elsif ( m{^D$} ) {
+            next;
+        } else {
+            error ("${curr_dir}CVS/Entries: unrecognizable line");
+        }
     }
 
     if ( $single_filename && !$entries{$single_filename} &&
-	 !$found_files{$single_filename} ) {
-	error ("nothing known about $arg");
+         !$found_files{$single_filename} ) {
+        error ("nothing known about $arg");
     }
 
     # Scan .cvsignore if any
     unless ($no_cvsignore) {
-	my (@ignore_list) = ();
+        my (@ignore_list) = ();
 
-	if (-f "${curr_dir}.cvsignore") {
-	    open (CVSIGNORE, "< ${curr_dir}.cvsignore")
-		|| error ("couldn't open ${curr_dir}.cvsignore: $!");
-	    while (<CVSIGNORE>) {
-		push (@ignore_list, split);
-	    }
-	    close (CVSIGNORE);
-	}
+        if (-f "${curr_dir}.cvsignore") {
+            open (CVSIGNORE, "< ${curr_dir}.cvsignore")
+                || error ("couldn't open ${curr_dir}.cvsignore: $!");
+            while (<CVSIGNORE>) {
+                push (@ignore_list, split);
+            }
+            close (CVSIGNORE);
+        }
 
-	my ($iter);
-	foreach $iter (@ignore_list, @common_ignores) {
-	    if ($iter eq '!') {
-		$ignore_rx = ''
-	    } else {
-		if ($ignore_rx eq '') {
-		    $ignore_rx = '^(';
-		} else {
-		    $ignore_rx .= '|';
-		}
-		$ignore_rx .= glob_to_rx ($iter);
-	    }
-	}
-	$ignore_rx .= ')$'
-	    if $ignore_rx ne '';
+        my ($iter);
+        foreach $iter (@ignore_list, @common_ignores) {
+            if ($iter eq '!') {
+                $ignore_rx = ''
+            } else {
+                if ($ignore_rx eq '') {
+                    $ignore_rx = '^(';
+                } else {
+                    $ignore_rx .= '|';
+                }
+                $ignore_rx .= glob_to_rx ($iter);
+            }
+        }
+        $ignore_rx .= ')$'
+            if $ignore_rx ne '';
     }
 
     # File is missing
     foreach $file (sort keys %entries) {
-	unless ($found_files{$file}) {
-	    if ($removed{$file}) {
-		file_status("R");
-	    } else {
-		file_status("U");
-	    }
-	}
+        unless ($found_files{$file}) {
+            if ($removed{$file}) {
+                file_status("R");
+            } else {
+                file_status("U");
+            }
+        }
     }
 
     foreach $file (sort keys %found_files) {
-	next if ($file eq '.' || $file eq '..');
-	lstat ($curr_dir . $file) ||
-	    error ("lstat() failed on $curr_dir . $file");
-	if (! $nolinks && -l _) {
-	    file_status ("L");
-	} elsif (-d _) {
-	    if ($file eq 'CVS') {
-		file_status ("C");
-	    } elsif ($subdirs{$file}) {
-		$subdirs{$file} = SUBDIR_CVS;
-	    } else {
-		file_status ("D"); # Unknown directory
-	    }
-	} elsif (! (-f _) && ! (-l _)) {
-	    file_status ("S"); # This must be something very special
-	} elsif (! $nolinks && (stat _) [3] > 1 ) {
-	    file_status ("H"); # Hard link
-	} elsif (! $entries{$file}) {
-	    file_status ("?");
-	} elsif ($entries{$file} =~ /^Initial |^dummy /) {
-	    file_status ("A");
-	} elsif ($entries{$file} =~ /^Result of merge/) {
-	    file_status ("G");
-	} elsif ($entries{$file} !~
-		/^(...) (...) (..) (..):(..):(..) (....)$/) {
-	    error ("Invalid timestamp for $curr_dir$file: $entries{$file}");
-	} else {
-	    my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900);
-	    my $mtime = (stat _) [9];
-	    if ($cvtime == $mtime) {
-		file_status ("F");
-	    } elsif ($cvtime < $mtime) {
-		file_status ("M");
-	    } else {
-		file_status ("O");
-	    }
-	}
+        next if ($file eq '.' || $file eq '..');
+        lstat ($curr_dir . $file) ||
+            error ("lstat() failed on $curr_dir . $file");
+        if (! $nolinks && -l _) {
+            file_status ("L");
+        } elsif (-d _) {
+            if ($file eq 'CVS') {
+                file_status ("C");
+            } elsif ($subdirs{$file}) {
+                $subdirs{$file} = SUBDIR_CVS;
+            } else {
+                file_status ("D"); # Unknown directory
+            }
+        } elsif (! (-f _) && ! (-l _)) {
+            file_status ("S"); # This must be something very special
+        } elsif (! $nolinks && (stat _) [3] > 1 ) {
+            file_status ("H"); # Hard link
+        } elsif (! $entries{$file}) {
+            file_status ("?");
+        } elsif ($entries{$file} =~ /^Initial |^dummy /) {
+            file_status ("A");
+        } elsif ($entries{$file} =~ /^Result of merge/) {
+            file_status ("G");
+        } elsif ($entries{$file} !~
+                /^(...) (...) (..) (..):(..):(..) (....)$/) {
+            error ("Invalid timestamp for $curr_dir$file: $entries{$file}");
+        } else {
+            my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900);
+            my $mtime = (stat _) [9];
+            if ($cvtime == $mtime) {
+                file_status ("F");
+            } elsif ($cvtime < $mtime) {
+                file_status ("M");
+            } else {
+                file_status ("O");
+            }
+        }
     }
 
     # Now do directories.
     unless ($no_recurse) {
-	my $save_curr_dir = $curr_dir;
-	foreach $file (sort keys %subdirs) {
-	    if ($subdirs{$file} == SUBDIR_FOUND) {
-		$curr_dir = $save_curr_dir;
-		file_status ("X");
-	    } elsif ($subdirs{$file} == SUBDIR_CVS) {
-		process_arg ($save_curr_dir . $file)
-	    }
-	}
+        my $save_curr_dir = $curr_dir;
+        foreach $file (sort keys %subdirs) {
+            if ($subdirs{$file} == SUBDIR_FOUND) {
+                $curr_dir = $save_curr_dir;
+                file_status ("X");
+            } elsif ($subdirs{$file} == SUBDIR_CVS) {
+                process_arg ($save_curr_dir . $file)
+            }
+        }
     }
 }
 
@@ -423,13 +423,13 @@ sub glob_to_rx ($)
     # Find parts in square brackets and copy them literally
     # Text outside brackets is processed by glob_to_rx_simple()
     while ($expr ne '') {
-	if ($expr =~ /^(.*?)(\[.*?\])(.*)/) {
-	    $expr = $3;
-	    $result .= glob_to_rx_simple ($1) . $2;
-	} else {
-	    $result .= glob_to_rx_simple ($expr);
-	    last;
-	}
+        if ($expr =~ /^(.*?)(\[.*?\])(.*)/) {
+            $expr = $3;
+            $result .= glob_to_rx_simple ($1) . $2;
+        } else {
+            $result .= glob_to_rx_simple ($expr);
+            last;
+        }
     }
     return $result;
 }
@@ -441,21 +441,21 @@ sub Main ()
 
     # long status messages
     %messages = (
-	"?" => "Unlisted file",
-	"." => "Known directory",
-	"F" => "Up-to-date file",
-	"C" => "CVS admin directory",
-	"M" => "Modified file",
-	"S" => "Special file",
-	"D" => "Unlisted directory",
-	"L" => "Symbolic link",
-	"H" => "Hard link",
-	"U" => "Lost file",
-	"X" => "Lost directory",
-	"A" => "Newly added",
-	"O" => "Older copy",
-	"G" => "Result of merge",
-	"R" => "Removed file"
+        "?" => "Unlisted file",
+        "." => "Known directory",
+        "F" => "Up-to-date file",
+        "C" => "CVS admin directory",
+        "M" => "Modified file",
+        "S" => "Special file",
+        "D" => "Unlisted directory",
+        "L" => "Symbolic link",
+        "H" => "Hard link",
+        "U" => "Lost file",
+        "X" => "Lost directory",
+        "A" => "Newly added",
+        "O" => "Older copy",
+        "G" => "Result of merge",
+        "R" => "Removed file"
     );
 
     undef @batch_list;		# List of files for batch processing
@@ -471,17 +471,17 @@ sub Main ()
     my $want_ver = 0;		# Print version and exit
 
     my %options = (
-	"types=s"  => \$list_types,
-	"batch=s"  => \$batch_cmd,
-	"local"	   => \$no_recurse,
-	"explain"  => \$explain_type,
-	"find"	   => \$find_mode,
-	"short"	   => \$short_print,
-	"ignore"   => \$no_cvsignore,
-	"messages" => \$want_msg,
-	"nolinks"  => \$nolinks,
-	"help"     => \$want_help,
-	"version"  => \$want_ver
+        "types=s"  => \$list_types,
+        "batch=s"  => \$batch_cmd,
+        "local"	   => \$no_recurse,
+        "explain"  => \$explain_type,
+        "find"	   => \$find_mode,
+        "short"	   => \$short_print,
+        "ignore"   => \$no_cvsignore,
+        "messages" => \$want_msg,
+        "nolinks"  => \$nolinks,
+        "help"     => \$want_help,
+        "version"  => \$want_ver
     );
 
     GetOptions(%options);
@@ -493,19 +493,19 @@ sub Main ()
     version() if $want_ver;
 
     unless ($no_cvsignore) {
-	init_ignores();
+        init_ignores();
     }
 
     if ($#ARGV < 0) {
-	@ARGV = ("");
+        @ARGV = ("");
     }
 
     foreach (@ARGV) {
-	process_arg ($_);
+        process_arg ($_);
     }
 
     if ($#batch_list >= 0) {
-	    do_batch();
+            do_batch();
     }
 }
 

cfg.mk

@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 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
@@ -14,24 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
 # Used in maint.mk's web-manual rule
 manual_title = Core GNU utilities
 
-url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/coreutils
-
-# The GnuPG ID of the key used to sign the tarballs.
-gpg_key_ID = B9AB9A16
-
 # Tests not to run as part of "make distcheck".
-local-checks-to-skip = strftime-check
+local-checks-to-skip =
 
 # Tools used to bootstrap this package, used for "announcement".
 bootstrap-tools = autoconf,automake,gnulib,bison
@@ -39,7 +26,10 @@ bootstrap-tools = autoconf,automake,gnulib,bison
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 8ed224902e335a80ec8340cd0d594d7f
+old_NEWS_hash = beab130e9d41bf8014a0594cfe8b28d4
+
+# Add an exemption for sc_makefile_at_at_check.
+_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'
 
 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
@@ -191,6 +181,18 @@ sc_no_exec_perl_coreutils:
 	      exit 1; } || :;						\
 	fi
 
+# Don't use "readlink" or "readlinkat" directly
+sc_prohibit_readlink:
+	@re='\<readlink(at)? \('					\
+	msg='do not use readlink(at); use via xreadlink or areadlink*'	\
+	  $(_prohibit_regexp)
+
+# Don't use address of "stat" or "lstat" functions
+sc_prohibit_stat_macro_address:
+	@re='\<l?stat '':|&l?stat\>'					\
+	msg='stat() and lstat() may be function-like macros'		\
+	  $(_prohibit_regexp)
+
 # Ensure that date's --help output stays in sync with the info
 # documentation for GNU strftime.  The only exception is %N,
 # which date accepts but GNU strftime does not.
@@ -206,4 +208,45 @@ sc_strftime_check:
 	  rm -f $@-src $@-info;						\
 	fi
 
+# Indent only with spaces.
+sc_prohibit_tab_based_indentation:
+	@re='^ *	'						\
+	msg='TAB in indentation; use only spaces'			\
+	  $(_prohibit_regexp)
+
+# Don't use "indent-tabs-mode: nil" anymore.  No longer needed.
+sc_prohibit_emacs__indent_tabs_mode__setting:
+	@re='^( *[*#] *)?indent-tabs-mode:'				\
+	msg='use of emacs indent-tabs-mode: setting'			\
+	  $(_prohibit_regexp)
+
+# Ensure that each file that contains fail=1 also contains fail=0.
+# Otherwise, setting file=1 in the environment would make tests fail unexpectedly.
+sc_prohibit_fail_0:
+	@re='\<fail=0\>'						\
+	msg='fail=0 initialization'					\
+	  $(_prohibit_regexp)
+
+# Ensure that "stdio--.h" is used where appropriate.
+sc_require_stdio_safer:
+	@if $(VC_LIST_EXCEPT) | grep -l '\.[ch]$$' > /dev/null; then	\
+	  files=$$(grep -l '\bfreopen \?(' $$($(VC_LIST_EXCEPT)		\
+	      | grep '\.[ch]$$'));					\
+	  test -n "$$files" && grep -LE 'include "stdio--.h"' $$files	\
+	      | grep . &&						\
+	  { echo '$(ME): the above files should use "stdio--.h"'	\
+		1>&2; exit 1; } || :;					\
+	else :;								\
+	fi
+
+# Prefer xnanosleep over other less-precise sleep methods
+sc_prohibit_sleep:
+	@re='\<(nano|u)?sleep \('					\
+	msg='prefer xnanosleep over other sleep interfaces'		\
+	  $(_prohibit_regexp)
+
 include $(srcdir)/dist-check.mk
+
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79

configure.ac

@@ -1,7 +1,7 @@
 # -*- autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1991, 1993-2009 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1993-2010 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
@@ -18,21 +18,21 @@
 
 dnl Written by Jim Meyering.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.62])
 
 # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which
 # indicates that it is built from the 219th delta (in _some_ repository)
 # following the v6.9 tag, and that 58ddd is a prefix of the commit SHA1.
 AC_INIT([GNU coreutils],
-	m4_esyscmd([build-aux/git-version-gen .tarball-version]),
-	[bug-coreutils@gnu.org])
+        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+        [bug-coreutils@gnu.org])
 
 AC_CONFIG_SRCDIR([src/ls.c])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
-AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 
 AC_PROG_CC_STDC
@@ -47,7 +47,7 @@ coreutils_MACROS
 
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
-		  [turn on lots of GCC warnings (for developers)])],
+                  [turn on lots of GCC warnings (for developers)])],
   [case $enableval in
      yes|no) ;;
      *)      AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
@@ -101,14 +101,12 @@ if test "$gl_gcc_warnings" = yes; then
   gl_WARN_ADD([-Wno-pointer-sign])     # Too many warnings for now
   gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
 
-  # Offenders in pre-fts remove.c; FIXME: remove upon remove.c rewrite
-  gl_WARN_ADD([-Wno-jump-misses-init])
-
   # In spite of excluding -Wlogical-op above, it is enabled, as of
   # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
   gl_WARN_ADD([-Wno-logical-op])
 
   gl_WARN_ADD([-fdiagnostics-show-option])
+  gl_WARN_ADD([-funit-at-a-time])
 
   AC_SUBST([WARN_CFLAGS])
 
@@ -116,17 +114,25 @@ if test "$gl_gcc_warnings" = yes; then
   AC_DEFINE([_FORTIFY_SOURCE], [2],
     [enable compile-time and run-time bounds-checking, and some warnings])
   AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks])
+
+  # We use a slightly smaller set of warning options for lib/.
+  # Remove the following and save the result in GNULIB_WARN_CFLAGS.
+  nw=
+  nw="$nw -Wuninitialized"
+  nw="$nw -Wunused-macros"
+  nw="$nw -Wmissing-prototypes"
+  nw="$nw -Wold-style-definition"
+  gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
+  AC_SUBST([GNULIB_WARN_CFLAGS])
 fi
 
 AC_FUNC_FORK
 
 optional_bin_progs=
-AC_CHECK_FUNCS([uname],
-	gl_ADD_PROG([optional_bin_progs], [uname]))
 AC_CHECK_FUNCS([chroot],
-	gl_ADD_PROG([optional_bin_progs], [chroot]))
+        gl_ADD_PROG([optional_bin_progs], [chroot]))
 AC_CHECK_FUNCS([gethostid],
-	gl_ADD_PROG([optional_bin_progs], [hostid]))
+        gl_ADD_PROG([optional_bin_progs], [hostid]))
 
 gl_WINSIZE_IN_PTEM
 
@@ -168,9 +174,9 @@ int main()
 [# If we have tzset, assume the worst when cross-compiling.
 utils_cv_localtime_cache=yes])
 else
-	# If we lack tzset, report that localtime does not cache TZ,
-	# since we can't invalidate the cache if we don't have tzset.
-	utils_cv_localtime_cache=no
+        # If we lack tzset, report that localtime does not cache TZ,
+        # since we can't invalidate the cache if we don't have tzset.
+        utils_cv_localtime_cache=no
 fi])dnl
 AC_MSG_RESULT([$utils_cv_localtime_cache])
 if test $utils_cv_localtime_cache = yes; then
@@ -197,7 +203,7 @@ AC_CACHE_CHECK([for 3-argument setpriority function],
   [AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
        [[#include <sys/time.h>
-	 #include <sys/resource.h>
+         #include <sys/resource.h>
        ]],
        [[setpriority (0, 0, 0);]])],
     [utils_cv_func_setpriority=yes],
@@ -374,8 +380,8 @@ case $t in
   $no_install_progs_default) ;;
   *) AC_MSG_ERROR([[internal error: g'l_INCLUDE_EXCLUDE_PROG's 2nd arg, $t,
                    does not match the list of default-not-installed programs
-		   ($no_install_progs_default) also recorded in $mk]],
-		   1) ;;
+                   ($no_install_progs_default) also recorded in $mk]],
+                   1) ;;
 esac
 
 # Given the name of a variable containing a space-separated list of
@@ -423,8 +429,10 @@ CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/src/Makefile.am'
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES])
 ############################################################################
 
+# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
+# translatable strings, we must use need-formatstring-macros here.
 AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.17])
 
 # For a test of uniq: it uses the $LOCALE_FR envvar.
 gt_LOCALE_FR

dist-check.mk

@@ -4,36 +4,63 @@ bin=bin-$$$$
 
 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
 
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
+tmpdir = $(abs_top_builddir)/tests/torture
+
+t=$(tmpdir)/$(PACKAGE)/test
 pfx=$(t)/i
 
+built_programs =						\
+  $$(echo 'spy:;@echo $$(bin_PROGRAMS)'				\
+    | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy		\
+    | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
+
 # More than once, tainted build and source directory names would
 # have caused at least one "make check" test to apply "chmod 700"
 # to all directories under $HOME.  Make sure it doesn't happen again.
-tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
+tp = $(tmpdir)/taint
 t_prefix = $(tp)/a
 t_taint = '$(t_prefix) b'
 fake_home = $(tp)/home
 
+# When extracting from a distribution tarball, extract using the fastest
+# method possible.  With dist-xz, that means using the *.xz file.
+ifneq ('', $(filter *.xz, $(DIST_ARCHIVES)))
+  tar_decompress_opt_ = J
+  suffix_ = xz
+else
+  ifneq ('', $(filter *.gz, $(DIST_ARCHIVES)))
+    tar_decompress_opt_ = z
+    suffix_ = gz
+  else
+    tar_decompress_opt_ = j
+    suffix_ = bz2
+  endif
+endif
+amtar_extract_ = $(AMTAR) -$(tar_decompress_opt_)xf
+preferred_tarball_ = $(distdir).tar.$(suffix_)
+
 # Ensure that tests run from tainted build and src dir names work,
 # and don't affect anything in $HOME.  Create witness files in $HOME,
 # record their attributes, and build/test.  Then ensure that the
 # witnesses were not affected.
+# Skip this test when using libtool, since libtool-generated scripts
+# cannot deal with a space-tainted srcdir.
 ALL_RECURSIVE_TARGETS += taint-distcheck
 taint-distcheck: $(DIST_ARCHIVES)
+	grep '^[	 ]*LT_INIT' configure.ac >/dev/null && exit 0 || :
 	test -d $(t_taint) && chmod -R 700 $(t_taint) || :
 	-rm -rf $(t_taint) $(fake_home)
 	mkdir -p $(t_prefix) $(t_taint) $(fake_home)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
+	$(amtar_extract_) $(preferred_tarball_) -C $(t_taint)
 	mkfifo $(fake_home)/fifo
 	touch $(fake_home)/f
 	mkdir -p $(fake_home)/d/e
 	ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-before
+	HOME=$(fake_home); export HOME;			\
 	cd $(t_taint)/$(distdir)			\
 	  && ./configure				\
 	  && $(MAKE)					\
-	  && HOME=$(fake_home) $(MAKE) check		\
+	  && $(MAKE) check				\
 	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
 	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
 	  && test -d $(t_prefix)
@@ -50,8 +77,9 @@ define install-transform-check
 endef
 
 # Install, then verify that all binaries and man pages are in place.
-# Note that neither the binary, ginstall, nor the ].1 man page is installed.
+# Note that neither the binary, ginstall, nor the [.1 man page is installed.
 define my-instcheck
+  echo running my-instcheck;				\
   $(MAKE) prefix=$(pfx) install				\
     && test ! -f $(pfx)/bin/ginstall			\
     && { fail=0;					\
@@ -68,8 +96,16 @@ define my-instcheck
     }
 endef
 
+# The hard-linking for-loop below ensures that there is a bin/ directory
+# full of all of the programs under test (except the ones that are required
+# for basic Makefile rules), all symlinked to the just-built "false" program.
+# This is to ensure that if ever a test neglects to make PATH include
+# the build srcdir, these always-failing programs will run.
+# Otherwise, it is too easy to test the wrong programs.
+# Note that "false" itself is a symlink to true, so it too will malfunction.
 define coreutils-path-check
   {							\
+    echo running coreutils-path-check;			\
     if test -f $(srcdir)/src/true.c; then		\
       fail=1;						\
       mkdir $(bin)					\
@@ -97,37 +133,38 @@ define coreutils-path-check
   }
 endef
 
-# Use -Wformat -Werror to detect format-string/arg-list mismatches.
-# Also, check for shadowing problems with -Wshadow, and for pointer
-# arithmetic problems with -Wpointer-arith.
-# These CFLAGS are pretty strict.  If you build this target, you probably
-# have to have a recent version of gcc and glibc headers.
-# The hard-linking for-loop below ensures that there is a bin/ directory
-# full of all of the programs under test (except the ones that are required
-# for basic Makefile rules), all symlinked to the just-built "false" program.
-# This is to ensure that if ever a test neglects to make PATH include
-# the build srcdir, these always-failing programs will run.
-# Otherwise, it is too easy to test the wrong programs.
-# Note that "false" itself is a symlink to true, so it too will malfunction.
+# Use this to make sure we don't run these programs when building
+# from a virgin compressed tarball file, below.
+null_AM_MAKEFLAGS ?= \
+  ACLOCAL=false \
+  AUTOCONF=false \
+  AUTOMAKE=false \
+  AUTOHEADER=false \
+  GPERF=false \
+  MAKEINFO=false
+
 ALL_RECURSIVE_TARGETS += my-distcheck
 my-distcheck: $(DIST_ARCHIVES) $(local-check)
 	$(MAKE) syntax-check
 	$(MAKE) check
 	-rm -rf $(t)
 	mkdir -p $(t)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
-	cd $(t)/$(distdir)				\
-	  && ./configure --enable-gcc-warnings --disable-nls \
-	  && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
-	  && $(MAKE) dvi				\
-	  && $(install-transform-check)			\
-	  && $(my-instcheck)				\
-	  && $(coreutils-path-check)			\
-	  && $(MAKE) distclean
+	$(amtar_extract_) $(preferred_tarball_) -C $(t)
+	(set -e; cd $(t)/$(distdir);			\
+	  ./configure --quiet --enable-gcc-warnings --disable-nls; \
+	  $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)';	\
+	  $(MAKE) dvi;					\
+	  $(install-transform-check);			\
+	  $(my-instcheck);				\
+	  $(coreutils-path-check);			\
+	  $(MAKE) distclean				\
+	)
 	(cd $(t) && mv $(distdir) $(distdir).old	\
-	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
+	  && $(amtar_extract_) - ) < $(preferred_tarball_)
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
+	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
 	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "ready for distribution:"; \
+	for i in $(DIST_ARCHIVES); do echo "  $$i"; done; \
 	echo "========================"

doc/ChangeLog-2007

@@ -2002,7 +2002,7 @@
 
 	-----
 
-	Copyright (C) 2001-2009 Free Software Foundation, Inc.
+	Copyright (C) 2001-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

doc/Makefile.am

@@ -1,6 +1,6 @@
 # Make coreutils documentation.				-*-Makefile-*-
 
-# Copyright (C) 1995-1998, 2001-2009 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2001-2010 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
@@ -30,13 +30,12 @@ EXTRA_DIST = perm.texi getdate.texi constants.texi fdl.texi
 AM_MAKEINFOFLAGS = --no-split
 
 constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c
-	LC_ALL=C \
-	sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
-	  $(top_srcdir)/src/tail.c > t-$@
-	LC_ALL=C \
-	sed -n -e 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\
-	  $(top_srcdir)/src/shred.c >> t-$@
-	mv t-$@ $@
+	$(AM_V_GEN)LC_ALL=C; export LC_ALL; \
+	{ sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
+	    $(top_srcdir)/src/tail.c && \
+	  sed -n -e 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\
+	    $(top_srcdir)/src/shred.c; } > t-$@ \
+	  && mv t-$@ $@
 
 MAINTAINERCLEANFILES = constants.texi
 
@@ -48,8 +47,10 @@ _W = (^|[^A-Za-z0-9_])
 W_ = ([^A-Za-z0-9_]|$$)
 
 syntax_checks =		\
+  sc-avoid-builtin	\
   sc-avoid-io		\
   sc-avoid-non-zero	\
+  sc-avoid-path		\
   sc-avoid-timezone	\
   sc-avoid-zeroes	\
   sc-exponent-grouping	\
@@ -70,9 +71,18 @@ check-texinfo: $(syntax_checks)
 	$(PERL) -e 1 2> /dev/null && { $(PERL) -ne			\
 	  '/\bPOSIX\b/ && !/\@acronym{POSIX}/ && !/^\* / || /{posix}/ and print,exit 1' \
 	  $(srcdir)/*.texi 2> /dev/null || fail=1; };			\
-	$(EGREP) -i '$(_W)builtins?$(W_)' $(srcdir)/*.texi && fail=1;	\
+	exit $$fail
+
+sc-avoid-builtin:
+	$(AM_V_GEN)$(EGREP) -i '$(_W)builtins?$(W_)' $(srcdir)/*.texi	\
+	  && exit 1 || :
+
+sc-avoid-path:
+	$(AM_V_GEN)fail=0;						\
 	$(EGREP) -i '$(_W)path(name)?s?$(W_)' $(srcdir)/*.texi		\
-	  | $(EGREP) -v 'search path|@vindex PATH$$|@env[{]PATH[}]' && fail=1; \
+	  | $(EGREP) -v							\
+	  'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]'	\
+	  && fail=1;							\
 	exit $$fail
 
 # Use `time zone', not `timezone'.

doc/perm.texi

@@ -1,7 +1,7 @@
 @c File mode bits
 
-@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006,
-@c 2008-2009 Free Software Foundation, Inc.
+@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006, 2008-2010 Free Software
+@c Foundation, Inc.
 
 @c Permission is granted to copy, distribute and/or modify this document
 @c under the terms of the GNU Free Documentation License, Version 1.3 or

gl/lib/mbsalign.c

@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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
@@ -129,7 +129,7 @@ mbs_align_pad (char *dest, const char* dest_end, size_t n_spaces)
 
 size_t
 mbsalign (const char *src, char *dest, size_t dest_size,
-          size_t *width, mbs_align_t align, int flags)
+          size_t *width, mbs_align_t align, int flags _UNUSED_PARAMETER_)
 {
   size_t ret = -1;
   size_t src_size = strlen (src) + 1;
@@ -219,7 +219,7 @@ mbsalign (const char *src, char *dest, size_t dest_size,
 
       dest = mbs_align_pad (dest, dest_end, start_spaces);
       dest = mempcpy(dest, str_to_print, MIN (n_used_bytes, dest_end - dest));
-      dest = mbs_align_pad (dest, dest_end, end_spaces);
+      mbs_align_pad (dest, dest_end, end_spaces);
     }
 
 mbsalign_cleanup:
@@ -229,8 +229,3 @@ mbsalign_cleanup:
 
   return ret;
 }
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- * End:
- */

gl/lib/mbsalign.h

@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 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

gl/lib/mgetgroups.c

@@ -1,142 +0,0 @@
-/* mgetgroups.c -- return a list of the groups a user is in
-
-   Copyright (C) 2007-2009 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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Extracted from coreutils' src/id.c. */
-
-#include <config.h>
-
-#include "mgetgroups.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#if HAVE_GETGROUPLIST
-# include <grp.h>
-#endif
-#include "getugroups.h"
-#include "xalloc.h"
-
-
-static GETGROUPS_T *
-realloc_groupbuf (GETGROUPS_T *g, size_t num)
-{
-  if (xalloc_oversized (num, sizeof (*g)))
-    {
-      errno = ENOMEM;
-      return NULL;
-    }
-
-  return realloc (g, num * sizeof (*g));
-}
-
-/* Like getugroups, but store the result in malloc'd storage.
-   Set *GROUPS to the malloc'd list of all group IDs of which USERNAME
-   is a member.  If GID is not -1, store it first.  GID should be the
-   group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
-   listed in the groups database (e.g., /etc/groups).  Upon failure,
-   don't modify *GROUPS, set errno, and return -1.  Otherwise, return
-   the number of groups.  */
-
-int
-mgetgroups (char const *username, gid_t gid, GETGROUPS_T **groups)
-{
-  int max_n_groups;
-  int ng;
-  GETGROUPS_T *g;
-
-#if HAVE_GETGROUPLIST
-  /* We prefer to use getgrouplist if available, because it has better
-     performance characteristics.
-
-     In glibc 2.3.2, getgrouplist is buggy.  If you pass a zero as the
-     length of the output buffer, getgrouplist will still write to the
-     buffer.  Contrary to what some versions of the getgrouplist
-     manpage say, this doesn't happen with nonzero buffer sizes.
-     Therefore our usage here just avoids a zero sized buffer.  */
-  if (username)
-    {
-      enum { N_GROUPS_INIT = 10 };
-      max_n_groups = N_GROUPS_INIT;
-
-      g = realloc_groupbuf (NULL, max_n_groups);
-      if (g == NULL)
-	return -1;
-
-      while (1)
-	{
-	  GETGROUPS_T *h;
-	  int last_n_groups = max_n_groups;
-
-	  /* getgrouplist updates max_n_groups to num required.  */
-	  ng = getgrouplist (username, gid, g, &max_n_groups);
-
-	  /* Some systems (like Darwin) have a bug where they
-	     never increase max_n_groups.  */
-	  if (ng < 0 && last_n_groups == max_n_groups)
-	    max_n_groups *= 2;
-
-	  if ((h = realloc_groupbuf (g, max_n_groups)) == NULL)
-	    {
-	      int saved_errno = errno;
-	      free (g);
-	      errno = saved_errno;
-	      return -1;
-	    }
-	  g = h;
-
-	  if (0 <= ng)
-	    {
-	      *groups = g;
-	      /* On success some systems just return 0 from getgrouplist,
-		 so return max_n_groups rather than ng.  */
-	      return max_n_groups;
-	    }
-	}
-    }
-  /* else no username, so fall through and use getgroups. */
-#endif
-
-  max_n_groups = (username
-		  ? getugroups (0, NULL, username, gid)
-		  : getgroups (0, NULL));
-
-  /* If we failed to count groups with NULL for a buffer,
-     try again with a non-NULL one, just in case.  */
-  if (max_n_groups < 0)
-      max_n_groups = 5;
-
-  g = realloc_groupbuf (NULL, max_n_groups);
-  if (g == NULL)
-    return -1;
-
-  ng = (username
-	? getugroups (max_n_groups, g, username, gid)
-	: getgroups (max_n_groups, g));
-
-  if (ng < 0)
-    {
-      int saved_errno = errno;
-      free (g);
-      errno = saved_errno;
-      return -1;
-    }
-
-  *groups = g;
-  return ng;
-}

gl/lib/mgetgroups.h

@@ -1,19 +0,0 @@
-/* Get a list of all group IDs associated with a specified user ID.
-   Copyright (C) 2007, 2009 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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <sys/types.h>
-
-int mgetgroups (const char *username, gid_t gid, GETGROUPS_T **groups);

gl/lib/rand-isaac.c

@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.
 
-   Copyright (C) 1999-2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009-2010 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999 Colin Plumb.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@
 /* This index operation is more efficient on many processors */
 #define ind(mm, x) \
   (* (uint32_t *) ((char *) (mm) \
-	           + ((x) & (ISAAC_WORDS - 1) * sizeof (uint32_t))))
+                   + ((x) & (ISAAC_WORDS - 1) * sizeof (uint32_t))))
 
 /*
  * The central step.  This uses two temporaries, x and y.  mm is the
@@ -191,18 +191,18 @@ isaac_init (struct isaac_state *s, uint32_t const *seed, size_t seedsize)
       isaac_mix (s, seed);
       /* Second and subsequent passes (extension to ISAAC) */
       while (seedsize -= ISAAC_BYTES)
-	{
-	  seed += ISAAC_WORDS;
-	  for (i = 0; i < ISAAC_WORDS; i++)
-	    s->mm[i] += seed[i];
-	  isaac_mix (s, s->mm);
-	}
+        {
+          seed += ISAAC_WORDS;
+          for (i = 0; i < ISAAC_WORDS; i++)
+            s->mm[i] += seed[i];
+          isaac_mix (s, s->mm);
+        }
     }
   else
     {
       /* The no seed case (as in reference ISAAC code) */
       for (i = 0; i < ISAAC_WORDS; i++)
-	s->mm[i] = 0;
+        s->mm[i] = 0;
     }
 
   /* Final pass */
@@ -252,7 +252,7 @@ isaac_seed_data (struct isaac_state *s, void const *buffer, size_t size)
     {
       p = (unsigned char *) s->mm + s->c;
       for (i = 0; i < avail; i++)
-	p[i] ^= buf[i];
+        p[i] ^= buf[i];
       buf += avail;
       size -= avail;
       isaac_mix (s, s->mm);

gl/lib/rand-isaac.h

@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.
 
-   Copyright (C) 1999-2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999-2005, 2009-2010 Free Software Foundation, Inc.
    Copyright (C) 1997, 1998, 1999 Colin Plumb.
 
    This program is free software: you can redistribute it and/or modify

gl/lib/randint.c

@@ -1,6 +1,6 @@
 /* Generate random integers.
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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
@@ -128,75 +128,75 @@ randint_genmax (struct randint_source *s, randint genmax)
   for (;;)
     {
       if (randmax < genmax)
-	{
-	  /* Calculate how many input bytes will be needed, and read
-	     the bytes.  */
+        {
+          /* Calculate how many input bytes will be needed, and read
+             the bytes.  */
 
-	  size_t i = 0;
-	  randint rmax = randmax;
-	  unsigned char buf[sizeof randnum];
+          size_t i = 0;
+          randint rmax = randmax;
+          unsigned char buf[sizeof randnum];
 
-	  do
-	    {
-	      rmax = shift_left (rmax) + UCHAR_MAX;
-	      i++;
-	    }
-	  while (rmax < genmax);
+          do
+            {
+              rmax = shift_left (rmax) + UCHAR_MAX;
+              i++;
+            }
+          while (rmax < genmax);
 
-	  randread (source, buf, i);
+          randread (source, buf, i);
 
-	  /* Increase RANDMAX by appending random bytes to RANDNUM and
-	     UCHAR_MAX to RANDMAX until RANDMAX is no less than
-	     GENMAX.  This may lose up to CHAR_BIT bits of information
-	     if shift_right (RANDINT_MAX) < GENMAX, but it is not
-	     worth the programming hassle of saving these bits since
-	     GENMAX is rarely that large in practice.  */
+          /* Increase RANDMAX by appending random bytes to RANDNUM and
+             UCHAR_MAX to RANDMAX until RANDMAX is no less than
+             GENMAX.  This may lose up to CHAR_BIT bits of information
+             if shift_right (RANDINT_MAX) < GENMAX, but it is not
+             worth the programming hassle of saving these bits since
+             GENMAX is rarely that large in practice.  */
 
-	  i = 0;
+          i = 0;
 
-	  do
-	    {
-	      randnum = shift_left (randnum) + buf[i];
-	      randmax = shift_left (randmax) + UCHAR_MAX;
-	      i++;
-	    }
-	  while (randmax < genmax);
-	}
+          do
+            {
+              randnum = shift_left (randnum) + buf[i];
+              randmax = shift_left (randmax) + UCHAR_MAX;
+              i++;
+            }
+          while (randmax < genmax);
+        }
 
       if (randmax == genmax)
-	{
-	  s->randnum = s->randmax = 0;
-	  return randnum;
-	}
+        {
+          s->randnum = s->randmax = 0;
+          return randnum;
+        }
       else
-	{
-	  /* GENMAX < RANDMAX, so attempt to generate a random number
-	     by taking RANDNUM modulo GENMAX+1.  This will choose
-	     fairly so long as RANDNUM falls within an integral
-	     multiple of GENMAX+1; otherwise, LAST_USABLE_CHOICE < RANDNUM,
-	     so discard this attempt and try again.
+        {
+          /* GENMAX < RANDMAX, so attempt to generate a random number
+             by taking RANDNUM modulo GENMAX+1.  This will choose
+             fairly so long as RANDNUM falls within an integral
+             multiple of GENMAX+1; otherwise, LAST_USABLE_CHOICE < RANDNUM,
+             so discard this attempt and try again.
 
-	     Since GENMAX cannot be RANDINT_MAX, CHOICES cannot be
-	     zero and there is no need to worry about dividing by
-	     zero.  */
+             Since GENMAX cannot be RANDINT_MAX, CHOICES cannot be
+             zero and there is no need to worry about dividing by
+             zero.  */
 
-	  randint excess_choices = randmax - genmax;
-	  randint unusable_choices = excess_choices % choices;
-	  randint last_usable_choice = randmax - unusable_choices;
-	  randint reduced_randnum = randnum % choices;
+          randint excess_choices = randmax - genmax;
+          randint unusable_choices = excess_choices % choices;
+          randint last_usable_choice = randmax - unusable_choices;
+          randint reduced_randnum = randnum % choices;
 
-	  if (randnum <= last_usable_choice)
-	    {
-	      s->randnum = randnum / choices;
-	      s->randmax = excess_choices / choices;
-	      return reduced_randnum;
-	    }
+          if (randnum <= last_usable_choice)
+            {
+              s->randnum = randnum / choices;
+              s->randmax = excess_choices / choices;
+              return reduced_randnum;
+            }
 
-	  /* Retry, but retain the randomness from the fact that RANDNUM fell
-	     into the range LAST_USABLE_CHOICE+1 .. RANDMAX.  */
-	  randnum = reduced_randnum;
-	  randmax = unusable_choices - 1;
-	}
+          /* Retry, but retain the randomness from the fact that RANDNUM fell
+             into the range LAST_USABLE_CHOICE+1 .. RANDMAX.  */
+          randnum = reduced_randnum;
+          randmax = unusable_choices - 1;
+        }
     }
 }
 

gl/lib/randint.h

@@ -1,6 +1,6 @@
 /* Generate random integers.
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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

gl/lib/randperm.c

@@ -1,6 +1,6 @@
 /* Generate random permutations.
 
-   Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2010 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
@@ -79,21 +79,21 @@ randperm_new (struct randint_source *r, size_t h, size_t n)
 
     default:
       {
-	size_t i;
+        size_t i;
 
-	v = xnmalloc (n, sizeof *v);
-	for (i = 0; i < n; i++)
-	  v[i] = i;
+        v = xnmalloc (n, sizeof *v);
+        for (i = 0; i < n; i++)
+          v[i] = i;
 
-	for (i = 0; i < h; i++)
-	  {
-	    size_t j = i + randint_choose (r, n - i);
-	    size_t t = v[i];
-	    v[i] = v[j];
-	    v[j] = t;
-	  }
+        for (i = 0; i < h; i++)
+          {
+            size_t j = i + randint_choose (r, n - i);
+            size_t t = v[i];
+            v[i] = v[j];
+            v[j] = t;
+          }
 
-	v = xnrealloc (v, h, sizeof *v);
+        v = xnrealloc (v, h, sizeof *v);
       }
       break;
     }

gl/lib/randread.c

@@ -1,6 +1,6 @@
 /* Generate buffers of random data.
 
-   Copyright (C) 2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2010 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
@@ -100,8 +100,8 @@ struct randread_source
       /* Up to a buffer's worth of pseudorandom data.  */
       union
       {
-	uint32_t w[ISAAC_WORDS];
-	unsigned char b[ISAAC_BYTES];
+        uint32_t w[ISAAC_WORDS];
+        unsigned char b[ISAAC_BYTES];
       } data;
     } isaac;
   } buf;
@@ -115,8 +115,8 @@ randread_error (void const *file_name)
 {
   if (file_name)
     error (exit_failure, errno,
-	   _(errno == 0 ? "%s: end of file" : "%s: read error"),
-	   quotearg_colon (file_name));
+           _(errno == 0 ? "%s: end of file" : "%s: read error"),
+           quotearg_colon (file_name));
   abort ();
 }
 
@@ -155,18 +155,18 @@ randread_new (char const *name, size_t bytes_bound)
       struct randread_source *s;
 
       if (name)
-	if (! (source = fopen_safer (name, "rb")))
-	  return NULL;
+        if (! (source = fopen_safer (name, "rb")))
+          return NULL;
 
       s = simple_new (source, name);
 
       if (source)
-	setvbuf (source, s->buf.c, _IOFBF, MIN (sizeof s->buf.c, bytes_bound));
+        setvbuf (source, s->buf.c, _IOFBF, MIN (sizeof s->buf.c, bytes_bound));
       else
-	{
-	  s->buf.isaac.buffered = 0;
-	  isaac_seed (&s->buf.isaac.state);
-	}
+        {
+          s->buf.isaac.buffered = 0;
+          isaac_seed (&s->buf.isaac.state);
+        }
 
       return s;
     }
@@ -206,7 +206,7 @@ readsource (struct randread_source *s, unsigned char *p, size_t size)
       p += inbytes;
       size -= inbytes;
       if (size == 0)
-	break;
+        break;
       errno = (ferror (s->source) ? fread_errno : 0);
       s->handler (s->handler_arg);
     }
@@ -224,34 +224,34 @@ readisaac (struct isaac *isaac, unsigned char *p, size_t size)
   for (;;)
     {
       if (size <= inbytes)
-	{
-	  memcpy (p, isaac->data.b + ISAAC_BYTES - inbytes, size);
-	  isaac->buffered = inbytes - size;
-	  return;
-	}
+        {
+          memcpy (p, isaac->data.b + ISAAC_BYTES - inbytes, size);
+          isaac->buffered = inbytes - size;
+          return;
+        }
 
       memcpy (p, isaac->data.b + ISAAC_BYTES - inbytes, inbytes);
       p += inbytes;
       size -= inbytes;
 
       /* If P is aligned, write to *P directly to avoid the overhead
-	 of copying from the buffer.  */
+         of copying from the buffer.  */
       if (ALIGNED_POINTER (p, uint32_t))
-	{
-	  uint32_t *wp = (uint32_t *) p;
-	  while (ISAAC_BYTES <= size)
-	    {
-	      isaac_refill (&isaac->state, wp);
-	      wp += ISAAC_WORDS;
-	      size -= ISAAC_BYTES;
-	      if (size == 0)
-		{
-		  isaac->buffered = 0;
-		  return;
-		}
-	    }
-	  p = (unsigned char *) wp;
-	}
+        {
+          uint32_t *wp = (uint32_t *) p;
+          while (ISAAC_BYTES <= size)
+            {
+              isaac_refill (&isaac->state, wp);
+              wp += ISAAC_WORDS;
+              size -= ISAAC_BYTES;
+              if (size == 0)
+                {
+                  isaac->buffered = 0;
+                  return;
+                }
+            }
+          p = (unsigned char *) wp;
+        }
 
       isaac_refill (&isaac->state, isaac->data.w);
       inbytes = ISAAC_BYTES;

gl/lib/randread.h

@@ -1,6 +1,6 @@
 /* Generate buffers of random data.
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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

gl/lib/regcomp.c.diff

@@ -0,0 +1,82 @@
+diff --git c/lib/regcomp.c i/lib/regcomp.c
+index 6472ff6..665b2ab 100644
+--- c/lib/regcomp.c
++++ i/lib/regcomp.c
+@@ -18,6 +18,8 @@
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
++#include "intprops.h"
++#include "verify.h"
+ static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
+ 					  size_t length, reg_syntax_t syntax);
+ static void re_compile_fastmap_iter (regex_t *bufp,
+@@ -541,7 +543,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
+     size_t errbuf_size;
+ #else /* size_t might promote */
+ size_t
+-regerror (int errcode, const regex_t *_Restrict_ preg,
++regerror (int errcode, const regex_t *_Restrict_ preg _UNUSED_PARAMETER_,
+ 	  char *_Restrict_ errbuf, size_t errbuf_size)
+ #endif
+ {
+@@ -1375,7 +1377,7 @@ calc_first (void *extra, bin_tree_t *node)
+
+ /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
+ static reg_errcode_t
+-calc_next (void *extra, bin_tree_t *node)
++calc_next (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+ {
+   switch (node->token.type)
+     {
+@@ -2571,7 +2573,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
+   /* This loop is actually executed only when end != REG_MISSING,
+      to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
+      already created the start+1-th copy.  */
+-  if ((Idx) -1 < 0 || end != REG_MISSING)
++  verify (! TYPE_SIGNED (Idx));
++  if (end != REG_MISSING)
+     for (i = start + 2; i <= end; ++i)
+       {
+ 	elem = duplicate_tree (elem, dfa);
+@@ -2731,7 +2734,8 @@ static reg_errcode_t
+ internal_function
+ build_collating_symbol (bitset_t sbcset,
+ # ifdef RE_ENABLE_I18N
+-			re_charset_t *mbcset, Idx *coll_sym_alloc,
++			re_charset_t *mbcset _UNUSED_PARAMETER_,
++			Idx *coll_sym_alloc _UNUSED_PARAMETER_,
+ # endif
+ 			const unsigned char *name)
+ {
+@@ -3309,7 +3313,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+
+ static reg_errcode_t
+ parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
+-		       re_token_t *token, int token_len, re_dfa_t *dfa,
++		       re_token_t *token, int token_len,
++		       re_dfa_t *dfa _UNUSED_PARAMETER_,
+ 		       reg_syntax_t syntax, bool accept_hyphen)
+ {
+ #ifdef RE_ENABLE_I18N
+@@ -3396,8 +3401,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+
+ static reg_errcode_t
+ #ifdef RE_ENABLE_I18N
+-build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+-		   Idx *equiv_class_alloc, const unsigned char *name)
++build_equiv_class (bitset_t sbcset, re_charset_t *mbcset _UNUSED_PARAMETER_,
++		   Idx *equiv_class_alloc _UNUSED_PARAMETER_,
++		   const unsigned char *name)
+ #else /* not RE_ENABLE_I18N */
+ build_equiv_class (bitset_t sbcset, const unsigned char *name)
+ #endif /* not RE_ENABLE_I18N */
+@@ -3798,7 +3804,7 @@ free_token (re_token_t *node)
+    and its children. */
+
+ static reg_errcode_t
+-free_tree (void *extra, bin_tree_t *node)
++free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+ {
+   free_token (&node->token);
+   return REG_NOERROR;

gl/lib/regex_internal.c.diff

@@ -0,0 +1,25 @@
+diff --git a/lib/regex_internal.c b/lib/regex_internal.c
+index 904b88e..61c8d9d 100644
+--- a/lib/regex_internal.c
++++ b/lib/regex_internal.c
+@@ -18,6 +18,8 @@
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
++#include "verify.h"
++#include "intprops.h"
+ static void re_string_construct_common (const char *str, Idx len,
+ 					re_string_t *pstr,
+ 					RE_TRANSLATE_TYPE trans, bool icase,
+@@ -1390,7 +1392,10 @@ static void
+ internal_function
+ re_node_set_remove_at (re_node_set *set, Idx idx)
+ {
+-  if (idx < 0 || idx >= set->nelem)
++  verify (! TYPE_SIGNED (Idx));
++  /* if (idx < 0)
++     return; */
++  if (idx >= set->nelem)
+     return;
+   --set->nelem;
+   for (; idx < set->nelem; idx++)

gl/lib/regex_internal.h.diff

@@ -0,0 +1,14 @@
+diff --git i/lib/regex_internal.h w/lib/regex_internal.h
+index 859832f..3c7fe06 100644
+--- i/lib/regex_internal.h
++++ w/lib/regex_internal.h
+@@ -826,7 +826,8 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
+
+ static int
+ internal_function __attribute ((pure))
+-re_string_elem_size_at (const re_string_t *pstr, Idx idx)
++re_string_elem_size_at (const re_string_t *pstr _UNUSED_PARAMETER_,
++			Idx idx _UNUSED_PARAMETER_)
+ {
+ # ifdef _LIBC
+   const unsigned char *p, *extra;

gl/lib/regexec.c.diff

@@ -0,0 +1,45 @@
+diff --git a/lib/regexec.c b/lib/regexec.c
+index 21a8166..7762437 100644
+--- a/lib/regexec.c
++++ b/lib/regexec.c
+@@ -18,6 +18,8 @@
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
++#include "verify.h"
++#include "intprops.h"
+ static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
+ 				     Idx n) internal_function;
+ static void match_ctx_clean (re_match_context_t *mctx) internal_function;
+@@ -378,8 +380,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp,
+   Idx len = length1 + length2;
+   char *s = NULL;
+
+-  if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0))
+-    return -2;
++  verify (! TYPE_SIGNED (Idx));
++  if (BE (len < length1, 0))
++     return -2;
++  /* if (BE (length1 < 0 || length2 < 0 || stop < 0, 0))
++     return -2; */
+
+   /* Concatenate the strings.  */
+   if (length2 > 0)
+@@ -431,11 +436,14 @@ re_search_stub (struct re_pattern_buffer *bufp,
+   Idx last_start = start + range;
+
+   /* Check for out-of-range.  */
+-  if (BE (start < 0 || start > length, 0))
+-    return -1;
++  verify (! TYPE_SIGNED (Idx));
++  /* if (BE (start < 0, 0))
++     return -1; */
++  if (BE (start > length, 0))
++     return -1;
+   if (BE (length < last_start || (0 <= range && last_start < start), 0))
+     last_start = length;
+-  else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
++  else if (BE (/* last_start < 0 || */ (range < 0 && start <= last_start), 0))
+     last_start = 0;
+
+   __libc_lock_lock (dfa->lock);

gl/lib/root-dev-ino.c

@@ -1,5 +1,5 @@
 /* root-dev-ino.c -- get the device and inode numbers for `/'.
-   Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2010 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

gl/lib/root-dev-ino.h

@@ -1,6 +1,6 @@
 /* Root device and inode number checking.
 
-   Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2009-2010 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
@@ -34,12 +34,12 @@ get_root_dev_ino (struct dev_ino *root_d_i);
   do									\
     {									\
       if (STREQ (Dirname, "/"))						\
-	error (0, 0, _("it is dangerous to operate recursively on %s"),	\
-	       quote (Dirname));					\
+        error (0, 0, _("it is dangerous to operate recursively on %s"),	\
+               quote (Dirname));					\
       else								\
-	error (0, 0,							\
-	       _("it is dangerous to operate recursively on %s (same as %s)"), \
-	       quote_n (0, Dirname), quote_n (1, "/"));			\
+        error (0, 0,							\
+               _("it is dangerous to operate recursively on %s (same as %s)"), \
+               quote_n (0, Dirname), quote_n (1, "/"));			\
       error (0, 0, _("use --no-preserve-root to override this failsafe")); \
     }									\
   while (0)

gl/lib/tempname.c

@@ -1,301 +0,0 @@
-/* tempname.c - generate the name of a temporary file.
-
-   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
-
-#if !_LIBC
-# include <config.h>
-# include "tempname.h"
-# include "randint.h"
-#endif
-
-#include <sys/types.h>
-#include <assert.h>
-
-#include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include <stdio.h>
-#ifndef P_tmpdir
-# define P_tmpdir "/tmp"
-#endif
-#ifndef TMP_MAX
-# define TMP_MAX 238328
-#endif
-#ifndef __GT_FILE
-# define __GT_FILE	0
-# define __GT_BIGFILE	1
-# define __GT_DIR	2
-# define __GT_NOCREATE	3
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <fcntl.h>
-#include <sys/time.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#include <sys/stat.h>
-
-#if _LIBC
-# define struct_stat64 struct stat64
-# define small_open __open
-# define large_open __open64
-#else
-# define struct_stat64 struct stat
-# define small_open open
-# define large_open open
-# define __gen_tempname gen_tempname
-# define __getpid getpid
-# define __gettimeofday gettimeofday
-# define __mkdir mkdir
-# define __lxstat64(version, file, buf) lstat (file, buf)
-# define __xstat64(version, file, buf) stat (file, buf)
-#endif
-
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
-#endif
-
-#if _LIBC
-/* Return nonzero if DIR is an existent directory.  */
-static int
-direxists (const char *dir)
-{
-  struct_stat64 buf;
-  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
-}
-
-/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
-   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
-   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
-   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
-   doesn't exist, none of the searched dirs exists, or there's not
-   enough space in TMPL. */
-int
-__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
-	       int try_tmpdir)
-{
-  const char *d;
-  size_t dlen, plen;
-
-  if (!pfx || !pfx[0])
-    {
-      pfx = "file";
-      plen = 4;
-    }
-  else
-    {
-      plen = strlen (pfx);
-      if (plen > 5)
-	plen = 5;
-    }
-
-  if (try_tmpdir)
-    {
-      d = __secure_getenv ("TMPDIR");
-      if (d != NULL && direxists (d))
-	dir = d;
-      else if (dir != NULL && direxists (dir))
-	/* nothing */ ;
-      else
-	dir = NULL;
-    }
-  if (dir == NULL)
-    {
-      if (direxists (P_tmpdir))
-	dir = P_tmpdir;
-      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
-	dir = "/tmp";
-      else
-	{
-	  __set_errno (ENOENT);
-	  return -1;
-	}
-    }
-
-  dlen = strlen (dir);
-  while (dlen > 1 && dir[dlen - 1] == '/')
-    dlen--;			/* remove trailing slashes */
-
-  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
-  if (tmpl_len < dlen + 1 + plen + 6 + 1)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
-  return 0;
-}
-#endif /* _LIBC */
-
-static inline bool
-check_x_suffix (char const *s, size_t len)
-{
-  return strspn (s, "X") == len;
-}
-
-/* These are the characters used in temporary file names.  */
-static const char letters[] =
-"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-/* Generate a temporary file name based on TMPL.  TMPL must end in a
-   a sequence of at least X_SUFFIX_LEN "X"s.  The name constructed
-   does not exist at the time of the call to __gen_tempname.  TMPL is
-   overwritten with the result.
-
-   KIND may be one of:
-   __GT_NOCREATE:	simply verify that the name does not exist
-			at the time of the call.
-   __GT_FILE:		create the file using open(O_CREAT|O_EXCL)
-			and return a read-write fd.  The file is mode 0600.
-   __GT_BIGFILE:	same as __GT_FILE but use open64().
-   __GT_DIR:		create a directory, which will be mode 0700.
-
-   We use a clever algorithm to get hard-to-predict names. */
-int
-gen_tempname_len (char *tmpl, int kind, size_t x_suffix_len)
-{
-  size_t len;
-  char *XXXXXX;
-  unsigned int count;
-  int fd = -1;
-  int save_errno = errno;
-  struct_stat64 st;
-  struct randint_source *rand_src;
-
-  /* A lower bound on the number of temporary files to attempt to
-     generate.  The maximum total number of temporary file names that
-     can exist for a given template is 62**6.  It should never be
-     necessary to try all these combinations.  Instead if a reasonable
-     number of names is tried (we define reasonable as 62**3) fail to
-     give the system administrator the chance to remove the problems.  */
-#define ATTEMPTS_MIN (62 * 62 * 62)
-
-  /* The number of times to attempt to generate a temporary file.  To
-     conform to POSIX, this must be no smaller than TMP_MAX.  */
-#if ATTEMPTS_MIN < TMP_MAX
-  unsigned int attempts = TMP_MAX;
-#else
-  unsigned int attempts = ATTEMPTS_MIN;
-#endif
-
-  len = strlen (tmpl);
-  if (len < x_suffix_len || ! check_x_suffix (&tmpl[len - x_suffix_len],
-					      x_suffix_len))
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  rand_src = randint_all_new (NULL, 8);
-  if (! rand_src)
-    return -1;
-
-  /* This is where the Xs start.  */
-  XXXXXX = &tmpl[len - x_suffix_len];
-
-  for (count = 0; count < attempts; ++count)
-    {
-      size_t i;
-
-      for (i = 0; i < x_suffix_len; i++)
-	{
-	  XXXXXX[i] = letters[randint_genmax (rand_src, sizeof letters - 2)];
-	}
-
-      switch (kind)
-	{
-	case __GT_FILE:
-	  fd = small_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	  break;
-
-	case __GT_BIGFILE:
-	  fd = large_open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	  break;
-
-	case __GT_DIR:
-	  fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
-	  break;
-
-	case __GT_NOCREATE:
-	  /* This case is backward from the other three.  This function
-	     succeeds if __xstat fails because the name does not exist.
-	     Note the continue to bypass the common logic at the bottom
-	     of the loop.  */
-	  if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
-	    {
-	      if (errno == ENOENT)
-		{
-		  __set_errno (save_errno);
-		  fd = 0;
-		  goto done;
-		}
-	      else
-		{
-		  /* Give up now. */
-		  fd = -1;
-		  goto done;
-		}
-	    }
-	  continue;
-
-	default:
-	  assert (! "invalid KIND in __gen_tempname");
-	}
-
-      if (fd >= 0)
-	{
-	  __set_errno (save_errno);
-	  goto done;
-	}
-      else if (errno != EEXIST)
-	{
-	  fd = -1;
-	  goto done;
-	}
-    }
-
-  randint_all_free (rand_src);
-
-  /* We got out of the loop because we ran out of combinations to try.  */
-  __set_errno (EEXIST);
-  return -1;
-
- done:
-  {
-    int saved_errno = errno;
-    randint_all_free (rand_src);
-    __set_errno (saved_errno);
-  }
-  return fd;
-}
-
-int
-__gen_tempname (char *tmpl, int kind)
-{
-  return gen_tempname_len (tmpl, kind, 6);
-}

gl/lib/tempname.c.diff

@@ -0,0 +1,193 @@
+diff --git c/lib/tempname.c i/lib/tempname.c
+index 2da5afe..562955a 100644
+--- c/lib/tempname.c
++++ i/lib/tempname.c
+@@ -22,6 +22,7 @@
+ #if !_LIBC
+ # include <config.h>
+ # include "tempname.h"
++# include "randint.h"
+ #endif
+
+ #include <sys/types.h>
+@@ -49,6 +50,7 @@
+ # error report this to bug-gnulib@gnu.org
+ #endif
+
++#include <stdbool.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -179,14 +181,21 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+ }
+ #endif /* _LIBC */
+
++static inline bool
++check_x_suffix (char const *s, size_t len)
++{
++  return len <= strspn (s, "X");
++}
++
+ /* These are the characters used in temporary file names.  */
+ static const char letters[] =
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+ /* Generate a temporary file name based on TMPL.  TMPL must match the
+-   rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix).
++   rules for mk[s]temp (i.e. end in at least X_SUFFIX_LEN "X"s,
++   possibly with a suffix).
+    The name constructed does not exist at the time of the call to
+-   __gen_tempname.  TMPL is overwritten with the result.
++   this function.  TMPL is overwritten with the result.
+
+    KIND may be one of:
+    __GT_NOCREATE:	simply verify that the name does not exist
+@@ -197,23 +206,24 @@ static const char letters[] =
+
+    We use a clever algorithm to get hard-to-predict names. */
+ int
+-__gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
++gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind,
++                  size_t x_suffix_len)
+ {
+-  int len;
++  size_t len;
+   char *XXXXXX;
+-  static uint64_t value;
+-  uint64_t random_time_bits;
+   unsigned int count;
+   int fd = -1;
+   int save_errno = errno;
+   struct_stat64 st;
++  struct randint_source *rand_src;
+
+   /* A lower bound on the number of temporary files to attempt to
+      generate.  The maximum total number of temporary file names that
+      can exist for a given template is 62**6.  It should never be
+      necessary to try all these combinations.  Instead if a reasonable
+      number of names is tried (we define reasonable as 62**3) fail to
+-     give the system administrator the chance to remove the problems.  */
++     give the system administrator the chance to remove the problems.
++     This value requires that X_SUFFIX_LEN be at least 3.  */
+ #define ATTEMPTS_MIN (62 * 62 * 62)
+
+   /* The number of times to attempt to generate a temporary file.  To
+@@ -225,43 +235,28 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
+ #endif
+
+   len = strlen (tmpl);
+-  if (len < 6 + suffixlen || memcmp (&tmpl[len - 6 - suffixlen], "XXXXXX", 6))
++  if (len < x_suffix_len + suffixlen
++      || ! check_x_suffix (&tmpl[len - x_suffix_len - suffixlen],
++                           x_suffix_len))
+     {
+       __set_errno (EINVAL);
+       return -1;
+     }
+
+   /* This is where the Xs start.  */
+-  XXXXXX = &tmpl[len - 6 - suffixlen];
++  XXXXXX = &tmpl[len - x_suffix_len - suffixlen];
+
+   /* Get some more or less random data.  */
+-#ifdef RANDOM_BITS
+-  RANDOM_BITS (random_time_bits);
+-#else
+-  {
+-    struct timeval tv;
+-    __gettimeofday (&tv, NULL);
+-    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
+-  }
+-#endif
+-  value += random_time_bits ^ __getpid ();
++  rand_src = randint_all_new (NULL, 8);
++  if (! rand_src)
++    return -1;
+
+-  for (count = 0; count < attempts; value += 7777, ++count)
++  for (count = 0; count < attempts; ++count)
+     {
+-      uint64_t v = value;
+-
+-      /* Fill in the random bits.  */
+-      XXXXXX[0] = letters[v % 62];
+-      v /= 62;
+-      XXXXXX[1] = letters[v % 62];
+-      v /= 62;
+-      XXXXXX[2] = letters[v % 62];
+-      v /= 62;
+-      XXXXXX[3] = letters[v % 62];
+-      v /= 62;
+-      XXXXXX[4] = letters[v % 62];
+-      v /= 62;
+-      XXXXXX[5] = letters[v % 62];
++      size_t i;
++
++      for (i = 0; i < x_suffix_len; i++)
++        XXXXXX[i] = letters[randint_genmax (rand_src, sizeof letters - 2)];
+
+       switch (kind)
+         {
+@@ -276,7 +271,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
+           break;
+
+         case __GT_NOCREATE:
+-          /* This case is backward from the other three.  __gen_tempname
++          /* This case is backward from the other three.  This function
+              succeeds if __xstat fails because the name does not exist.
+              Note the continue to bypass the common logic at the bottom
+              of the loop.  */
+@@ -285,11 +280,15 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
+               if (errno == ENOENT)
+                 {
+                   __set_errno (save_errno);
+-                  return 0;
++                  fd = 0;
++                  goto done;
+                 }
+               else
+-                /* Give up now. */
+-                return -1;
++                {
++                  /* Give up now. */
++                  fd = -1;
++                  goto done;
++                }
+             }
+           continue;
+
+@@ -301,13 +300,32 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
+       if (fd >= 0)
+         {
+           __set_errno (save_errno);
+-          return fd;
++          goto done;
+         }
+       else if (errno != EEXIST)
+-        return -1;
++        {
++          fd = -1;
++          goto done;
++        }
+     }
+
++  randint_all_free (rand_src);
++
+   /* We got out of the loop because we ran out of combinations to try.  */
+   __set_errno (EEXIST);
+   return -1;
++
++ done:
++  {
++    int saved_errno = errno;
++    randint_all_free (rand_src);
++    __set_errno (saved_errno);
++  }
++  return fd;
++}
++
++int
++__gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
++{
++  return gen_tempname_len (tmpl, suffixlen, flags, kind, 6);
+ }

gl/lib/tempname.h

@@ -1,41 +0,0 @@
-/* Create a temporary file or directory.
-
-   Copyright (C) 2006, 2007, 2009 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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* header written by Eric Blake */
-
-/* In gnulib, always prefer large files.  GT_FILE maps to
-   __GT_BIGFILE, not __GT_FILE, for a reason.  */
-#define GT_FILE		1
-#define GT_DIR		2
-#define GT_NOCREATE	3
-
-/* Generate a temporary file name based on TMPL.  TMPL must match the
-   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
-   does not exist at the time of the call to gen_tempname.  TMPL is
-   overwritten with the result.
-
-   KIND may be one of:
-   GT_NOCREATE:		simply verify that the name does not exist
-			at the time of the call.
-   GT_FILE:		create a large file using open(O_CREAT|O_EXCL)
-			and return a read-write fd.  The file is mode 0600.
-   GT_DIR:		create a directory, which will be mode 0700.
-
-   We use a clever algorithm to get hard-to-predict names. */
-#include <stddef.h>
-extern int gen_tempname (char *tmpl, int kind);
-extern int gen_tempname_len (char *tmpl, int kind, size_t x_suffix_len);

gl/lib/tempname.h.diff

@@ -0,0 +1,12 @@
+diff --git c/lib/tempname.h i/lib/tempname.h
+index cd69e7d..9757db2 100644
+--- c/lib/tempname.h
++++ i/lib/tempname.h
+@@ -46,5 +46,7 @@
+
+    We use a clever algorithm to get hard-to-predict names. */
+ extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind);
++extern int gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind,
++                             size_t x_suffix_len);
+
+ #endif /* GL_TEMPNAME_H */

gl/lib/xfreopen.c

@@ -1,41 +0,0 @@
-/* a wrapper for frepoen
-   Copyright (C) 2008-2009 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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-#include "xfreopen.h"
-
-#include <errno.h>
-#include "error.h"
-#include "exitfail.h"
-#include "quote.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-void
-xfreopen (char const *filename, char const *mode, FILE *fp)
-{
-  if (!freopen (filename, mode, fp))
-    {
-      char const *f = (filename ? filename
-		       : (fp == stdin ? _("stdin")
-			  : (fp == stdout ? _("stdout")
-			     : (fp == stderr ? _("stderr")
-				: _("unknown stream")))));
-      error (exit_failure, errno, _("failed to reopen %s with mode %s"),
-	     quote_n (0, f), quote_n (1, mode));
-    }
-}

gl/lib/xfreopen.h

@@ -1,2 +0,0 @@
-#include <stdio.h>
-void xfreopen (char const *filename, char const *mode, FILE *fp);

gl/m4/mgetgroups.m4

@@ -1,11 +0,0 @@
-#serial 3
-dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MGETGROUPS],
-[
-  AC_CHECK_FUNCS([getgrouplist])
-  AC_LIBOBJ([mgetgroups])
-])

gl/m4/root-dev-ino.m4

@@ -1,5 +1,5 @@
 #serial 3
-dnl Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

gl/modules/link-tests.diff

@@ -0,0 +1,9 @@
+diff --git i/modules/link-tests w/modules/link-tests
+index d8e7b1a..aca0e74 100644
+--- i/modules/link-tests
++++ w/modules/link-tests
+@@ -12,3 +12,4 @@ configure.ac:
+ Makefile.am:
+ TESTS += test-link
+ check_PROGRAMS += test-link
++test_link_LDADD = $(LDADD) @LIBINTL@

gl/modules/mgetgroups

@@ -1,24 +0,0 @@
-Description:
-Return the group IDs of a user in malloc'd storage.
-
-Files:
-lib/mgetgroups.c
-lib/mgetgroups.h
-m4/mgetgroups.m4
-
-Depends-on:
-getugroups
-xalloc
-
-configure.ac:
-gl_MGETGROUPS
-
-Makefile.am:
-
-Include:
-
-License:
-LGPL
-
-Maintainer:
-Jim Meyering

gl/modules/rename-tests.diff

@@ -0,0 +1,9 @@
+diff --git a/modules/rename-tests b/modules/rename-tests
+index be1b423..fea330a 100644
+--- a/modules/rename-tests
++++ b/modules/rename-tests
+@@ -14,3 +14,4 @@ configure.ac:
+ Makefile.am:
+ TESTS += test-rename
+ check_PROGRAMS += test-rename
++test_rename_LDADD = $(LDADD) @LIBINTL@

gl/modules/xfreopen

@@ -1,25 +0,0 @@
-Description:
-a wrapper for frepoen
-
-Files:
-lib/xfreopen.c
-lib/xfreopen.h
-
-Depends-on:
-error
-exitfail
-quote
-
-configure.ac:
-
-Makefile.am:
-lib_SOURCES += xfreopen.c xfreopen.h
-
-Include:
-"xfreopen.h"
-
-License:
-LGPL
-
-Maintainer:
-Jim Meyering

gnulib-tests/Makefile.am

@@ -1 +1,3 @@
 include gnulib.mk
+
+AM_CFLAGS = $(GNULIB_WARN_CFLAGS) # $(WERROR_CFLAGS)

lib/ChangeLog-2007

@@ -8746,7 +8746,7 @@
 
 	-----
 
-	Copyright (C) 2000-2009 Free Software Foundation, Inc.
+	Copyright (C) 2000-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

lib/Makefile.am

@@ -1,6 +1,6 @@
 ## Makefile for gnulib/lib				-*-Makefile-*-
 
-# Copyright (C) 1995-2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007, 2009-2010 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
@@ -17,7 +17,7 @@
 
 include gnulib.mk
 
-AM_CFLAGS += $(WARN_CFLAGS) # $(WERROR_CFLAGS)
+AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libcoreutils_a_SOURCES += \
   buffer-lcm.c buffer-lcm.h \

lib/buffer-lcm.c

@@ -1,6 +1,6 @@
 /* buffer-lcm.c - compute a good buffer size for dealing with two files
 
-   Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2009-2010 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
@@ -34,22 +34,22 @@ buffer_lcm (size_t a, size_t b, size_t lcm_max)
   else
     {
       if (b)
-	{
-	  /* Return lcm (A, B) if it is in range; otherwise, fall back
-	     on A.  */
+        {
+          /* Return lcm (A, B) if it is in range; otherwise, fall back
+             on A.  */
 
-	  size_t lcm, m, n, q, r;
+          size_t lcm, m, n, q, r;
 
-	  /* N = gcd (A, B).  */
-	  for (m = a, n = b;  (r = m % n) != 0;  m = n, n = r)
-	    continue;
+          /* N = gcd (A, B).  */
+          for (m = a, n = b;  (r = m % n) != 0;  m = n, n = r)
+            continue;
 
-	  /* LCM = lcm (A, B), if in range.  */
-	  q = a / n;
-	  lcm = q * b;
-	  if (lcm <= lcm_max && lcm / b == q)
-	    return lcm;
-	}
+          /* LCM = lcm (A, B), if in range.  */
+          q = a / n;
+          lcm = q * b;
+          if (lcm <= lcm_max && lcm / b == q)
+            return lcm;
+        }
 
       size = a;
     }

lib/euidaccess-stat.c

@@ -2,7 +2,7 @@
    This function is probably useful only for choosing whether to issue
    a prompt in an implementation of POSIX-specified rm.
 
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 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
@@ -25,13 +25,6 @@
 
 #include <unistd.h>
 
-#ifndef F_OK
-# define F_OK 0
-# define X_OK 1
-# define W_OK 2
-# define R_OK 4
-#endif
-
 #include "group-member.h"
 #include "stat-macros.h"
 
@@ -57,8 +50,8 @@ euidaccess_stat (struct stat const *st, int mode)
     mode &= 7;
   else
     mode = ((mode & R_OK ? 4 : 0)
-	    + (mode & W_OK ? 2 : 0)
-	    + (mode & X_OK ? 1 : 0));
+            + (mode & W_OK ? 2 : 0)
+            + (mode & X_OK ? 1 : 0));
 
   if (mode == 0)
     return true;		/* The file exists.  */
@@ -68,7 +61,7 @@ euidaccess_stat (struct stat const *st, int mode)
   /* The super-user can read and write any file, and execute any file
      that anyone can execute.  */
   if (euid == 0 && ((mode & X_OK) == 0
-		    || (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
+                    || (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
     return true;
 
   /* Convert the file's permission bits to traditional form.  */
@@ -84,14 +77,14 @@ euidaccess_stat (struct stat const *st, int mode)
     granted = st->st_mode;
   else
     granted = (  (st->st_mode & S_IRUSR ? 4 << 6 : 0)
-	       + (st->st_mode & S_IWUSR ? 2 << 6 : 0)
-	       + (st->st_mode & S_IXUSR ? 1 << 6 : 0)
-	       + (st->st_mode & S_IRGRP ? 4 << 3 : 0)
-	       + (st->st_mode & S_IWGRP ? 2 << 3 : 0)
-	       + (st->st_mode & S_IXGRP ? 1 << 3 : 0)
-	       + (st->st_mode & S_IROTH ? 4 << 0 : 0)
-	       + (st->st_mode & S_IWOTH ? 2 << 0 : 0)
-	       + (st->st_mode & S_IXOTH ? 1 << 0 : 0));
+               + (st->st_mode & S_IWUSR ? 2 << 6 : 0)
+               + (st->st_mode & S_IXUSR ? 1 << 6 : 0)
+               + (st->st_mode & S_IRGRP ? 4 << 3 : 0)
+               + (st->st_mode & S_IWGRP ? 2 << 3 : 0)
+               + (st->st_mode & S_IXGRP ? 1 << 3 : 0)
+               + (st->st_mode & S_IROTH ? 4 << 0 : 0)
+               + (st->st_mode & S_IWOTH ? 2 << 0 : 0)
+               + (st->st_mode & S_IXOTH ? 1 << 0 : 0));
 
   if (euid == st->st_uid)
     granted >>= 6;
@@ -99,7 +92,7 @@ euidaccess_stat (struct stat const *st, int mode)
     {
       gid_t egid = getegid ();
       if (egid == st->st_gid || group_member (st->st_gid))
-	granted >>= 3;
+        granted >>= 3;
     }
 
   if ((mode & ~granted) == 0)
@@ -137,6 +130,6 @@ main (int argc, char **argv)
 
   ok = euidaccess_stat (&st, mode);
   printf ("%s: %s\n", file, ok ? "y" : "n");
-  exit (0);
+  return 0;
 }
 #endif

lib/fd-reopen.c

@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.
 
-   Copyright (C) 2005, 2006, 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2010 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

lib/fd-reopen.h

@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.
 
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2010 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

lib/fdopendir-glibc.c

@@ -1,136 +0,0 @@
-/* fdopendir implementation derived from glibc.
-
-   Copyright (C) 2006, 2009 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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdbool.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if _LIBC
-# include <dirstream.h>
-# include <not-cancel.h>
-
-#else
-
-# if __GNUC__ < 3
-#  define __builtin_expect(expr, expected_val) expr
-# endif
-
-# include "openat.h"
-# define stat64 stat
-# define dirent64 dirent
-# define __fxstat64(V, fd, sb) fstat(fd, sb)
-# define __fcntl fcntl
-# define __set_errno(Val) do { errno = (Val); } while (0)
-# define __libc_lock_init(NAME) ((NAME) = 0, 0)
-# define close_not_cancel_no_status(fd) close (fd)
-# ifdef __i386__
-#  define internal_function __attribute ((regparm (3), stdcall))
-# else
-#  define internal_function
-# endif
-
-struct __dirstream
-  {
-    int fd;			/* File descriptor.  */
-
-    char *data;			/* Directory block.  */
-    size_t allocation;		/* Space allocated for the block.  */
-    size_t size;		/* Total valid data in the block.  */
-    size_t offset;		/* Current offset into the block.  */
-
-    off_t filepos;		/* Position of next entry to read.  */
-    int lock;
-  };
-#endif
-
-#undef _STATBUF_ST_BLKSIZE
-
-static DIR *
-internal_function
-__alloc_dir (int fd, bool close_fd)
-{
-  if (__builtin_expect (__fcntl (fd, F_SETFD, FD_CLOEXEC), 0) < 0)
-    goto lose;
-
-  size_t allocation;
-#ifdef _STATBUF_ST_BLKSIZE
-  if (__builtin_expect ((size_t) statp->st_blksize >= sizeof (struct dirent64),
-			1))
-    allocation = statp->st_blksize;
-  else
-#endif
-    allocation = (BUFSIZ < sizeof (struct dirent64)
-		  ? sizeof (struct dirent64) : BUFSIZ);
-
-  const int pad = -sizeof (DIR) % __alignof__ (struct dirent64);
-
-  DIR *dirp = (DIR *) malloc (sizeof (DIR) + allocation + pad);
-  if (dirp == NULL)
-  lose:
-    {
-      if (close_fd)
-	{
-	  int save_errno = errno;
-	  close_not_cancel_no_status (fd);
-	  __set_errno (save_errno);
-	}
-      return NULL;
-    }
-  memset (dirp, '\0', sizeof (DIR));
-  dirp->data = (char *) (dirp + 1) + pad;
-  dirp->allocation = allocation;
-  dirp->fd = fd;
-
-  __libc_lock_init (dirp->lock);
-
-  return dirp;
-}
-
-DIR *
-fdopendir (int fd)
-{
-#if 0
-  struct stat64 statbuf;
-
-  if (__builtin_expect (__fxstat64 (_STAT_VER, fd, &statbuf), 0) < 0)
-    return NULL;
-  if (__builtin_expect (! S_ISDIR (statbuf.st_mode), 0))
-    {
-      __set_errno (ENOTDIR);
-      return NULL;
-    }
-  /* Make sure the descriptor allows for reading.  */
-  int flags = __fcntl (fd, F_GETFL);
-  if (__builtin_expect (flags == -1, 0))
-    return NULL;
-  if (__builtin_expect ((flags & O_ACCMODE) == O_WRONLY, 0))
-    {
-      __set_errno (EINVAL);
-      return NULL;
-    }
-#endif
-
-  return __alloc_dir (fd, false);
-}

lib/memxfrm.c

@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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
@@ -40,7 +40,7 @@
 
 size_t
 memxfrm (char *restrict dest, size_t destsize,
-	 char *restrict src, size_t srcsize)
+         char *restrict src, size_t srcsize)
 {
 #if HAVE_STRXFRM
 
@@ -59,33 +59,33 @@ memxfrm (char *restrict dest, size_t destsize,
       errno = 0;
       result += strxfrm (dest + di, src + si, destsize - di) + 1;
       if (errno != 0)
-	break;
+        break;
       if (result <= result0)
-	{
-	  errno = ERANGE;
-	  break;
-	}
+        {
+          errno = ERANGE;
+          break;
+        }
 
       if (result == destsize + 1 && si + slen == srcsize)
-	{
-	  /* The destination is exactly the right size, but strxfrm wants
-	     room for a trailing null.  Work around the problem with a
-	     temporary buffer.  */
-	  size_t bufsize = destsize - di + 1;
-	  char stackbuf[4000];
-	  char *buf = stackbuf;
-	  if (sizeof stackbuf < bufsize)
-	    {
-	      buf = malloc (bufsize);
-	      if (! buf)
-		break;
-	    }
-	  strxfrm (buf, src + si, bufsize);
-	  memcpy (dest + di, buf, destsize - di);
-	  if (sizeof stackbuf < bufsize)
-	    free (buf);
-	  errno = 0;
-	}
+        {
+          /* The destination is exactly the right size, but strxfrm wants
+             room for a trailing null.  Work around the problem with a
+             temporary buffer.  */
+          size_t bufsize = destsize - di + 1;
+          char stackbuf[4000];
+          char *buf = stackbuf;
+          if (sizeof stackbuf < bufsize)
+            {
+              buf = malloc (bufsize);
+              if (! buf)
+                break;
+            }
+          strxfrm (buf, src + si, bufsize);
+          memcpy (dest + di, buf, destsize - di);
+          if (sizeof stackbuf < bufsize)
+            free (buf);
+          errno = 0;
+        }
 
       di = (result < destsize ? result : destsize);
       si += slen + 1;

lib/strintcmp.c

@@ -1,6 +1,6 @@
 /* Compare integer strings.
 
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 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

lib/strnumcmp-in.h

@@ -1,7 +1,7 @@
 /* Compare numeric strings.  This is an internal include file.
 
-   Copyright (C) 1988, 1991, 1992, 1993, 1995, 1996, 1998, 1999, 2000,
-   2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991-1993, 1995-1996, 1998-2000, 2003-2006, 2009-2010
+   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
@@ -77,28 +77,28 @@ fraccompare (char const *a, char const *b, char decimal_point)
   if (*a == decimal_point && *b == decimal_point)
     {
       while (*++a == *++b)
-	if (! ISDIGIT (*a))
-	  return 0;
+        if (! ISDIGIT (*a))
+          return 0;
       if (ISDIGIT (*a) && ISDIGIT (*b))
-	return *a - *b;
+        return *a - *b;
       if (ISDIGIT (*a))
-	goto a_trailing_nonzero;
+        goto a_trailing_nonzero;
       if (ISDIGIT (*b))
-	goto b_trailing_nonzero;
+        goto b_trailing_nonzero;
       return 0;
     }
   else if (*a++ == decimal_point)
     {
     a_trailing_nonzero:
       while (*a == NUMERIC_ZERO)
-	a++;
+        a++;
       return ISDIGIT (*a);
     }
   else if (*b++ == decimal_point)
     {
     b_trailing_nonzero:
       while (*b == NUMERIC_ZERO)
-	b++;
+        b++;
       return - ISDIGIT (*b);
     }
   return 0;
@@ -113,7 +113,7 @@ fraccompare (char const *a, char const *b, char decimal_point)
 
 static inline int
 numcompare (char const *a, char const *b,
-	    int decimal_point, int thousands_sep)
+            int decimal_point, int thousands_sep)
 {
   unsigned char tmpa = *a;
   unsigned char tmpb = *b;
@@ -124,119 +124,119 @@ numcompare (char const *a, char const *b,
   if (tmpa == NEGATION_SIGN)
     {
       do
-	tmpa = *++a;
+        tmpa = *++a;
       while (tmpa == NUMERIC_ZERO || tmpa == thousands_sep);
       if (tmpb != NEGATION_SIGN)
-	{
-	  if (tmpa == decimal_point)
-	    do
-	      tmpa = *++a;
-	    while (tmpa == NUMERIC_ZERO);
-	  if (ISDIGIT (tmpa))
-	    return -1;
-	  while (tmpb == NUMERIC_ZERO || tmpb == thousands_sep)
-	    tmpb = *++b;
-	  if (tmpb == decimal_point)
-	    do
-	      tmpb = *++b;
-	    while (tmpb == NUMERIC_ZERO);
-	  return - ISDIGIT (tmpb);
-	}
+        {
+          if (tmpa == decimal_point)
+            do
+              tmpa = *++a;
+            while (tmpa == NUMERIC_ZERO);
+          if (ISDIGIT (tmpa))
+            return -1;
+          while (tmpb == NUMERIC_ZERO || tmpb == thousands_sep)
+            tmpb = *++b;
+          if (tmpb == decimal_point)
+            do
+              tmpb = *++b;
+            while (tmpb == NUMERIC_ZERO);
+          return - ISDIGIT (tmpb);
+        }
       do
-	tmpb = *++b;
+        tmpb = *++b;
       while (tmpb == NUMERIC_ZERO || tmpb == thousands_sep);
 
       while (tmpa == tmpb && ISDIGIT (tmpa))
-	{
-	  do
-	    tmpa = *++a;
-	  while (tmpa == thousands_sep);
-	  do
-	    tmpb = *++b;
-	  while (tmpb == thousands_sep);
-	}
+        {
+          do
+            tmpa = *++a;
+          while (tmpa == thousands_sep);
+          do
+            tmpb = *++b;
+          while (tmpb == thousands_sep);
+        }
 
       if ((tmpa == decimal_point && !ISDIGIT (tmpb))
-	  || (tmpb == decimal_point && !ISDIGIT (tmpa)))
-	return fraccompare (b, a, decimal_point);
+          || (tmpb == decimal_point && !ISDIGIT (tmpa)))
+        return fraccompare (b, a, decimal_point);
 
       tmp = tmpb - tmpa;
 
       for (log_a = 0; ISDIGIT (tmpa); ++log_a)
-	do
-	  tmpa = *++a;
-	while (tmpa == thousands_sep);
+        do
+          tmpa = *++a;
+        while (tmpa == thousands_sep);
 
       for (log_b = 0; ISDIGIT (tmpb); ++log_b)
-	do
-	  tmpb = *++b;
-	while (tmpb == thousands_sep);
+        do
+          tmpb = *++b;
+        while (tmpb == thousands_sep);
 
       if (log_a != log_b)
-	return log_a < log_b ? 1 : -1;
+        return log_a < log_b ? 1 : -1;
 
       if (!log_a)
-	return 0;
+        return 0;
 
       return tmp;
     }
   else if (tmpb == NEGATION_SIGN)
     {
       do
-	tmpb = *++b;
+        tmpb = *++b;
       while (tmpb == NUMERIC_ZERO || tmpb == thousands_sep);
       if (tmpb == decimal_point)
-	do
-	  tmpb = *++b;
-	while (tmpb == NUMERIC_ZERO);
+        do
+          tmpb = *++b;
+        while (tmpb == NUMERIC_ZERO);
       if (ISDIGIT (tmpb))
-	return 1;
+        return 1;
       while (tmpa == NUMERIC_ZERO || tmpa == thousands_sep)
-	tmpa = *++a;
+        tmpa = *++a;
       if (tmpa == decimal_point)
-	do
-	  tmpa = *++a;
-	while (tmpa == NUMERIC_ZERO);
+        do
+          tmpa = *++a;
+        while (tmpa == NUMERIC_ZERO);
       return ISDIGIT (tmpa);
     }
   else
     {
       while (tmpa == NUMERIC_ZERO || tmpa == thousands_sep)
-	tmpa = *++a;
+        tmpa = *++a;
       while (tmpb == NUMERIC_ZERO || tmpb == thousands_sep)
-	tmpb = *++b;
+        tmpb = *++b;
 
       while (tmpa == tmpb && ISDIGIT (tmpa))
-	{
-	  do
-	    tmpa = *++a;
-	  while (tmpa == thousands_sep);
-	  do
-	    tmpb = *++b;
-	  while (tmpb == thousands_sep);
-	}
+        {
+          do
+            tmpa = *++a;
+          while (tmpa == thousands_sep);
+          do
+            tmpb = *++b;
+          while (tmpb == thousands_sep);
+        }
 
       if ((tmpa == decimal_point && !ISDIGIT (tmpb))
-	  || (tmpb == decimal_point && !ISDIGIT (tmpa)))
-	return fraccompare (a, b, decimal_point);
+          || (tmpb == decimal_point && !ISDIGIT (tmpa)))
+        return fraccompare (a, b, decimal_point);
 
       tmp = tmpa - tmpb;
 
       for (log_a = 0; ISDIGIT (tmpa); ++log_a)
-	do
-	  tmpa = *++a;
-	while (tmpa == thousands_sep);
+        do
+          tmpa = *++a;
+        while (tmpa == thousands_sep);
 
       for (log_b = 0; ISDIGIT (tmpb); ++log_b)
-	do
-	  tmpb = *++b;
-	while (tmpb == thousands_sep);
+        do
+          tmpb = *++b;
+        while (tmpb == thousands_sep);
 
       if (log_a != log_b)
-	return log_a < log_b ? -1 : 1;
+        return log_a < log_b ? -1 : 1;
 
       if (!log_a)
-	return 0;
+        return 0;
 
       return tmp;
     }

lib/strnumcmp.c

@@ -1,6 +1,6 @@
 /* Compare numeric strings.
 
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 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
@@ -25,7 +25,7 @@
 
 int
 strnumcmp (char const *a, char const *b,
-	   int decimal_point, int thousands_sep)
+           int decimal_point, int thousands_sep)
 {
   return numcompare (a, b, decimal_point, thousands_sep);
 }

lib/t-chdir-long

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise chdir-long's sample main program.
 
-# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2006, 2009-2010 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
@@ -38,10 +38,10 @@ function mkdir_len
   ( cd $root &&
     perl -e 'my $len='$n'-length "'$root'";$i=100;$d="z"x$i;
                   while ($i+2 < $len) {
-		    $len -= $i + 1;
-		    mkdir $d,0700 or die "$!\n";
-		    chdir $d} $d="z"x($len-1);
-		    mkdir $d or die "mkdir_len: $d: $!\n"' )
+                    $len -= $i + 1;
+                    mkdir $d,0700 or die "$!\n";
+                    chdir $d} $d="z"x($len-1);
+                    mkdir $d or die "mkdir_len: $d: $!\n"' )
 }
 
 size_list=

lib/xfts.c

@@ -1,6 +1,6 @@
 /* xfts.c -- a wrapper for fts_open
 
-   Copyright (C) 2003, 2005-2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2010 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,13 +21,9 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <assert.h>
 
-#include "error.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-#include "quote.h"
 #include "xalloc.h"
 #include "xfts.h"
 
@@ -35,29 +31,35 @@
 
 FTS *
 xfts_open (char * const *argv, int options,
-	   int (*compar) (const FTSENT **, const FTSENT **))
+           int (*compar) (const FTSENT **, const FTSENT **))
 {
   FTS *fts = fts_open (argv, options | FTS_CWDFD, compar);
   if (fts == NULL)
     {
-      /* This can fail in three ways: out of memory, invalid bit_flags,
-	 and one or more of the FILES is an empty string.  We could try
-	 to decipher that errno==EINVAL means invalid bit_flags and
-	 errno==ENOENT means there's an empty string, but that seems wrong.
-	 Ideally, fts_open would return a proper error indicator.  For now,
-	 we'll presume that the bit_flags are valid and just check for
-	 empty strings.  */
-      bool invalid_arg = false;
-      for (; *argv; ++argv)
-	{
-	  if (**argv == '\0')
-	    invalid_arg = true;
-	}
-      if (invalid_arg)
-	error (EXIT_FAILURE, 0, _("invalid argument: %s"), quote (""));
-      else
-	xalloc_die ();
+      /* This can fail in two ways: out of memory or with errno==EINVAL,
+         which indicates it was called with invalid bit_flags.  */
+      assert (errno != EINVAL);
+      xalloc_die ();
     }
 
   return fts;
 }
+
+/* When fts_read returns FTS_DC to indicate a directory cycle,
+   it may or may not indicate a real problem.  When a program like
+   chgrp performs a recursive traversal that requires traversing
+   symbolic links, it is *not* a problem.  However, when invoked
+   with "-P -R", it deserves a warning.  The fts_options member
+   records the options that control this aspect of fts's behavior,
+   so test that.  */
+bool
+cycle_warning_required (FTS const *fts, FTSENT const *ent)
+{
+#define ISSET(Fts,Opt) ((Fts)->fts_options & (Opt))
+  /* When dereferencing no symlinks, or when dereferencing only
+     those listed on the command line and we're not processing
+     a command-line argument, then a cycle is a serious problem. */
+  return ((ISSET (fts, FTS_PHYSICAL) && !ISSET (fts, FTS_COMFOLLOW))
+          || (ISSET (fts, FTS_PHYSICAL) && ISSET (fts, FTS_COMFOLLOW)
+              && ent->fts_level != FTS_ROOTLEVEL));
+}

lib/xfts.h

@@ -1,5 +1,9 @@
+#include <stdbool.h>
 #include "fts_.h"
 
 FTS *
 xfts_open (char * const *, int options,
-	   int (*) (const FTSENT **, const FTSENT **));
+           int (*) (const FTSENT **, const FTSENT **));
+
+bool
+cycle_warning_required (FTS const *fts, FTSENT const *ent);

lib/xmemxfrm.c

@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation
 
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2010 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,7 +45,7 @@
 
 size_t
 xmemxfrm (char *restrict dest, size_t destsize,
-	  char *restrict src, size_t srcsize)
+          char *restrict src, size_t srcsize)
 {
   size_t translated_size = memxfrm (dest, destsize, src, srcsize);
 
@@ -54,8 +54,8 @@ xmemxfrm (char *restrict dest, size_t destsize,
       error (0, errno, _("string transformation failed"));
       error (0, 0, _("set LC_ALL='C' to work around the problem"));
       error (exit_failure, 0,
-	     _("the untransformed string was %s"),
-	     quotearg_n_style_mem (0, locale_quoting_style, src, srcsize));
+             _("the untransformed string was %s"),
+             quotearg_n_style_mem (0, locale_quoting_style, src, srcsize));
     }
 
   return translated_size;

m4/ChangeLog-2007

@@ -5004,8 +5004,7 @@
 
 	-----
 
-	Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-	2005, 2006, 2009 Free Software Foundation, Inc.
+	Copyright (C) 1997-2006, 2009-2010 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice

m4/boottime.m4

@@ -1,7 +1,8 @@
 # boottime.m4 serial 4
 # Determine whether this system has infrastructure for obtaining the boot time.
 
-# Copyright (C) 1996, 2000, 2002-2004, 2006, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000, 2002-2004, 2006, 2008-2010 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

m4/check-decl.m4

@@ -1,8 +1,8 @@
-#serial 24
+#serial 26
 # Check declarations for this package.
 
-dnl Copyright (C) 1997-2001, 2003-2006, 2008-2009 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1997-2001, 2003-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -35,15 +35,7 @@ AC_DEFUN([gl_CHECK_DECLS],
     getpwuid,
     ttyname], , , $headers)
 
-  AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
-
-  AC_CHECK_DECLS_ONCE([free])
-  AC_CHECK_DECLS_ONCE([getenv])
   AC_CHECK_DECLS_ONCE([geteuid])
   AC_CHECK_DECLS_ONCE([getlogin])
   AC_CHECK_DECLS_ONCE([getuid])
-  AC_CHECK_DECLS_ONCE([lseek])
-  AC_CHECK_DECLS_ONCE([malloc])
-  AC_CHECK_DECLS_ONCE([memchr])
-  AC_CHECK_DECLS_ONCE([realloc])
 ])

m4/euidaccess-stat.m4

@@ -1,5 +1,5 @@
 # serial 1
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

m4/fd-reopen.m4

@@ -1,6 +1,6 @@
 # Invoke open, but return either a desired file descriptor or -1.
 
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

m4/gmp.m4

@@ -1,6 +1,6 @@
 # Tests for GNU GMP (or any compatible replacement).
 
-dnl Copyright (C) 2008-2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,9 @@ AC_DEFUN([cu_GMP],
         LIB_GMP=$ac_cv_search___gmpz_init
         AC_DEFINE([HAVE_GMP], [1],
           [Define if you have GNU libgmp (or replacement)])
-       }])
+       }],
+      [AC_MSG_WARN([libgmp development library was not found or not usable.])
+       AC_MSG_WARN([AC_PACKAGE_NAME will be built without GMP support.])])
     LIBS=$cu_saved_libs
   fi
 ])

m4/include-exclude-prog.m4

@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -36,8 +36,8 @@ AC_DEFUN([gl_INCLUDE_EXCLUDE_PROG],
   gl_no_install_progs_default=`echo '$2'|sed 's/,/ /g'`
   AC_ARG_ENABLE([install-program],
     [AS_HELP_STRING([--enable-install-program=PROG_LIST],
-		    [install the programs in PROG_LIST (comma-separated,
-		    default: none)])],
+                    [install the programs in PROG_LIST (comma-separated,
+                    default: none)])],
     [gl_do_install_prog=$enableval],
     [gl_do_install_prog=]
   )
@@ -46,8 +46,8 @@ AC_DEFUN([gl_INCLUDE_EXCLUDE_PROG],
   # use --enable-no-install-program=A,B
   AC_ARG_ENABLE([no-install-program],
     [AS_HELP_STRING([--enable-no-install-program=PROG_LIST],
-		    [do NOT install the programs in PROG_LIST
-		    (comma-separated, default: $2)])],
+                    [do NOT install the programs in PROG_LIST
+                    (comma-separated, default: $2)])],
     [gl_no_install_prog=$enableval],
     [gl_no_install_prog=]
   )
@@ -78,7 +78,7 @@ AC_DEFUN([gl_INCLUDE_EXCLUDE_PROG],
       # Warn about a request not to install a program that is
       # already on the default-no-install list.
       case " $gl_no_install_progs_default " in
-	*" $gl_i "*) gl_msg="by default, '$gl_i' is not installed" ;;
+        *" $gl_i "*) gl_msg="by default, '$gl_i' is not installed" ;;
       esac
     fi
 

m4/jm-macros.m4

@@ -2,7 +2,7 @@
 
 dnl Misc type-related macros for coreutils.
 
-# Copyright (C) 1998, 2000-2009 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2010 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
@@ -37,9 +37,9 @@ AC_DEFUN([coreutils_MACROS],
 
   # By default, argmatch should fail calling usage (1).
   AC_DEFINE([ARGMATCH_DIE], [usage (1)],
-	    [Define to the function xargmatch calls on failures.])
+            [Define to the function xargmatch calls on failures.])
   AC_DEFINE([ARGMATCH_DIE_DECL], [void usage (int _e)],
-	    [Define to the declaration of the xargmatch failure function.])
+            [Define to the declaration of the xargmatch failure function.])
 
   # used by ls
   AC_REQUIRE([gl_CLOCK_TIME])
@@ -52,13 +52,13 @@ AC_DEFUN([coreutils_MACROS],
     AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
     [
       case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
-	no:*) # SELinux disabled
-	  ;;
-	*:no) # SELinux disabled
-	  ;;
-	*)
-	AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
-	AC_MSG_WARN([The install utility may run slowly])
+        no:*) # SELinux disabled
+          ;;
+        *:no) # SELinux disabled
+          ;;
+        *)
+        AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+        AC_MSG_WARN([The install utility may run slowly])
       esac
     ])
   LIBS=$coreutils_saved_libs
@@ -89,33 +89,40 @@ AC_DEFUN([coreutils_MACROS],
     tcgetpgrp \
   )
 
-  # for cp.c
-  AC_CHECK_FUNCS_ONCE([utimensat])
-
   dnl This can't use AC_REQUIRE; I'm not quite sure why.
   cu_PREREQ_STAT_PROG
 
   # for dd.c and shred.c
   coreutils_saved_libs=$LIBS
+    LIB_FDATASYNC=
     AC_SEARCH_LIBS([fdatasync], [rt posix4],
-		   [test "$ac_cv_search_fdatasync" = "none required" ||
-		    LIB_FDATASYNC=$ac_cv_search_fdatasync])
+                   [test "$ac_cv_search_fdatasync" = "none required" ||
+                    LIB_FDATASYNC=$ac_cv_search_fdatasync])
     AC_SUBST([LIB_FDATASYNC])
     AC_CHECK_FUNCS([fdatasync])
   LIBS=$coreutils_saved_libs
 
   # Check whether libcap is usable -- for ls --color support
+  LIB_CAP=
   AC_ARG_ENABLE([libcap],
-    AC_HELP_STRING([--disable-libcap], [disable libcap support]),
-    AC_MSG_WARN([libcap support disabled by user]),
-    [AC_CHECK_LIB([cap], [cap_get_file],
+    AC_HELP_STRING([--disable-libcap], [disable libcap support]))
+  if test "X$enable_libcap" != "Xno"; then
+    AC_CHECK_LIB([cap], [cap_get_file],
       [AC_CHECK_HEADER([sys/capability.h],
-	[LIB_CAP=-lcap
-	 AC_DEFINE([HAVE_CAP], [1], [libcap usability])],
-	[AC_MSG_WARN([header sys/capability.h was not found, support for libcap will not be built])]
-      )],
-      [AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])])
-    ])
+        [LIB_CAP=-lcap
+         AC_DEFINE([HAVE_CAP], [1], [libcap usability])]
+      )])
+    if test "X$LIB_CAP" = "X"; then
+      if test "X$enable_libcap" = "Xyes"; then
+        AC_MSG_ERROR([libcap library was not found or not usable])
+      else
+        AC_MSG_WARN([libcap library was not found or not usable.])
+        AC_MSG_WARN([AC_PACKAGE_NAME will be built without capability support.])
+      fi
+    fi
+  else
+    AC_MSG_WARN([libcap support disabled by user])
+  fi
   AC_SUBST([LIB_CAP])
 
   # See if linking `seq' requires -lm.

m4/lib-check.m4

@@ -2,8 +2,8 @@
 
 dnl Misc lib-related macros for coreutils.
 
-# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2010 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
@@ -51,10 +51,11 @@ $ac_includes_default
 
   # SCO-ODT-3.0 is reported to need -lufc for crypt.
   # NetBSD needs -lcrypt for crypt.
+  LIB_CRYPT=
   cu_saved_libs="$LIBS"
   AC_SEARCH_LIBS([crypt], [ufc crypt],
-		 [test "$ac_cv_search_crypt" = "none required" ||
-		  LIB_CRYPT="$ac_cv_search_crypt"])
+                 [test "$ac_cv_search_crypt" = "none required" ||
+                  LIB_CRYPT="$ac_cv_search_crypt"])
   LIBS="$cu_saved_libs"
   AC_SUBST([LIB_CRYPT])
 ])

m4/memxfrm.m4

@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

m4/prereq.m4

@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.
 
 
-# Copyright (C) 1998, 2000, 2001, 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-2001, 2003-2010 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

m4/stat-prog.m4

@@ -1,7 +1,7 @@
 # stat-prog.m4 serial 6
 # Record the prerequisites of src/stat.c from the coreutils package.
 
-# Copyright (C) 2002-2004, 2006, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2004, 2006, 2008-2010 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
@@ -57,30 +57,30 @@ AC_INCLUDES_DEFAULT
      { AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [$statvfs_includes])
        test $ac_cv_member_struct_statvfs_f_basetype = yes ||
        { AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,, [$statvfs_includes])
-	 test $ac_cv_member_struct_statvfs_f_fstypename = yes ||
-	 { test $ac_cv_member_struct_statfs_f_fstypename != yes &&
-	   { AC_CHECK_MEMBERS([struct statvfs.f_type],,, [$statvfs_includes])
-	     test $ac_cv_member_struct_statvfs_f_type = yes; }; }; }; }
+         test $ac_cv_member_struct_statvfs_f_fstypename = yes ||
+         { test $ac_cv_member_struct_statfs_f_fstypename != yes &&
+           { AC_CHECK_MEMBERS([struct statvfs.f_type],,, [$statvfs_includes])
+             test $ac_cv_member_struct_statvfs_f_type = yes; }; }; }; }
   then
     AC_CHECK_MEMBERS([struct statvfs.f_namemax],,, [$statvfs_includes])
     AC_COMPILE_IFELSE(
       [AC_LANG_PROGRAM(
-	 [$statvfs_includes],
-	 [static statvfs s;
-	  return (s.s_fsid ^ 0) == 0;])],
+         [$statvfs_includes],
+         [static statvfs s;
+          return (s.s_fsid ^ 0) == 0;])],
       [AC_DEFINE([STRUCT_STATVFS_F_FSID_IS_INTEGER], [1],
-	 [Define to 1 if the f_fsid member of struct statvfs is an integer.])])
+         [Define to 1 if the f_fsid member of struct statvfs is an integer.])])
   else
     AC_CHECK_MEMBERS([struct statfs.f_namelen, struct statfs.f_type],,,
       [$statfs_includes])
     if test $ac_cv_header_OS_h != yes; then
       AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-	   [$statfs_includes],
-	   [static statfs s;
-	    return (s.s_fsid ^ 0) == 0;])],
-	[AC_DEFINE([STRUCT_STATFS_F_FSID_IS_INTEGER], [1],
-	   [Define to 1 if the f_fsid member of struct statfs is an integer.])])
+        [AC_LANG_PROGRAM(
+           [$statfs_includes],
+           [static statfs s;
+            return (s.s_fsid ^ 0) == 0;])],
+        [AC_DEFINE([STRUCT_STATFS_F_FSID_IS_INTEGER], [1],
+           [Define to 1 if the f_fsid member of struct statfs is an integer.])])
     fi
   fi
 ])

m4/strnumcmp.m4

@@ -1,6 +1,6 @@
 # Compare numeric strings.
 
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,

m4/xattr.m4

@@ -1,6 +1,6 @@
 # xattr.m4 - check for Extended Attributes (Linux)
 
-# Copyright (C) 2003, 2008-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,26 +11,33 @@
 AC_DEFUN([gl_FUNC_XATTR],
 [
   AC_ARG_ENABLE([xattr],
-	AC_HELP_STRING([--disable-xattr],
-		       [do not support extended attributes]),
-	[use_xattr=$enableval], [use_xattr=yes])
+        AC_HELP_STRING([--disable-xattr],
+                       [do not support extended attributes]),
+        [use_xattr=$enableval], [use_xattr=yes])
+
+  LIB_XATTR=
+  AC_SUBST([LIB_XATTR])
 
   if test "$use_xattr" = "yes"; then
     AC_CHECK_HEADERS([attr/error_context.h attr/libattr.h])
+    use_xattr=no
     if test $ac_cv_header_attr_libattr_h = yes \
-       && test $ac_cv_header_attr_error_context_h = yes; then
-      use_xattr=1
-    else
-      use_xattr=0
+        && test $ac_cv_header_attr_error_context_h = yes; then
+      xattr_saved_LIBS=$LIBS
+      AC_SEARCH_LIBS([attr_copy_file], [attr],
+                     [test "$ac_cv_search_attr_copy_file" = "none required" ||
+                        LIB_XATTR=$ac_cv_search_attr_copy_file])
+      AC_CHECK_FUNCS([attr_copy_file])
+      LIBS=$xattr_saved_LIBS
+      if test $ac_cv_func_attr_copy_file = yes; then
+        use_xattr=yes
+      fi
     fi
     AC_DEFINE_UNQUOTED([USE_XATTR], [$use_xattr],
-		       [Define if you want extended attribute support.])
-    xattr_saved_LIBS=$LIBS
-    AC_SEARCH_LIBS([attr_copy_file], [attr],
-		   [test "$ac_cv_search_attr_copy_file" = "none required" ||
-		      LIB_XATTR=$ac_cv_search_attr_copy_file])
-    AC_CHECK_FUNCS([attr_copy_file])
-    LIBS=$xattr_saved_LIBS
-    AC_SUBST([LIB_XATTR])
+                       [Define if you want extended attribute support.])
+    if test $use_xattr = no; then
+      AC_MSG_WARN([libattr development library was not found or not usable.])
+      AC_MSG_WARN([AC_PACKAGE_NAME will be built without xattr support.])
+    fi
   fi
 ])

m4/xfts.m4

@@ -1,5 +1,5 @@
 #serial 1
-dnl Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

man/.gitignore

@@ -48,6 +48,7 @@ mv.1
 nice.1
 nl.1
 nohup.1
+nproc.1
 od.1
 paste.1
 pathchk.1

man/Makefile.am

@@ -1,6 +1,6 @@
 # Make coreutils man pages.				-*-Makefile-*-
 
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -80,6 +80,7 @@ mv.1:		$(common_dep)	$(srcdir)/mv.x		../src/mv.c
 nice.1:		$(common_dep)	$(srcdir)/nice.x	../src/nice.c
 nl.1:		$(common_dep)	$(srcdir)/nl.x		../src/nl.c
 nohup.1:	$(common_dep)	$(srcdir)/nohup.x	../src/nohup.c
+nproc.1:	$(common_dep)	$(srcdir)/nproc.x	../src/nproc.c
 od.1:		$(common_dep)	$(srcdir)/od.x		../src/od.c
 paste.1:	$(common_dep)	$(srcdir)/paste.x	../src/paste.c
 pathchk.1:	$(common_dep)	$(srcdir)/pathchk.x	../src/pathchk.c

man/chmod.x

@@ -1,4 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006, 2007, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2001, 2006-2007, 2009-2010 Free Software
+'\" Foundation, Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.

man/chown.x

@@ -1,4 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006, 2009 Free Software Foundation, Inc.
+'\" Copyright (C) 1998-1999, 2001, 2006, 2009-2010 Free Software Foundation,
+'\" Inc.
 '\"
 '\" This is free software.  You may redistribute copies of it under the terms
 '\" of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.