Merge remote branch 'origin/next' into next

rm: record timing data
* README-rm-timing-compare: new file * README-rm-timing-2: New file.
2025-09-10 07:59:52 +02:00 · 2009-10-10 09:28:19 -06:00 · 2009-10-10 09:21:36 -06:00 · 2009-10-10 09:14:39 -06:00 · 2009-10-10 09:14:35 -06:00 · 2009-10-10 09:14:17 -06:00
660 changed files with 2906 additions and 4552 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,5 +5,3 @@
 # # Derived from the regexp in emacs' lisp/add-log.el.
 # [diff "texinfo"]
 #         funcname = "^@node[ \t][ \t]*\\([^,][^,]*\\)"
-
-gl/lib/*.diff -whitespace
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,8 @@
 *.I[12]
 *.[EIOX]
-*.bak
 *.o
 */.deps
 *~
-._bootmp
 .gdb-history
 .kludge-stamp
 .tarball-version
@@ -45,21 +43,16 @@ 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
@@ -79,5 +72,3 @@ src/version.c
 src/version.h
 stamp-h1
 tests/*/*.log
-tests/t?
-tests/test-suite.log
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-8.3
+8.0
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.

-# Copyright (C) 2003-2004, 2006-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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
--- a/.x-sc_prohibit_fail_0
+++ b/.x-sc_prohibit_fail_0
@@ -1,3 +0,0 @@
-\.mk$
-/Makefile\.am$
-^tests/test-lib\.sh$
--- a/.x-sc_prohibit_magic_number_exit
+++ b/.x-sc_prohibit_magic_number_exit
@@ -1,3 +0,0 @@
-configure.ac
-*.m4
-ChangeLog*
--- a/.x-sc_prohibit_tab_based_indentation
+++ b/.x-sc_prohibit_tab_based_indentation
@@ -4,4 +4,3 @@ Makefile\.am$
 ^tests/pr/
 ChangeLog.*
 ^man/help2man$
-^gl/lib/.*\.c\.diff$
--- a/.x-sc_space_tab
+++ b/.x-sc_space_tab
@@ -9,4 +9,3 @@ m4/lib-prefix.m4
 m4/po.m4
 aclocal.m4
 src/c99-to-c89.diff
-^gl/lib/.*\.c\.diff$
--- a/3
+++ b/3
@@ -46,12 +46,11 @@ md5sum: Ulrich Drepper, Scott Miller, David Madore
 mkdir: David MacKenzie
 mkfifo: David MacKenzie
 mknod: David MacKenzie
-mktemp: Jim Meyering, Eric Blake
+mktemp: Jim Meyering
 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
--- a/2
+++ b/2
@@ -11609,7 +11609,7 @@

 	-----

-	Copyright (C) 2002-2005, 2009-2010 Free Software Foundation, Inc.
+	Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -4033,7 +4033,7 @@

 	-----

-	Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+	Copyright (C) 2006, 2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -4015,7 +4015,7 @@

 	-----

-	Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+	Copyright (C) 2007, 2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/2
+++ b/2
@@ -372,7 +372,7 @@

 	-----

-	Copyright (C) 2008-2010 Free Software Foundation, Inc.
+	Copyright (C) 2008-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/4
+++ b/4
@@ -481,10 +481,10 @@ Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.

 ========================================================================
-Copyright (C) 2009-2010 Free Software Foundation, Inc.
+Copyright (C) 2009 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.3 or
+under the terms of the GNU Free Documentation License, Version 1.2 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
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils.					-*-Makefile-*-

-# Copyright (C) 1990, 1993-2010 Free Software Foundation, Inc.
+# Copyright (C) 1990, 1993-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
@@ -47,8 +47,6 @@ 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	\
--- a/191
+++ b/191
@@ -1,112 +1,6 @@
 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]
+* Noteworthy changes in release ?.? (????-??-??) [?]

 ** Bug fixes

@@ -114,94 +8,15 @@ GNU coreutils NEWS                                    -*- outline -*-
  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]

@@ -2906,10 +2721,10 @@ packages, see ./old/*/NEWS.

 ========================================================================

-Copyright (C) 2001-2010 Free Software Foundation, Inc.
+Copyright (C) 2001-2009 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.3 or
+under the terms of the GNU Free Documentation License, Version 1.2 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
--- a/6
+++ b/6
@@ -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
-  nproc od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
+  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-2010 Free Software Foundation, Inc.
+Copyright (C) 1998, 2002-2009 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.3 or
+under the terms of the GNU Free Documentation License, Version 1.2 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
--- a/10
+++ b/10
@@ -35,7 +35,7 @@ which are extracted from other source packages:

 And there you are!  Just

-        $ ./configure --quiet #[--enable-gcc-warnings] [*]
+        $ ./configure #[--enable-gcc-warnings]
        $ make
        $ make check

@@ -48,15 +48,9 @@ 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-2010 Free Software Foundation, Inc.
+Copyright (C) 2002-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
--- a/15
+++ b/15
@@ -17,15 +17,11 @@ 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.  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
+as they may be required to build the newer versions.

 * autoconf *

-  # Note Autoconf 2.62 or newer is needed to build automake-1.11.1
+  # Note Autoconf 2.62 or newer is needed to build automake-1.11
  git clone --depth=1 git://git.sv.gnu.org/autoconf.git
  git checkout v2.62
  autoreconf -vi
@@ -37,7 +33,7 @@ $PATH is set correctly, which can be done for the current shell like:
  # Note help2man is required to build automake fully
  git clone git://git.sv.gnu.org/automake.git
  cd automake
-  git checkout v1.11.1
+  git checkout -b branch-1.11 --track origin/branch-1.11
  ./bootstrap
  ./configure --prefix=$HOME/coreutils/deps
  make install
@@ -54,4 +50,7 @@ requires version 1.10a or newer, as well as the xz program itself.
  ./configure --prefix=$HOME/coreutils/deps
  make install

-Now one can build coreutils as described in README-hacking.
+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
--- a/13
+++ b/13
@@ -29,10 +29,13 @@ FIXME: enable excluded programs like arch? to get their manual pages?

 * Run "make distcheck"

-* 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.,
+* Manually set the date, version number, and [stable/alpha/beta] on
+  line 3 of NEWS, then do e.g.,:

-    build-aux/do-release-commit-and-tag 8.1 beta
+    v=8.0
+    pkg=$(sed -n 's/^PACKAGE = \(.*\)/\1/p' Makefile)
+    git commit -F <(printf 'version '$v'\n\n* NEWS: Record release date.\n') -a
+    git tag -s -m "$pkg $v" v$v HEAD

 * Run the following to create release tarballs.  Your choice selects the
  corresponding upload-to destination in the emitted gnupload command.
@@ -50,7 +53,7 @@ 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 stable" run above.
+* Run the gnupload command that was suggested by your "make major" 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
@@ -76,7 +79,7 @@ Once all the builds and tests have passed,
  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)
+   https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=gzip)

    Subject: coreutils-0.0 released [beta]
    The announcement is here:
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Convert this package for use with valgrind.

-# Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-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
--- a/18
+++ b/18
@@ -52,7 +52,6 @@ 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
@@ -102,10 +101,8 @@ 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
@@ -152,7 +149,6 @@ 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
@@ -214,7 +210,6 @@ 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
@@ -251,7 +246,6 @@ 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
@@ -268,7 +262,6 @@ 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
@@ -303,7 +296,6 @@ 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
@@ -338,7 +330,6 @@ 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
@@ -377,7 +368,6 @@ 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
@@ -407,7 +397,7 @@ 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
@@ -514,11 +504,9 @@ 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
@@ -535,7 +523,6 @@ 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
@@ -545,7 +532,6 @@ 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
@@ -553,13 +539,11 @@ 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
--- a/7
+++ b/7
@@ -12,6 +12,7 @@ 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

@@ -59,6 +60,10 @@ 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*.
@@ -165,7 +170,7 @@ pr's use of nstrftime can make it malloc a very large (up to SIZE_MAX) buffer

 -----

-Copyright (C) 2002-2010 Free Software Foundation, Inc.
+Copyright (C) 2002-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
--- a/19
+++ b/19
@@ -2,7 +2,7 @@

 # Bootstrap this package from checked-out sources.

-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
@@ -71,7 +71,6 @@ gnulib_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
@@ -314,20 +313,10 @@ get_version() {
  $app --version >/dev/null 2>&1 || return 1

  $app --version 2>&1 |
-  sed -n '# extract version within line
-          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+  sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p
          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'
 }

@@ -427,7 +416,7 @@ case ${GNULIB_SRCDIR--} in
        git_modules_config submodule.gnulib.url >/dev/null; then
    git submodule init
    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
-    git_modules_config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
    echo "$0: getting gnulib files..."
    git submodule update || exit $?
    GNULIB_SRCDIR=gnulib
@@ -744,7 +733,7 @@ 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 ||
+grep '^[	 ]*AC_CONFIG_HEADERS\>' configure.ac >/dev/null ||
  AUTOHEADER=true

 for command in \
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.

-# Copyright (C) 2006-2010 Free Software Foundation, Inc.
+# 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
@@ -71,9 +71,7 @@ gnulib_modules="
  diacrit
  dirfd
  dirname
-  do-release-commit-and-tag
  dup2
-  environ
  error
  euidaccess
  exclude
@@ -92,7 +90,6 @@ gnulib_modules="
  fopen-safer
  fprintftime
  freopen
-  freopen-safer
  fseeko
  fsusage
  fsync
@@ -130,7 +127,6 @@ gnulib_modules="
  inttostr
  inttypes
  isapipe
-  isblank
  lchmod
  lchown
  lib-ignore
@@ -160,7 +156,6 @@ gnulib_modules="
  modechange
  mountlist
  mpsort
-  nproc
  obstack
  pathmax
  perl
@@ -183,8 +178,8 @@ gnulib_modules="
  readutmp
  realloc
  regex
-  remove
  rename
+  rename-dest-slash
  rmdir
  root-dev-ino
  rpmatch
@@ -210,6 +205,7 @@ gnulib_modules="
  strsignal
  strtoimax
  strtoumax
+  strverscmp
  symlink
  sys_stat
  timespec
@@ -219,7 +215,6 @@ gnulib_modules="
  unistd-safer
  unlink-busy
  unlocked-io
-  unsetenv
  update-copyright
  uptime
  useless-if-before-free
@@ -231,6 +226,7 @@ gnulib_modules="
  verify
  verror
  version-etc-fsf
+  warnings
  wcwidth
  winsz-ioctl
  winsz-termios
@@ -310,8 +306,8 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"

 # Build prerequisites
 buildreq="\
-autoconf   2.62
-automake   1.11.1
+autoconf   2.61
+automake   1.11
 autopoint  -
 bison      -
 gettext    -
--- a/build-aux/ChangeLog-2007
+++ b/build-aux/ChangeLog-2007
@@ -234,7 +234,7 @@

 	-----

-	Copyright (C) 2002-2010 Free Software Foundation, Inc.
+	Copyright (C) 2002-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
@@ -14,9 +14,22 @@
 # 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/$(PACKAGE)
+
+# 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 =

@@ -26,10 +39,7 @@ bootstrap-tools = autoconf,automake,gnulib,bison
 # Now that we have better tests, make this the default.
 export VERBOSE = yes

-old_NEWS_hash = beab130e9d41bf8014a0594cfe8b28d4
-
-# Add an exemption for sc_makefile_at_at_check.
-_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'
+old_NEWS_hash = 785e51bc9af87e7eb004f9ba24a0ca27

 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
@@ -181,18 +191,6 @@ 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.
@@ -220,33 +218,4 @@ sc_prohibit_emacs__indent_tabs_mode__setting:
 	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
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # -*- autoconf -*-
 # Process this file with autoconf to produce a configure script.

-# Copyright (C) 1991, 1993-2010 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1993-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
@@ -18,7 +18,7 @@

 dnl Written by Jim Meyering.

-AC_PREREQ([2.62])
+AC_PREREQ([2.61])

 # 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)
@@ -32,7 +32,7 @@ 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.1 dist-xz color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.

 AC_PROG_CC_STDC
@@ -106,7 +106,6 @@ if test "$gl_gcc_warnings" = yes; then
  gl_WARN_ADD([-Wno-logical-op])

  gl_WARN_ADD([-fdiagnostics-show-option])
-  gl_WARN_ADD([-funit-at-a-time])

  AC_SUBST([WARN_CFLAGS])

@@ -114,16 +113,6 @@ 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
@@ -429,10 +418,8 @@ 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.17])
+AM_GNU_GETTEXT_VERSION([0.15])

 # For a test of uniq: it uses the $LOCALE_FR envvar.
 gt_LOCALE_FR
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -4,63 +4,36 @@ bin=bin-$$$$

 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'

-tmpdir = $(abs_top_builddir)/tests/torture
-
-t=$(tmpdir)/$(PACKAGE)/test
+TMPDIR ?= /tmp
+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 = $(tmpdir)/taint
+tp := $(shell echo "$(TMPDIR)/$(PACKAGE)-$$$$")
 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)
-	$(amtar_extract_) $(preferred_tarball_) -C $(t_taint)
+	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t_taint) -zxf $(distdir).tar.gz
 	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)					\
-	  && $(MAKE) check				\
+	  && HOME=$(fake_home) $(MAKE) check		\
 	  && ls -lR $(fake_home) $(t_prefix) > $(tp)/.ls-after \
 	  && diff $(tp)/.ls-before $(tp)/.ls-after	\
 	  && test -d $(t_prefix)
@@ -77,9 +50,8 @@ 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;					\
@@ -96,16 +68,8 @@ 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)					\
@@ -133,38 +97,37 @@ define coreutils-path-check
  }
 endef

-# 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
-
+# 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.
 ALL_RECURSIVE_TARGETS += my-distcheck
 my-distcheck: $(DIST_ARCHIVES) $(local-check)
 	$(MAKE) syntax-check
 	$(MAKE) check
 	-rm -rf $(t)
 	mkdir -p $(t)
-	$(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				\
-	)
+	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
 	(cd $(t) && mv $(distdir) $(distdir).old	\
-	  && $(amtar_extract_) - ) < $(preferred_tarball_)
+	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
 	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
 	-rm -rf $(t)
-	rmdir $(tmpdir)/$(PACKAGE) $(tmpdir)
 	@echo "========================"; \
-	echo "ready for distribution:"; \
-	for i in $(DIST_ARCHIVES); do echo "  $$i"; done; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"
--- a/doc/ChangeLog-2007
+++ b/doc/ChangeLog-2007
@@ -2002,7 +2002,7 @@

 	-----

-	Copyright (C) 2001-2010 Free Software Foundation, Inc.
+	Copyright (C) 2001-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils documentation.				-*-Makefile-*-

-# Copyright (C) 1995-1998, 2001-2010 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2001-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
@@ -30,12 +30,13 @@ 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
-	$(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-$@ $@
+	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-$@ $@

 MAINTAINERCLEANFILES = constants.texi

@@ -47,10 +48,8 @@ _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	\
@@ -71,18 +70,9 @@ 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; };			\
-	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)builtins?$(W_)' $(srcdir)/*.texi && fail=1;	\
 	$(EGREP) -i '$(_W)path(name)?s?$(W_)' $(srcdir)/*.texi		\
-	  | $(EGREP) -v							\
-	  'PATH=|path search|search path|@vindex PATH$$|@env[{]PATH[}]'	\
-	  && fail=1;							\
+	  | $(EGREP) -v 'search path|@vindex PATH$$|@env[{]PATH[}]' && fail=1; \
 	exit $$fail

 # Use `time zone', not `timezone'.
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -31,6 +31,7 @@
@c FIXME: the following need documentation
@c * [: (coreutils)[ invocation.                   File/string tests.
@c * pinky: (coreutils)pinky invocation.           FIXME.
+@c * mktemp: (coreutils)mktemp invocation.         FIXME.

@dircategory Individual utilities
@direntry
@@ -79,12 +80,10 @@
 * mkdir: (coreutils)mkdir invocation.           Create directories.
 * mkfifo: (coreutils)mkfifo invocation.         Create FIFOs (named pipes).
 * mknod: (coreutils)mknod invocation.           Create special files.
-* mktemp: (coreutils)mktemp invocation.         Create temporary files.
 * mv: (coreutils)mv invocation.                 Rename files.
 * nice: (coreutils)nice invocation.             Modify niceness.
 * nl: (coreutils)nl invocation.                 Number lines and write files.
 * nohup: (coreutils)nohup invocation.           Immunize to hangups.
-* nproc: (coreutils)nproc invocation.           Print the number of processors.
 * od: (coreutils)od invocation.                 Dump files in octal, etc.
 * paste: (coreutils)paste invocation.           Merge lines of files.
 * pathchk: (coreutils)pathchk invocation.       Check file name portability.
@@ -139,7 +138,7 @@
 This manual documents version @value{VERSION} of the @sc{gnu} core
 utilities, including the standard programs for text and file manipulation.

-Copyright @copyright{} 1994-1996, 2000-2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-1996, 2000-2009 Free Software Foundation, Inc.

@quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -194,7 +193,7 @@ Free Documentation License''.
 * Printing text::                echo printf yes
 * Conditions::                   false true test expr
 * Redirection::                  tee
-* File name manipulation::       dirname basename pathchk mktemp
+* File name manipulation::       dirname basename pathchk
 * Working context::              pwd stty printenv tty
 * User information::             id logname whoami groups users who
 * System context::               date arch uname hostname hostid uptime
@@ -379,7 +378,6 @@ File name manipulation
 * basename invocation::          Strip directory and suffix from a file name
 * dirname invocation::           Strip non-directory suffix from a file name
 * pathchk invocation::           Check file name validity and portability
-* mktemp invocation::            Create temporary file or directory

 Working context

@@ -411,7 +409,6 @@ System context

 * arch invocation::              Print machine hardware name
 * date invocation::              Print or set system date and time
-* nproc invocation::             Print the number of processors
 * uname invocation::             Print system information
 * hostname invocation::          Print or set system name
 * hostid invocation::            Print numeric host identifier
@@ -577,18 +574,6 @@ Do not treat the last operand specially when it is a directory or a
 symbolic link to a directory.  @xref{Target directory}.
@end macro

-@macro optNull{cmd}
-@item -0
-@opindex -0
-@itemx --null
-@opindex --null
-@cindex output @sc{nul}-byte-terminated lines
-Output a zero byte (@acronym{ASCII} @sc{nul}) at the end of each line,
-rather than a newline. This option enables other programs to parse the
-output of @command{\cmd\} even when that output would contain data
-with embedded newlines.
-@end macro
-
@macro optSi
@itemx --si
@opindex --si
@@ -2770,10 +2755,8 @@ If you'd like to continue to track the end of a growing file even after
 it has been unlinked, use @option{--follow=descriptor}.  This is the default
 behavior, but it is not useful if you're tracking a log file that may be
 rotated (removed or renamed, then reopened).  In that case, use
-@option{--follow=name} to track the named file, perhaps by reopening it
-periodically to see if it has been removed and recreated by some other program.
-Note that the inotify-based implementation handles this case without
-the need for any periodic reopening.
+@option{--follow=name} to track the named file by reopening it periodically
+to see if it has been removed and recreated by some other program.

 No matter which method you use, if the tracked file is determined to have
 shrunk, @command{tail} prints a message saying the file has been truncated
@@ -3864,9 +3847,10 @@ To compare such strings numerically, use the
@opindex -V
@opindex --version-sort
@cindex version number sort
-Sort by version name and number.  It behaves like a standard sort,
-except that each sequence of decimal digits is treated numerically
-as an index/version number.  (@xref{Details about version sort}.)
+@vindex LC_NUMERIC
+Sort per @code{strverscmp(3)}.  This is a normal string comparison, except
+that embedded decimal numbers are sorted by numeric value
+(see @option{--numeric-sort} above).

@item -r
@itemx --reverse
@@ -6686,17 +6670,23 @@ after the last @samp{.}); files with no extension are sorted first.
@node Details about version sort
@subsection Details about version sort

-Version sorting handles the fact that file names frequently include indices or
-version numbers.  Standard sorting usually does not produce the order that one
-expects because comparisons are made on a character-by-character basis.
-Version sorting is especially useful when browsing directories that contain
-many files with indices/version numbers in their names:
+The version sort takes into account the fact that file names frequently include
+indices or version numbers.  Standard sorting functions usually do not produce
+the ordering that people expect because comparisons are made on a
+character-by-character basis.  The version
+sort addresses this problem, and is especially useful when browsing
+directories that contain many files with indices/version numbers in their
+names:

@example
 $ ls -1            $ ls -1v
-abc.zml-1.gz       abc.zml-1.gz
-abc.zml-12.gz      abc.zml-2.gz
-abc.zml-2.gz       abc.zml-12.gz
+foo.zml-1.gz       foo.zml-1.gz
+foo.zml-100.gz     foo.zml-2.gz
+foo.zml-12.gz      foo.zml-6.gz
+foo.zml-13.gz      foo.zml-12.gz
+foo.zml-2.gz       foo.zml-13.gz
+foo.zml-25.gz      foo.zml-25.gz
+foo.zml-6.gz       foo.zml-100.gz
@end example

 Version-sorted strings are compared such that if @var{ver1} and @var{ver2}
@@ -6715,27 +6705,11 @@ abc-1.012b.tgz     abc-1.007.tgz
 abc-1.01a.tgz      abc-1.012b.tgz
@end example

-This functionality is implemented using gnulib's @code{filevercmp} function,
-which has some caveats worth noting.
-
-@itemize @bullet
-@item @env{LC_COLLATE} is ignored, which means @samp{ls -v} and @samp{sort -V}
-will sort non-numeric prefixes as if the @env{LC_COLLATE} locale category
-was set to @samp{C}.
-@item Some suffixes will not be matched by the regular
-expression mentioned above.  Consequently these examples may
-not sort as you expect:
-
-@example
-abc-1.2.3.4.7z
-abc-1.2.3.7z
-@end example
-
-@example
-abc-1.2.3.4.x86_64.rpm
-abc-1.2.3.x86_64.rpm
-@end example
-@end itemize
+This functionality is implemented using gnulib's @code{filevercmp} function.
+One result of that implementation decision is that @samp{ls -v}
+and @samp{sort -V} do not use the locale category, @env{LC_COLLATE},
+which means non-numeric prefixes are sorted as if @env{LC_COLLATE} were set
+to @samp{C}.

@node General output formatting
@subsection General output formatting
@@ -9881,9 +9855,7 @@ touch [@var{option}]@dots{} @var{file}@dots{}
@end example

@cindex empty files, creating
-Any @var{file} argument that does not exist is created empty, unless
-option @option{--no-create} (@option{-c}) or @option{--no-dereference}
-(@option{-h}) was in effect.
+Any @var{file} argument that does not exist is created empty.

 A @var{file} argument string of @samp{-} is handled specially and
 causes @command{touch} to change the times of the file associated with
@@ -9897,8 +9869,8 @@ user must own the files.

 Although @command{touch} provides options for changing two of the times---the
 times of last access and modification---of a file, there is actually
-a standard third one as well: the inode change time.  This is often
-referred to as a file's @code{ctime}.
+a third one as well: the inode change time.  This is often referred to
+as a file's @code{ctime}.
 The inode change time represents the time when the file's meta-information
 last changed.  One common example of this is when the permissions of a
 file change.  Changing the permissions doesn't access the file, so
@@ -9910,9 +9882,6 @@ fresh copy of the file, including the new permissions value.
 Another operation that modifies a file's ctime without affecting
 the others is renaming.  In any case, it is not possible, in normal
 operations, for a user to change the ctime field to a user-specified value.
-Some operating systems and file systems support a fourth time: the
-birth time, when the file was first created; by definition, this
-timestamp never changes.

@vindex TZ
 Time stamps assume the time zone rules specified by the @env{TZ}
@@ -9941,7 +9910,7 @@ Change the access time only.
@itemx --no-create
@opindex -c
@opindex --no-create
-Do not warn about or create files that do not exist.
+Do not create files that do not exist.

@item -d
@itemx --date=@var{time}
@@ -9962,24 +9931,6 @@ silently ignore any excess precision here.
@cindex BSD @command{touch} compatibility
 Ignored; for compatibility with BSD versions of @command{touch}.

-@item -h
-@itemx --no-dereference
-@opindex -h
-@opindex --no-dereference
-@cindex symbolic links, changing time
-@findex lutimes
-Attempt to change the timestamps of a symbolic link, rather than what
-the link refers to.  When using this option, empty files are not
-created, but option @option{-c} must also be used to avoid warning
-about files that do not exist.  Not all systems support changing the
-timestamps of symlinks, since underlying system support for this
-action was not required until @acronym{POSIX} 2008.  Also, on some
-systems, the mere act of examining a symbolic link changes the access
-time, such that only changes to the modification time will persist
-long enough to be observable.  When coupled with option @option{-r}, a
-reference timestamp is taken from a symbolic link rather than the file
-it refers to.
-
@item -m
@itemx --time=mtime
@itemx --time=modify
@@ -9999,8 +9950,6 @@ If this option is combined with the @option{--date=@var{time}}
 the origin for any relative @var{time}s given, but is otherwise ignored.
 For example, @samp{-r foo -d '-5 seconds'} specifies a time stamp
 equal to five seconds before the corresponding time stamp for @file{foo}.
-If @var{file} is a symbolic link, the reference timestamp is taken
-from the target of the symlink, unless @option{-h} was also in effect.

@item -t [[@var{cc}]@var{yy}]@var{mmddhhmm}[.@var{ss}]
 Use the argument (optional four-digit or two-digit years, months,
@@ -10402,7 +10351,15 @@ Show the total for each directory (and file if --all) that is at
 most MAX_DEPTH levels down from the root of the hierarchy.  The root
 is at level 0, so @code{du --max-depth=0} is equivalent to @code{du -s}.

-@optNull{du}
+@item -0
+@opindex -0
+@itemx --null
+@opindex --null
+@cindex output null-byte-terminated lines
+Output a zero byte (@acronym{ASCII} @sc{nul}) at the end of each line,
+rather than a newline. This option enables other programs to parse the
+output of @command{du} even when that output would contain file names
+with embedded newlines.

@optSi

@@ -10814,8 +10771,6 @@ alert (bell)
 backspace
@item \c
 produce no further output
-@item \e
-escape
@item \f
 form feed
@item \n
@@ -11890,7 +11845,6 @@ This section describes commands that manipulate file names.
 * basename invocation::         Strip directory and suffix from a file name.
 * dirname invocation::          Strip non-directory suffix from a file name.
 * pathchk invocation::          Check file name validity and portability.
-* mktemp invocation::           Create temporary file or directory.
@end menu


@@ -12065,180 +12019,6 @@ Exit status:
 1 otherwise.
@end display

-@node mktemp invocation
-@section @command{mktemp}: Create temporary file or directory
-
-@pindex mktemp
-@cindex file names, creating temporary
-@cindex directory, creating temporary
-@cindex temporary files and directories
-
-@command{mktemp} manages the creation of temporary files and
-directories.  Synopsis:
-
-@example
-mktemp [@var{option}]@dots{} [@var{template}]
-@end example
-
-Safely create a temporary file or directory based on @var{template},
-and print its name.  If given, @var{template} must include at least
-three consecutive @samp{X}s in the last component.  If omitted, the template
-@samp{tmp.XXXXXXXXXX} is used, and option @option{--tmpdir} is
-implied.  The final run of @samp{X}s in the @var{template} will be replaced
-by alpha-numeric characters; thus, on a case-sensitive file system,
-and with a @var{template} including a run of @var{n} instances of @samp{X},
-there are @samp{62**@var{n}} potential file names.
-
-Older scripts used to create temporary files by simply joining the
-name of the program with the process id (@samp{$$}) as a suffix.
-However, that naming scheme is easily predictable, and suffers from a
-race condition where the attacker can create an appropriately named
-symbolic link, such that when the script then opens a handle to what
-it thought was an unused file, it is instead modifying an existing
-file.  Using the same scheme to create a directory is slightly safer,
-since the @command{mkdir} will fail if the target already exists, but
-it is still inferior because it allows for denial of service attacks.
-Therefore, modern scripts should use the @command{mktemp} command to
-guarantee that the generated name will be unpredictable, and that
-knowledge of the temporary file name implies that the file was created
-by the current script and cannot be modified by other users.
-
-When creating a file, the resulting file has read and write
-permissions for the current user, but no permissions for the group or
-others; these permissions are reduced if the current umask is more
-restrictive.
-
-Here are some examples (although note that if you repeat them, you
-will most likely get different file names):
-
-@itemize @bullet
-
-@item
-Create a temporary file in the current directory.
-@example
-$ mktemp file.XXXX
-file.H47c
-@end example
-
-@item
-Create a temporary file with a known suffix.
-@example
-$ mktemp --suffix=.txt file-XXXX
-file-H08W.txt
-$ mktemp file-XXXX-XXXX.txt
-file-XXXX-eI9L.txt
-@end example
-
-@item
-Create a secure fifo relative to the user's choice of @env{TMPDIR},
-but falling back to the current directory rather than @file{/tmp}.
-Note that @command{mktemp} does not create fifos, but can create a
-secure directory in which the fifo can live.  Exit the shell if the
-directory or fifo could not be created.
-@example
-$ dir=$(mktemp -p "$@{TMPDIR:-.@}" -d dir-XXXX) || exit 1
-$ fifo=$dir/fifo
-$ mkfifo "$fifo" || @{ rmdir "$dir"; exit 1; @}
-@end example
-
-@item
-Create and use a temporary file if possible, but ignore failure.  The
-file will reside in the directory named by @env{TMPDIR}, if specified,
-or else in @file{/tmp}.
-@example
-$ file=$(mktemp -q) && @{
->   # Safe to use $file only within this block.  Use quotes,
->   # since $TMPDIR, and thus $file, may contain whitespace.
->   echo ... > "$file"
->   rm "$file"
-> @}
-@end example
-
-@item
-Act as a semi-random character generator (it is not fully random,
-since it is impacted by the contents of the current directory).  To
-avoid security holes, do not use the resulting names to create a file.
-@example
-$ mktemp -u XXX
-Gb9
-$ mktemp -u XXX
-nzC
-@end example
-
-@end itemize
-
-The program accepts the following options.  Also see @ref{Common options}.
-
-@table @samp
-
-@item -d
-@itemx --directory
-@opindex -d
-@opindex --directory
-Create a directory rather than a file.  The directory will have read,
-write, and search permissions for the current user, but no permissions
-for the group or others; these permissions are reduced if the current
-umask is more restrictive.
-
-@item -q
-@itemx --quiet
-@opindex -q
-@opindex --quiet
-Suppress diagnostics about failure to create a file or directory.  The
-exit status will still reflect whether a file was created.
-
-@item -u
-@itemx --dry-run
-@opindex -u
-@opindex --dry-run
-Generate a temporary name that does not name an existing file, without
-changing the file system contents.  Using the output of this command
-to create a new file is inherently unsafe, as there is a window of
-time between generating the name and using it where another process
-can create an object by the same name.
-
-@item -p @var{dir}
-@itemx --tmpdir[=@var{dir}]
-@opindex -p
-@opindex --tmpdir
-Treat @var{template} relative to the directory @var{dir}.  If
-@var{dir} is not specified (only possible with the long option
-@option{--tmpdir}) or is the empty string, use the value of
-@env{TMPDIR} if available, otherwise use @samp{/tmp}.  If this is
-specified, @var{template} must not be absolute.  However,
-@var{template} can still contain slashes, although intermediate
-directories must already exist.
-
-@item --suffix=@var{suffix}
-@opindex --suffix
-Append @var{suffix} to the @var{template}.  @var{suffix} must not
-contain slash.  If @option{--suffix} is specified, @var{template} must
-end in @samp{X}; if it is not specified, then an appropriate
-@option{--suffix} is inferred by finding the last @samp{X} in
-@var{template}.  This option exists for use with the default
-@var{template} and for the creation of a @var{suffix} that starts with
-@samp{X}.
-
-@item -t
-@opindex -t
-Treat @var{template} as a single file relative to the value of
-@env{TMPDIR} if available, or to the directory specified by
-@option{-p}, otherwise to @samp{/tmp}.  @var{template} must not
-contain slashes.  This option is deprecated; the use of @option{-p}
-without @option{-t} offers better defaults (by favoring the command
-line over @env{TMPDIR}) and more flexibility (by allowing intermediate
-directories).
-
-@end table
-
-@cindex exit status of @command{mktemp}
-Exit status:
-
-@display
-0 if the file was created,
-1 otherwise.
-@end display
-

@node Working context
@chapter Working context
@@ -13001,13 +12781,8 @@ If no @var{variable}s are specified, @command{printenv} prints the value of
 every environment variable.  Otherwise, it prints the value of each
@var{variable} that is set, and nothing for those that are not set.

-The program accepts the following option.  Also see @ref{Common options}.
-
-@table @samp
-
-@optNull{printenv}
-
-@end table
+The only options are a lone @option{--help} or @option{--version}.
+@xref{Common options}.

@cindex exit status of @command{printenv}
 Exit status:
@@ -13421,7 +13196,6 @@ information.
@menu
 * date invocation::             Print or set system date and time.
 * arch invocation::             Print machine hardware name.
-* nproc invocation::            Print the number of processors.
 * uname invocation::            Print system information.
 * hostname invocation::         Print or set system name.
 * hostid invocation::           Print numeric host identifier.
@@ -14081,43 +13855,6 @@ The program accepts the @ref{Common options} only.
@exitstatus


-@node nproc invocation
-@section @command{nproc}: Print the number of available processors
-
-@pindex nproc
-@cindex Print the number of processors
-@cindex system information, printing
-
-Print the number of processing units available to the current process,
-which may be less than the number of online processors.
-If this information is not accessible, then print the number of
-processors installed.  If the @env{OMP_NUM_THREADS} environment variable is
-set, then it will determine the returned value.  The result is guaranteed to be
-greater than zero.  Synopsis:
-
-@example
-nproc [@var{option}]
-@end example
-
-The program accepts the following options.  Also see @ref{Common options}.
-
-@table @samp
-
-@item --all
-@opindex --all
-Print the number of installed processors on the system, which may
-be greater than the number online or available to the current process.
-The @env{OMP_NUM_THREADS} environment variable is not honored in this case.
-
-@item --ignore=@var{number}
-@opindex --ignore
-If possible, exclude this @var{number} of processing units.
-
-@end table
-
-@exitstatus
-
-
@node uname invocation
@section @command{uname}: Print system information

@@ -14601,7 +14338,7 @@ device files), copy them into place, too.
 Exit status:

@display
-125 if @command{chroot} itself fails
+1   if @command{chroot} itself fails
 126 if @var{command} is found but cannot be invoked
 127 if @var{command} cannot be found
 the exit status of @var{command} otherwise
@@ -14646,89 +14383,17 @@ remaining arguments are passed as arguments to that program.
 The program should not be a special built-in utility
 (@pxref{Special built-in utilities}).

-Modifications to @env{PATH} take effect prior to searching for
-@var{command}.  Use caution when reducing @env{PATH}; behavior is
-not portable when @env{PATH} is undefined or omits key directories
-such as @file{/bin}.
-
-In the rare case that a utility contains a @samp{=} in the name, the
-only way to disambiguate it from a variable assignment is to use an
-intermediate command for @var{command}, and pass the problematic
-program name via @var{args}.  For example, if @file{./prog=} is an
-executable in the current @env{PATH}:
-
-@example
-env prog= true # runs 'true', with prog= in environment
-env ./prog= true # runs 'true', with ./prog= in environment
-env -- prog= true # runs 'true', with prog= in environment
-env sh -c '\prog= true' # runs 'prog=' with argument 'true'
-env sh -c 'exec "$@@"' sh prog= true # also runs 'prog='
-@end example
-
@cindex environment, printing

 If no command name is specified following the environment
 specifications, the resulting environment is printed.  This is like
 specifying the @command{printenv} program.

-For some examples, suppose the environment passed to @command{env}
-contains @samp{LOGNAME=rms}, @samp{EDITOR=emacs}, and
-@samp{PATH=.:/gnubin:/hacks}:
-
-@itemize @bullet
-
-@item
-Output the current environment.
-@example
-$ env | LC_ALL=C sort
-EDITOR=emacs
-LOGNAME=rms
-PATH=.:/gnubin:/hacks
-@end example
-
-@item
-Run @command{foo} with a reduced environment, preserving only the
-original @env{PATH} to avoid problems in locating @command{foo}.
-@example
-env - PATH="$PATH" foo
-@end example
-
-@item
-Run @command{foo} with the environment containing @samp{LOGNAME=rms},
-@samp{EDITOR=emacs}, and @samp{PATH=.:/gnubin:/hacks}, and guarantees
-that @command{foo} was found in the file system rather than as a shell
-built-in.
-@example
-env foo
-@end example
-
-@item
-Run @command{nemacs} with the environment containing @samp{LOGNAME=foo},
-@samp{EDITOR=emacs}, @samp{PATH=.:/gnubin:/hacks}, and
-@samp{DISPLAY=gnu:0}.
-@example
-env DISPLAY=gnu:0 LOGNAME=foo nemacs
-@end example
-
-@item
-Attempt to run the program @command{/energy/--} (as that is the only
-possible path search result); if the command exists, the environment
-will contain @samp{LOGNAME=rms} and @samp{PATH=/energy}, and the
-arguments will be @samp{e=mc2}, @samp{bar}, and @samp{baz}.
-@example
-env -u EDITOR PATH=/energy -- e=mc2 bar baz
-@end example
-
-@end itemize
-
-
 The program accepts the following options.  Also see @ref{Common options}.
 Options must precede operands.

@table @samp

-@optNull{env}
-
@item -u @var{name}
@itemx --unset=@var{name}
@opindex -u
@@ -14751,7 +14416,7 @@ Exit status:

@display
 0   if no @var{command} is specified and the environment is output
-125 if @command{env} itself fails
+1   if @command{env} itself fails
 126 if @var{command} is found but cannot be invoked
 127 if @var{command} cannot be found
 the exit status of @var{command} otherwise
@@ -14826,7 +14491,7 @@ Exit status:

@display
 0   if no @var{command} is specified and the niceness is output
-125 if @command{nice} itself fails
+1   if @command{nice} itself fails
 126 if @var{command} is found but cannot be invoked
 127 if @var{command} cannot be found
 the exit status of @var{command} otherwise
@@ -14944,15 +14609,11 @@ options}.  Options must precede operands.
 Exit status:

@display
-125 if @command{nohup} itself fails, and @env{POSIXLY_CORRECT} is not set
 126 if @var{command} is found but cannot be invoked
-127 if @var{command} cannot be found
+127 if @command{nohup} itself fails or if @var{command} cannot be found
 the exit status of @var{command} otherwise
@end display

-If @env{POSIXLY_CORRECT} is set, internal failures give status 127
-instead of 125.
-

@node stdbuf invocation
@section @command{stdbuf}: Run a command with modified I/O stream buffering
@@ -15157,7 +14818,7 @@ shell is restricted (see @option{-m} just above).
 Exit status:

@display
-125 if @command{su} itself fails
+1   if @command{su} itself fails
 126 if subshell is found but cannot be invoked
 127 if subshell cannot be found
 the exit status of the subshell otherwise
--- a/doc/perm.texi
+++ b/doc/perm.texi
@@ -1,7 +1,7 @@
@c File mode bits

-@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006, 2008-2010 Free Software
-@c Foundation, Inc.
+@c Copyright (C) 1994, 1996, 1999-2001, 2003-2006,
+@c 2008-2009 Free Software 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
--- a/gl/lib/mbsalign.c
+++ b/gl/lib/mbsalign.c
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -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 _UNUSED_PARAMETER_)
+          size_t *width, mbs_align_t align, int flags)
 {
  size_t ret = -1;
  size_t src_size = strlen (src) + 1;
--- a/gl/lib/mbsalign.h
+++ b/gl/lib/mbsalign.h
@@ -1,5 +1,5 @@
 /* Align/Truncate a string in a given screen width
-   Copyright (C) 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 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
--- a/gl/lib/mgetgroups.c
+++ b/gl/lib/mgetgroups.c
@@ -0,0 +1,142 @@
+/* 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;
+}
--- a/gl/lib/mgetgroups.h
+++ b/gl/lib/mgetgroups.h
@@ -0,0 +1,19 @@
+/* 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);
--- a/gl/lib/rand-isaac.c
+++ b/gl/lib/rand-isaac.c
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.

-   Copyright (C) 1999-2006, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

   This program is free software: you can redistribute it and/or modify
--- a/gl/lib/rand-isaac.h
+++ b/gl/lib/rand-isaac.h
@@ -1,6 +1,6 @@
 /* Bob Jenkins's cryptographic random number generator, ISAAC.

-   Copyright (C) 1999-2005, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 1999-2005, 2009 Free Software Foundation, Inc.
   Copyright (C) 1997, 1998, 1999 Colin Plumb.

   This program is free software: you can redistribute it and/or modify
--- a/gl/lib/randint.c
+++ b/gl/lib/randint.c
@@ -1,6 +1,6 @@
 /* Generate random integers.

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

-   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+   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
--- a/gl/lib/randperm.c
+++ b/gl/lib/randperm.c
@@ -1,6 +1,6 @@
 /* Generate random permutations.

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

-   Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 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
--- a/gl/lib/randread.h
+++ b/gl/lib/randread.h
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.

-   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+   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
--- a/gl/lib/regcomp.c.diff
+++ b/gl/lib/regcomp.c.diff
@@ -1,82 +0,0 @@
-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;
--- a/gl/lib/regex_internal.c.diff
+++ b/gl/lib/regex_internal.c.diff
@@ -1,25 +0,0 @@
-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++)
--- a/gl/lib/regex_internal.h.diff
+++ b/gl/lib/regex_internal.h.diff
@@ -1,14 +0,0 @@
-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;
--- a/gl/lib/regexec.c.diff
+++ b/gl/lib/regexec.c.diff
@@ -1,45 +0,0 @@
-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);
--- a/gl/lib/root-dev-ino.c
+++ b/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-2010 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 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
--- a/gl/lib/root-dev-ino.h
+++ b/gl/lib/root-dev-ino.h
@@ -1,6 +1,6 @@
 /* Root device and inode number checking.

-   Copyright (C) 2003, 2006, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2003, 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
--- a/gl/lib/tempname.c
+++ b/gl/lib/tempname.c
@@ -0,0 +1,294 @@
+/* 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	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
+#else
+# define struct_stat64 struct stat
+# define __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_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 flags, 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 = __open (tmpl,
+                       (flags & ~0777) | 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 flags, int kind)
+{
+  return gen_tempname_len (tmpl, flags, kind, 6);
+}
--- a/gl/lib/tempname.c.diff
+++ b/gl/lib/tempname.c.diff
@@ -1,193 +0,0 @@
-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);
- }
--- a/gl/lib/tempname.h
+++ b/gl/lib/tempname.h
@@ -0,0 +1,42 @@
+/* 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 flags, int kind);
+extern int gen_tempname_len (char *tmpl, int flags, int kind,
+                             size_t x_suffix_len);
--- a/gl/lib/tempname.h.diff
+++ b/gl/lib/tempname.h.diff
@@ -1,12 +0,0 @@
-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 */
--- a/gl/lib/xfreopen.c
+++ b/gl/lib/xfreopen.c
@@ -0,0 +1,41 @@
+/* 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));
+    }
+}
--- a/gl/lib/xfreopen.h
+++ b/gl/lib/xfreopen.h
@@ -0,0 +1,2 @@
+#include <stdio.h>
+void xfreopen (char const *filename, char const *mode, FILE *fp);
--- a/gl/m4/mgetgroups.m4
+++ b/gl/m4/mgetgroups.m4
@@ -0,0 +1,11 @@
+#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])
+])
--- a/gl/m4/root-dev-ino.m4
+++ b/gl/m4/root-dev-ino.m4
@@ -1,5 +1,5 @@
 #serial 3
-dnl Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 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.
--- a/gl/modules/link-tests.diff
+++ b/gl/modules/link-tests.diff
@@ -1,9 +0,0 @@
-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@
--- a/gl/modules/mgetgroups
+++ b/gl/modules/mgetgroups
@@ -0,0 +1,24 @@
+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
--- a/gl/modules/rename-tests.diff
+++ b/gl/modules/rename-tests.diff
@@ -1,9 +0,0 @@
-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@
--- a/gl/modules/xfreopen
+++ b/gl/modules/xfreopen
@@ -0,0 +1,25 @@
+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
--- a/2
+++ b/2
--- a/gnulib-tests/Makefile.am
+++ b/gnulib-tests/Makefile.am
@@ -1,3 +1 @@
 include gnulib.mk
-
-AM_CFLAGS = $(GNULIB_WARN_CFLAGS) # $(WERROR_CFLAGS)
--- a/lib/ChangeLog-2007
+++ b/lib/ChangeLog-2007
@@ -8746,7 +8746,7 @@

 	-----

-	Copyright (C) 2000-2010 Free Software Foundation, Inc.
+	Copyright (C) 2000-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for gnulib/lib				-*-Makefile-*-

-# Copyright (C) 1995-2007, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 1995-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
@@ -17,7 +17,7 @@

 include gnulib.mk

-AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS += $(WARN_CFLAGS) # $(WERROR_CFLAGS)

 libcoreutils_a_SOURCES += \
  buffer-lcm.c buffer-lcm.h \
--- a/lib/buffer-lcm.c
+++ b/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-2010 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 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
--- a/lib/euidaccess-stat.c
+++ b/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-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
@@ -130,6 +130,6 @@ main (int argc, char **argv)

  ok = euidaccess_stat (&st, mode);
  printf ("%s: %s\n", file, ok ? "y" : "n");
-  return 0;
+  exit (0);
 }
 #endif
--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -1,6 +1,6 @@
 /* Invoke open, but return either a desired file descriptor or -1.

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

-   Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
--- a/lib/memxfrm.c
+++ b/lib/memxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

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

-   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
--- a/lib/strnumcmp-in.h
+++ b/lib/strnumcmp-in.h
@@ -1,7 +1,7 @@
 /* Compare numeric strings.  This is an internal include file.

-   Copyright (C) 1988, 1991-1993, 1995-1996, 1998-2000, 2003-2006, 2009-2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1988, 1991, 1992, 1993, 1995, 1996, 1998, 1999, 2000,
+   2003, 2004, 2005, 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
--- a/lib/strnumcmp.c
+++ b/lib/strnumcmp.c
@@ -1,6 +1,6 @@
 /* Compare numeric strings.

-   Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
--- a/lib/t-chdir-long
+++ b/lib/t-chdir-long
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise chdir-long's sample main program.

-# Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 2005, 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
--- a/lib/xfts.c
+++ b/lib/xfts.c
@@ -1,6 +1,6 @@
 /* xfts.c -- a wrapper for fts_open

-   Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-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
@@ -21,9 +21,13 @@

 #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"

@@ -36,30 +40,24 @@ xfts_open (char * const *argv, int options,
  FTS *fts = fts_open (argv, options | FTS_CWDFD, compar);
  if (fts == NULL)
    {
-      /* 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 ();
+      /* 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 ();
    }

  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));
-}
--- a/lib/xfts.h
+++ b/lib/xfts.h
@@ -1,9 +1,5 @@
-#include <stdbool.h>
 #include "fts_.h"

 FTS *
 xfts_open (char * const *, int options,
           int (*) (const FTSENT **, const FTSENT **));
-
-bool
-cycle_warning_required (FTS const *fts, FTSENT const *ent);
--- a/lib/xmemxfrm.c
+++ b/lib/xmemxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

-   Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+   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
--- a/m4/ChangeLog-2007
+++ b/m4/ChangeLog-2007
@@ -5004,7 +5004,8 @@

 	-----

-	Copyright (C) 1997-2006, 2009-2010 Free Software Foundation, Inc.
+	Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+	2005, 2006, 2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/m4/boottime.m4
+++ b/m4/boottime.m4
@@ -1,8 +1,7 @@
 # boottime.m4 serial 4
 # Determine whether this system has infrastructure for obtaining the boot time.

-# Copyright (C) 1996, 2000, 2002-2004, 2006, 2008-2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996, 2000, 2002-2004, 2006, 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
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,8 +1,8 @@
-#serial 26
+#serial 25
 # Check declarations for this package.

-dnl Copyright (C) 1997-2001, 2003-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1997-2001, 2003-2006, 2008-2009 Free Software
+dnl Foundation, Inc.

 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -35,6 +35,8 @@ AC_DEFUN([gl_CHECK_DECLS],
    getpwuid,
    ttyname], , , $headers)

+  AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
+
  AC_CHECK_DECLS_ONCE([geteuid])
  AC_CHECK_DECLS_ONCE([getlogin])
  AC_CHECK_DECLS_ONCE([getuid])
--- a/m4/euidaccess-stat.m4
+++ b/m4/euidaccess-stat.m4
@@ -1,5 +1,5 @@
 # serial 1
-dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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.
--- a/m4/fd-reopen.m4
+++ b/m4/fd-reopen.m4
@@ -1,6 +1,6 @@
 # Invoke open, but return either a desired file descriptor or -1.

-dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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,
--- a/m4/gmp.m4
+++ b/m4/gmp.m4
@@ -1,6 +1,6 @@
 # Tests for GNU GMP (or any compatible replacement).

-dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-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,
@@ -30,9 +30,7 @@ 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
 ])
--- a/m4/include-exclude-prog.m4
+++ b/m4/include-exclude-prog.m4
@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+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.
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -2,7 +2,7 @@

 dnl Misc type-related macros for coreutils.

-# Copyright (C) 1998, 2000-2010 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000-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
@@ -94,7 +94,6 @@ AC_DEFUN([coreutils_MACROS],

  # 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])
@@ -116,8 +115,7 @@ AC_DEFUN([coreutils_MACROS],
      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.])
+        AC_MSG_WARN([libcap library was not found or not usable, support for libcap will not be built])
      fi
    fi
  else
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -2,8 +2,8 @@

 dnl Misc lib-related macros for coreutils.

-# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008-2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 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
@@ -51,7 +51,6 @@ $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" ||
--- a/m4/memxfrm.m4
+++ b/m4/memxfrm.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 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.
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.


-# Copyright (C) 1998, 2000-2001, 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000, 2001, 2003-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
--- a/m4/stat-prog.m4
+++ b/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-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2004, 2006, 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
--- a/m4/strnumcmp.m4
+++ b/m4/strnumcmp.m4
@@ -1,6 +1,6 @@
 # Compare numeric strings.

-dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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,
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -1,6 +1,6 @@
 # xattr.m4 - check for Extended Attributes (Linux)

-# Copyright (C) 2003, 2008-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008-2009 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.
@@ -15,29 +15,22 @@ AC_DEFUN([gl_FUNC_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
-      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
+       && test $ac_cv_header_attr_error_context_h = yes; then
+      use_xattr=1
+    else
+      use_xattr=0
    fi
    AC_DEFINE_UNQUOTED([USE_XATTR], [$use_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
+    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])
  fi
 ])
--- a/m4/xfts.m4
+++ b/m4/xfts.m4
@@ -1,5 +1,5 @@
 #serial 1
-dnl Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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.
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -48,7 +48,6 @@ mv.1
 nice.1
 nl.1
 nohup.1
-nproc.1
 od.1
 paste.1
 pathchk.1
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Make coreutils man pages.				-*-Makefile-*-

-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-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
@@ -80,7 +80,6 @@ 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
--- a/man/chmod.x
+++ b/man/chmod.x
@@ -1,5 +1,4 @@
-'\" Copyright (C) 1998-1999, 2001, 2006-2007, 2009-2010 Free Software
-'\" Foundation, Inc.
+'\" Copyright (C) 1998, 1999, 2001, 2006, 2007, 2009 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>.
--- a/man/chown.x
+++ b/man/chown.x
@@ -1,5 +1,4 @@
-'\" Copyright (C) 1998-1999, 2001, 2006, 2009-2010 Free Software Foundation,
-'\" Inc.
+'\" Copyright (C) 1998, 1999, 2001, 2006, 2009 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>.
--- a/man/df.x
+++ b/man/df.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-1999, 2004, 2009-2010 Free Software Foundation, Inc.
+'\" Copyright (C) 1998, 1999, 2004, 2009 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>.
--- a/man/du.x
+++ b/man/du.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998-2000, 2002, 2009-2010 Free Software Foundation, Inc.
+'\" Copyright (C) 1998, 1999, 2000, 2002, 2009 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>.
--- a/man/help2man
+++ b/man/help2man
@@ -1,7 +1,8 @@
 #!/usr/bin/perl -w

 # Generate a short man page from --help and --version output.
-# Copyright (C) 1997-2004, 2008-2010 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Blake	6c935a0554	Merge remote branch 'origin/next' into next	2009-10-10 09:28:19 -06:00
Jim Meyering	3b7dc2b522	rm: record timing data * README-rm-timing-compare: new file * README-rm-timing-2: New file.	2009-10-10 09:21:36 -06:00
Eric Blake	aeaa6bf7ae	touch: optimize use of utimens * src/touch.c (main): Use UTIME_NOW rather than calling gettime. (touch): Use UTIME_OMIT rather than stat.	2009-10-10 09:14:39 -06:00
Eric Blake	82e344ca09	copy: allow symlink timestamp preservation on more systems * src/copy.c (utimens_symlink): Simplify by using lutimens. * m4/jm-macros.m4 (coreutils_MACROS): Drop utimensat; gnulib does this for us. * tests/cp/preserve-slink-time: Recognize lutimes support.	2009-10-10 09:14:35 -06:00
Eric Blake	2cd1577554	build: update gnulib submodule to latest, for utimens improvements	2009-10-10 09:14:17 -06:00
Eric Blake	41c9e064a6	rm: avoid compiler warning * src/remove.c (rm_fts): Don't allow fall-through when assertions are disabled.	2009-09-05 16:28:46 +02:00
Eric Blake	5f303a1293	euidaccess-stat: remove unnecessary macros * lib/euidaccess-stat.c (F_OK, R_OK, W_OK, X_OK): Delete; now guaranteed by gnulib.	2009-09-05 16:28:46 +02:00
Eric Blake	2df272914b	rm: use gnulib faccessat * bootstrap.conf (gnulib_modules): Add faccessat. Replace strdup with strdup-posix. * m4/jm-macros.m4 (coreutils_MACROS): Revert previous change, now that gnulib does it for us. * src/remove.c (write_protected_non_symlink): Use faccessat in more situations.	2009-09-05 16:28:46 +02:00
Jim Meyering	278109b9f4	NEWS: mention recent improvements in rm	2009-09-05 16:28:46 +02:00
Jim Meyering	0f3f7d495c	rm: improve efficiency of rm -r (without -f) from O(N^2) to O(N) where N is the depth of the deepest hierarchy rm is processing. * src/remove.c (write_protected_non_symlink): Use faccessat to avoid O(N)-per-entry cost of calling euidaccess. * m4/jm-macros.m4 (coreutils_MACROS): Check for faccessat.	2009-09-05 16:28:46 +02:00
Jim Meyering	4f87cc0364	build: placate gcc's new -Wskip-jump-init * remove.c (rm_fts): Put braces around each of the two offending blocks. * configure.ac: Don't turn off -Wjump-misses-init. With the rewrite of remove.c, it is no longer needed.	2009-09-05 16:28:46 +02:00
Jim Meyering	18c5fbd5dc	rm: rewrite to use fts * remove.c: Don't include "unlinkdir.h"; no longer used. Do not include <setjmp.h> or "cycle-check.h". Likewise. Include "xfts.h". (dir_name, dir_len): Remove definitions. (CONSECUTIVE_READDIR_UNLINK_THRESHOLD): Likewise. (INODE_SORT_DIR_ENTRIES_THRESHOLD, NEED_REWIND, D_TYPE): Likewise. (struct dirstack_state, Dirstack_state): Likewise. (g_buf, g_n_allocated): Remove declarations. (hash_freer, hash_compare_strings, rm_malloc): Remove functions. (rm_free, push_dir, top_dir, pop_dir, right_justify): Likewise. (full_filename0, xfull_filename, full_filename_): Likewise. (AD_stack_height, AD_stack_top, AD_stack_pop, AD_stack_clear): Likewise. (obstack_init_minimal, ds_init, ds_clear, ds_free): Likewise. (AD_pop_and_chdir, AD_ensure_initialized, AD_mark_helper): Likewise. (AD_mark_as_unremovable, AD_mark_current_as_unremovable): Likewise. (AD_push_initial, AD_push, AD_push, AD_is_removable): Likewise. (write_protected_non_symlink): Change 3rd parameter from dirstack_state "ds" to full_name. (prompt): Adjust parameters. Now, state comes from FTS/FTSENT pair. Those replace fd_cwd and "ds". Remove "filename". Remove pdirent_type in favor of new "is_dir" parameter. Rename is_empty to is_empty_p. (DO_RMDIR, DO_UNLINK): Remove definitions. (remove_entry, fd_to_subdirp, compare_ino): Remove functions. (dirent_count, dirent_inode_sort_may_be_useful): Likewise. (preprocess_dir): Likewise. (fts_skip_tree, mark_ancestor_dirs, excise, rm_fts): New functions. (remove_cwd_entries, remove_dir, rm_1): Remove functions. (rm): Rewrite as a simple loop calling fts_read and dispatching each entry via rm_fts. * src/rm.c (main): Adapt to new signature of rm(). * bootstrap.conf (gnulib_modules): Remove unlinkdir, no longer used. * src/Makefile.am (sc_tight_scope): Also recognize an extern "enum" declaration. * tests/rm/empty-name: Adjust expected output to match new diagnostic.	2009-09-05 16:28:46 +02:00
Jim Meyering	cf963e5a54	rm: record timing data * README-rm-timing-compare: new file * README-rm-timing-2: New file.	2009-09-05 16:28:46 +02:00
@@ -1 +1 @@
 .3
 .0