version 7.5

* NEWS: Record release date.
tests: skip the stdbuf tests when the abs build directory name is bogus
2025-09-10 07:59:52 +02:00 · 2009-08-20 21:19:36 +02:00 · 2009-08-20 19:47:12 +02:00 · 2009-08-20 10:46:22 +02:00 · 2009-08-19 17:10:23 +02:00 · 2009-08-19 08:44:40 +02:00
535 changed files with 3232 additions and 1797 deletions
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-7.3
+7.4
--- a/.vg-suppressions
+++ b/.vg-suppressions
@@ -1,6 +1,6 @@
 # Suppress valgrind diagnostics we don't care about.

-# Copyright (C) 2003, 2004, 2006-2008 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_system_h_headers
+++ b/.x-sc_system_h_headers
@@ -0,0 +1,3 @@
+^src/libstdbuf\.c$
+^src/system\.h$
+^src/copy\.h$
--- a/1
+++ b/1
@@ -76,6 +76,7 @@ sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
 split: Torbjörn Granlund, Richard M. Stallman
 stat: Michael Meskes
+stdbuf: Pádraig Brady
 stty: David MacKenzie
 su: David MacKenzie
 sum: Kayvan Aghaiepour, David MacKenzie
--- a/2
+++ b/2
@@ -11609,7 +11609,7 @@

 	-----

-	Copyright (C) 2002, 2003, 2004, 2005 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 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 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 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/26
+++ b/26
@@ -189,7 +189,7 @@ branch, and then realize that something about it is not right.
 It's easy to adjust:

  edit your files # this can include running "git add NEW" or "git rm BAD"
-  git commit --amend -e -a
+  git commit --amend -a
  git format-patch --stdout -1 > your-branch.diff

 That replaces the most recent change-set with the revised one.
@@ -213,8 +213,15 @@ Commit log requirements
 =======================
 Your commit log should always start with a one-line summary, the second
 line should be blank, and the remaining lines are usually ChangeLog-style
-entries for all affected files.  Omit the leading TABs that you're used
-to seeing in a "real" ChangeLog file.
+entries for all affected files.  However, it's fine -- even recommended --
+to write a few lines of prose describing the change, when the summary
+and ChangeLog entries don't give enough of the big picture.  Omit the
+leading TABs that you're used to seeing in a "real" ChangeLog file, but
+keep the maximum line length at 72 or smaller, so that the generated
+ChangeLog lines, each with its leading TAB, will not exceed 80 columns.
+As for the ChangeLog-style content, please follow these guidelines:
+
+  http://www.gnu.org/software/guile/changelogs/guile-changelogs_3.html

 Try to make the summary line fit one of the following forms:

@@ -222,6 +229,8 @@ Try to make the summary line fit one of the following forms:
  prog1, prog2: change-description
  doc: change-description
  tests: change-description
+  build: change-description
+  maint: change-description


 Use SPACE-only indentation in new files.
@@ -261,6 +270,9 @@ When writing prose (documentation, comments, log entries), use an
 active voice, not a passive one.  I.e., say "print the frobnozzle",
 not "the frobnozzle will be printed".

+Please add comments per the GNU Coding Standard:
+  http://www.gnu.org/prep/standards/html_node/Comments.html
+

 Minor syntactic preferences
 ===========================
@@ -404,10 +416,16 @@ See the manpage for git-apply for details.
 Miscellaneous useful git commands
 =================================

-  * gitk: give a graphical view of the revision graph
+  * gitk: give a graphical view of the revision graph of the current branch
+  * gitk --all: same, but display all branches
  * git log: to get most of the same info in text form
  * git log -p: same as above, but with diffs
  * git log -p SOME_FILE: same as above, but limit to SOME_FILE
+  * git log -p -2 SOME_FILE: same as above, but print only two deltas
+  * git log -p -1: print the most recently committed change set
+  * git format-patch --stdout -1 > FILE: output the most recently committed
+      change set, in a format suitable to be submitted and/or applied via
+      "git am FILE".
  * git reset --soft HEAD^: Commit the delta required to restore
      state to the revision just before HEAD (i.e., next-to-last).
  * git rebase -i master: run this from on a branch, and it gives
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ changelog_etc =				\
  ChangeLog-2007			\
  ChangeLog-2008			\
  build-aux/ChangeLog-2007		\
+  build-aux/update-copyright		\
  doc/ChangeLog-2007			\
  lib/ChangeLog-2007			\
  m4/ChangeLog-2007			\
@@ -40,6 +41,7 @@ changelog_etc =				\

 syntax_check_exceptions =		\
  .x-sc_GPL_version			\
+  .x-sc_error_message_uppercase		\
  .x-sc_file_system			\
  .x-sc_obsolete_symbols		\
  .x-sc_po_check			\
@@ -48,8 +50,10 @@ syntax_check_exceptions =		\
  .x-sc_prohibit_stat_st_blocks		\
  .x-sc_prohibit_strcmp			\
  .x-sc_require_config_h		\
+  .x-sc_require_config_h_first		\
  .x-sc_space_tab			\
  .x-sc_sun_os_names			\
+  .x-sc_system_h_headers		\
  .x-sc_trailing_blank			\
  .x-sc_unmarked_diagnostics		\
  .x-sc_useless_cpp_parens
--- a/62
+++ b/62
@@ -1,5 +1,67 @@
 GNU coreutils NEWS                                    -*- outline -*-

+* Noteworthy changes in release 7.5 (2009-08-20) [stable]
+
+** Bug fixes
+
+  dd's oflag=direct option now works even when the size of the input
+  is not a multiple of e.g., 512 bytes.
+
+  dd now handles signals consistently even when they're received
+  before data copying has started.
+
+  install runs faster again with SELinux enabled
+  [introduced in coreutils-7.0]
+
+  ls -1U (with two or more arguments, at least one a nonempty directory)
+  would print entry names *before* the name of the containing directory.
+  Also fixed incorrect output of ls -1RU and ls -1sU.
+  [introduced in coreutils-7.0]
+
+  sort now correctly ignores fields whose ending position is specified
+  before the start position. Previously in numeric mode the remaining
+  part of the line after the start position was used as the sort key.
+  [This bug appears to have been present in "the beginning".]
+
+  truncate -s failed to skip all whitespace in the option argument in
+  some locales.
+
+** New programs
+
+  stdbuf: A new program to run a command with modified stdio buffering
+  for its standard streams.
+
+** Changes in behavior
+
+  ls --color: files with multiple hard links are no longer colored differently
+  by default. That can be enabled by changing the LS_COLORS environment
+  variable. You can control that using the MULTIHARDLINK dircolors input
+  variable which corresponds to the 'mh' LS_COLORS item. Note these variables
+  were renamed from 'HARDLINK' and 'hl' which were available since
+  coreutils-7.1 when this feature was introduced.
+
+** Deprecated options
+
+  nl --page-increment: deprecated in favor of --line-increment, the new option
+  maintains the previous semantics and the same short option, -i.
+
+** New features
+
+  chroot now accepts the options --userspec and --groups.
+
+  cp accepts a new option, --reflink: create a lightweight copy
+  using copy-on-write (COW).  This is currently only supported within
+  a btrfs file system.
+
+  cp now preserves time stamps on symbolic links, when possible
+
+  sort accepts a new option, --human-numeric-sort (-h): sort numbers
+  while honoring human readable suffixes like KiB and MB etc.
+
+  tail --follow now uses inotify when possible, to be more responsive
+  to file changes and more efficient when monitoring many files.
+
+
 * Noteworthy changes in release 7.4 (2009-05-07) [stable]

 ** Bug fixes
--- a/6
+++ b/6
@@ -13,9 +13,9 @@ The programs that can be built with this package are:
  link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
  od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
  runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
-  sleep sort split stat stty su sum sync tac tail tee test timeout touch tr
-  true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who
-  whoami yes
+  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
+  vdir wc who whoami yes

 See the file NEWS for a list of major changes in the current release.

--- a/34
+++ b/34
@@ -2,42 +2,24 @@

 These notes intend to help people working on the checked-out sources.
 These requirements do not apply when building from a distribution tarball.
-See also HACKING for more detailed coreutils contribution guidlines.
+See also HACKING for more detailed coreutils contribution guidelines.

 * Requirements

 We've opted to keep only the highest-level sources in the GIT repository.
 This eases our maintenance burden, (fewer merges etc.), but imposes more
 requirements on anyone wishing to build from the just-checked-out sources.
-Specific tools and versions will be checked for and listed by the
-bootstrap script shown below, and will include:
-
- Automake <http://www.gnu.org/software/automake/>
- Autoconf <http://www.gnu.org/software/autoconf/>
- Bison <http://www.gnu.org/software/bison/>
- Gettext <http://www.gnu.org/software/gettext/>
- Git <http://git.or.cz/>
- Gperf <http://www.gnu.org/software/gperf/>
- Gzip <http://www.gnu.org/software/gzip/>
- Perl <http://www.cpan.org/>
- Rsync <http://samba.anu.edu.au/rsync/>
- Tar <http://www.gnu.org/software/tar/>
-
-Only building the initial full source tree will be a bit painful.
-Later, a plain `git pull && make' should be sufficient.
-
- Valgrind
+Note the requirements to build the released archive are much less and
+are just the requirements of the standard ./configure && make procedure.
+Specific development tools and versions will be checked for and listed by
+the bootstrap script.  See README-prereq for specific notes on obtaining
+these prerequisite tools.

 Valgrind <http://valgrind.org/> is also highly recommended, if
 Valgrind supports your architecture. See also README-valgrind.

- XZ utils (successor to LZMA)
-
-This package's build procedure uses XZ to create a compressed
-distribution tarball.  Using this feature of Automake requires
-version 1.10a or newer, as well as the xz program itself.
-Make sure you have the latest version of the XZ Utils from
-<http://tukaani.org/lzma/download>.
+While building from a just-cloned source tree may require installing a
+few prerequisites, later, a plain `git pull && make' should be sufficient.

 * First GIT checkout

--- a/79
+++ b/79
@@ -1,35 +1,56 @@
-Detailed below are concrete examples for
-getting the prerequisites for particular systems.
+This gives some notes on obtaining the tools required for development.
+I.E. the tools checked for by the bootstrap script and include:

- GNU/Linux - fedora
+- Autoconf  <http://www.gnu.org/software/autoconf/>
+- Automake  <http://www.gnu.org/software/automake/>
+- Bison     <http://www.gnu.org/software/bison/>
+- Gettext   <http://www.gnu.org/software/gettext/>
+- Git       <http://git.or.cz/>
+- Gperf     <http://www.gnu.org/software/gperf/>
+- Gzip      <http://www.gnu.org/software/gzip/>
+- Perl      <http://www.cpan.org/>
+- Rsync     <http://samba.anu.edu.au/rsync/>
+- Tar       <http://www.gnu.org/software/tar/>
+- Texinfo   <http://www.gnu.org/software/texinfo/>

-  This shows the steps for getting the required tools to build coreutils 7.0
-  on a Fedora 8 system. We try to use official packages where possible.
-  The 3 methods described for making these required packages available, should
-  help clarify build requirements on any GNU/Linux system at least.
+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.

-  1. Make sure offical distro git package is installed
-    # yum install git
+* autoconf *

-  2. The distro autoconf is too old, but there is a newer one available
-  so we rebuild that and make it available to the full system:
-    # yum install emacs #autoconf build requires emacs (20MB)
-    # rpmbuild --rebuild http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/autoconf-2.63-1.fc10.src.rpm
-    # rpm -Uvh /usr/src/redhat/RPMS/noarch/autoconf-2.63-1.fc8.noarch.rpm
-  Note Autoconf 2.61a-341 or newer is needed to build automake-1.10b in step 3.
-  Apply the same method to install the lzma package.
-  [FIXME: mention xz when it's packaged]
+  # 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
+  ./configure --prefix=$HOME/coreutils/deps
+  make install

-  3. The latest stable automake (1.10.1) was not new enough, so we download
-  and build automake-1.10b or newer from its repository and make it available
-  just to coreutils:
-    # yum install help2man #required to build automake fully
-    $ git clone git://git.sv.gnu.org/automake.git
-    $ cd automake
-    $ git checkout -b next --track origin/next
-    $ ./bootstrap
-    $ ./configure --prefix=$HOME/coreutils/deps
-    $ make install
+* automake *

-  Now we can build coreutils as described in README-hacking
-  as long as $PATH starts with $HOME/coreutils/deps
+  # Note help2man is required to build automake fully
+  git clone git://git.sv.gnu.org/automake.git
+  cd automake
+  git checkout -b branch-1.11 --track origin/branch-1.11
+  ./bootstrap
+  ./configure --prefix=$HOME/coreutils/deps
+  make install
+
+coreutils uses XZ utils (successor to LZMA) to create
+a compressed distribution tarball.  Using this feature of Automake
+requires version 1.10a or newer, as well as the xz program itself.
+
+* xz *
+
+  git clone git://ctrl.tukaani.org/xz.git
+  cd xz
+  ./autogen.sh
+  ./configure --prefix=$HOME/coreutils/deps
+  make install
+
+Now we can build coreutils as described in README-hacking
+as long as $PATH starts with $HOME/coreutils/deps/bin, which
+one can set for the current shell like:
+  $ export PATH=$HOME/coreutils/deps/bin:$PATH
--- a/4
+++ b/4
@@ -39,6 +39,8 @@ FIXME: enable excluded programs like arch? to get their manual pages?

 * Run the following to create release tarballs.  Your choice selects the
  corresponding upload-to destination in the emitted gnupload command.
+  The different destinations are specified in cfg.mk.  See the definitions
+  of gnu_ftp_host-{alpha,beta,major}.

    # "TYPE" must be major, beta or alpha
    make TYPE
@@ -51,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 suggested by your "XZ_OPT=-9e make major" 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
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Convert this package for use with valgrind.

-# Copyright (C) 2002, 2003, 2004, 2005, 2006 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/5
+++ b/5
@@ -75,6 +75,7 @@ Bernd Melchers                      melchers@cis.fu-berlin.de
 Bernhard Baehr                      bernhard.baehr@gmx.de
 Bernhard Gabler                     bernhard@uni-koblenz.de
 Bernhard Rosenkraenzer              bero@redhat.de
+Bernhard Voelker                    bernhard.voelker@siemens-enterprise.com
 Bert Deknuydt                       Bert.Deknuydt@esat.kuleuven.ac.be
 Bert Wesarg                         bert.wesarg@googlemail.com
 Bill Peters                         peters@gaffel.as.arizona.edu
@@ -112,6 +113,7 @@ Christophe LYON                     christophe.lyon@st.com
 Chuck Hedrick                       hedrick@klinzhai.rutgers.edu
 Clark Morgan                        cmorgan@aracnet.com
 Clement Wang                        clem.wang@overture.com
+Cliff Miller                        cbm@whatexit.org
 Colin Plumb                         colin@nyx.net
 Colin Watson                        cjw44@riva.ucam.org
 Collin Rogowski                     collin@rogowski.de
@@ -276,6 +278,7 @@ Jim Dennis                          jimd@starshine.org
 Joakim Rosqvist                     dvljrt@cs.umu.se
 Jochen Hein                         jochen@jochen.org
 Joe Orton                           joe@manyfish.co.uk
+Joel E. Denny                       jdenny@clemson.edu
 Joerg Sonnenberger                  joerg@britannica.bec.de
 Joey Hess                           joeyh@debian.org
 Johan Boule                         bohan@bohan.dyndns.org
@@ -299,6 +302,7 @@ Joshua Hudson                       joshudson@gmail.com
 Josselin Mouette                    joss@debian.org
 Juan F. Codagnone                   juam@arnet.com.ar
 Juan M. Guerrero                    st001906@hrz1.hrz.tu-darmstadt.de
+Julian Bradfield                    jcb@inf.ed.ac.uk
 Jungshik Shin                       jshin@pantheon.yale.edu
 Jürgen Fluk                         louis@dachau.marco.de
 Jurriaan                            thunder7@xs4all.nl
@@ -396,6 +400,7 @@ Michael J. Croghan                  mcroghan@usatoday.com
 Michael McFarland                   sidlon@yahoo.com
 Michael McLagan                     mmclagan@invlogic.com
 Michael Piefel                      piefel@informatik.hu-berlin.de
+Michael Speer                       knomenet@gmail.com
 Michael Steffens                    michael.steffens@s.netic.de
 Michael Stone                       mstone@debian.org
 Michael Stutz                       stutz@dsl.org
--- a/196
+++ b/196
@@ -106,14 +106,14 @@ tests_base=tests

 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
-	$build_aux/install-sh
-	$build_aux/missing
-	$build_aux/mdate-sh
-	$build_aux/texinfo.tex
-	$build_aux/depcomp
-	$build_aux/config.guess
-	$build_aux/config.sub
-	doc/INSTALL
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
 "

 # Additional gnulib-tool options to use.  Use "\newline" to break lines.
@@ -272,10 +272,10 @@ get_version() {

  $app --version 2>&1 |
  sed -n 's/[^0-9.]*\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/p
-	  t done
-	  d
-	  :done
-	  q'
+          t done
+          d
+          :done
+          q'
 }

 check_versions() {
@@ -313,7 +313,7 @@ print_versions() {

 if ! printf "$buildreq" | check_versions; then
  test -f README-prereq &&
-  echo "Please see README-prereq for notes on obtaining these prerequisite programs:" >&2
+  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
  echo
  print_versions
  exit 1
@@ -342,7 +342,7 @@ cleanup_gnulib() {
 }

 git_modules_config () {
-  GIT_CONFIG=.gitmodules git config "$@"
+  test -f .gitmodules && git config --file .gitmodules "$@"
 }

 # Get gnulib files.
@@ -371,7 +371,7 @@ case ${GNULIB_SRCDIR--} in
  # Redirect the gnulib submodule to the directory on the command line
  # if possible.
  if test -d "$GNULIB_SRCDIR"/.git && \
-	git_modules_config submodule.gnulib.url >/dev/null; then
+        git_modules_config submodule.gnulib.url >/dev/null; then
    git submodule init
    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
@@ -419,10 +419,12 @@ update_po_files() {
    new_po="$ref_po_dir/$po.po"
    cksum_file="$ref_po_dir/$po.s1"
    if ! test -f "$cksum_file" ||
-	! test -f "$po_dir/$po.po" ||
-	! ${SHA1SUM-sha1sum} -c --status "$cksum_file" < "$new_po" > /dev/null; then
+        ! test -f "$po_dir/$po.po" ||
+        ! ${SHA1SUM-sha1sum} -c --status "$cksum_file" \
+            < "$new_po" > /dev/null; then
      echo "updated $po_dir/$po.po..."
-      cp "$new_po" "$po_dir/$po.po" && ${SHA1SUM-sha1sum} < "$new_po" > "$cksum_file"
+      cp "$new_po" "$po_dir/$po.po" \
+          && ${SHA1SUM-sha1sum} < "$new_po" > "$cksum_file"
    fi
  done
 }
@@ -456,45 +458,45 @@ symlink_to_dir()
      # FIXME: for now, this does only one level
      parent=`dirname "$dst_dir"`
      for dot_ig in x $vc_ignore; do
-	test $dot_ig = x && continue
-	ig=$parent/$dot_ig
-	insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
      done
    fi

    if $copy; then
      {
-	test ! -h "$dst" || {
-	  echo "$0: rm -f $dst" &&
-	  rm -f "$dst"
-	}
+        test ! -h "$dst" || {
+          echo "$0: rm -f $dst" &&
+          rm -f "$dst"
+        }
      } &&
      test -f "$dst" &&
      cmp -s "$src" "$dst" || {
-	echo "$0: cp -fp $src $dst" &&
-	cp -fp "$src" "$dst"
+        echo "$0: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
      }
    else
      test -h "$dst" &&
      src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
      dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
      test "$src_i" = "$dst_i" || {
-	dot_dots=
-	case $src in
-	/*) ;;
-	*)
-	  case /$dst/ in
-	  *//* | */../* | */./* | /*/*/*/*/*/)
-	     echo >&2 "$0: invalid symlink calculation: $src -> $dst"
-	     exit 1;;
-	  /*/*/*/*/)	dot_dots=../../../;;
-	  /*/*/*/)	dot_dots=../../;;
-	  /*/*/)	dot_dots=../;;
-	  esac;;
-	esac
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+             exit 1;;
+          /*/*/*/*/)	dot_dots=../../../;;
+          /*/*/*/)	dot_dots=../../;;
+          /*/*/)	dot_dots=../;;
+          esac;;
+        esac

-	echo "$0: ln -fs $dot_dots$src $dst" &&
-	ln -fs "$dot_dots$src" "$dst"
+        echo "$0: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
      }
    fi
  }
@@ -524,29 +526,29 @@ cp_mark_as_generated()

    if test -z "$c1"; then
      cmp -s "$cp_src" "$cp_dst" || {
-	# Copy the file first to get proper permissions if it
-	# doesn't already exist.  Then overwrite the copy.
-	echo "$0: cp -f $cp_src $cp_dst" &&
-	rm -f "$cp_dst" &&
-	cp "$cp_src" "$cp_dst-t" &&
-	sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
-	mv -f "$cp_dst-t" "$cp_dst"
+        # Copy the file first to get proper permissions if it
+        # doesn't already exist.  Then overwrite the copy.
+        echo "$0: cp -f $cp_src $cp_dst" &&
+        rm -f "$cp_dst" &&
+        cp "$cp_src" "$cp_dst-t" &&
+        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+        mv -f "$cp_dst-t" "$cp_dst"
      }
    else
      # Copy the file first to get proper permissions if it
      # doesn't already exist.  Then overwrite the copy.
      cp "$cp_src" "$cp_dst-t" &&
      (
-	echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
-	echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
-	echo '#line 1' &&
-	sed "s!$bt_regex/!!g" "$cp_src"
+        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+        echo '#line 1' &&
+        sed "s!$bt_regex/!!g" "$cp_src"
      ) > $cp_dst-t &&
      if cmp -s "$cp_dst-t" "$cp_dst"; then
-	rm -f "$cp_dst-t"
+        rm -f "$cp_dst-t"
      else
-	echo "$0: cp $cp_src $cp_dst # with edits" &&
-	mv -f "$cp_dst-t" "$cp_dst"
+        echo "$0: cp $cp_src $cp_dst # with edits" &&
+        mv -f "$cp_dst-t" "$cp_dst"
      fi
    fi
  fi
@@ -558,7 +560,7 @@ version_controlled_file() {
  found=no
  if test -d CVS; then
    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
-	     grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
  elif test -d .git; then
    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
  elif test -d .svn; then
@@ -580,35 +582,35 @@ slurp() {
      esac
      test -d $1/$dir/$file && continue
      for excluded_file in $excluded_files; do
-	test "$dir/$file" = "$excluded_file" && continue 2
+        test "$dir/$file" = "$excluded_file" && continue 2
      done
      if test $file = Makefile.am; then
        copied=$copied${sep}$gnulib_mk; sep=$nl
-	remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || {
-	  echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
-	  rm -f $dir/$gnulib_mk &&
-	  sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
-	}
+          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+          rm -f $dir/$gnulib_mk &&
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+        }
      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
-	   version_controlled_file $dir $file; then
-	echo "$0: $dir/$file overrides $1/$dir/$file"
+           version_controlled_file $dir $file; then
+        echo "$0: $dir/$file overrides $1/$dir/$file"
      else
-	copied=$copied$sep$file; sep=$nl
-	if test $file = gettext.m4; then
-	  echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
-	  rm -f $dir/$file
-	  sed '
-	    /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-	      AC_DEFUN([AM_INTL_SUBDIR], [
-	    /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-	      AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-	    $a\
-	      AC_DEFUN([gl_LOCK_EARLY], [])
-	  ' $1/$dir/$file >$dir/$file
-	else
-	  cp_mark_as_generated $1/$dir/$file $dir/$file
-	fi
+        copied=$copied$sep$file; sep=$nl
+        if test $file = gettext.m4; then
+          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+          rm -f $dir/$file
+          sed '
+            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+              AC_DEFUN([AM_INTL_SUBDIR], [
+            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
+            $a\
+              AC_DEFUN([gl_LOCK_EARLY], [])
+          ' $1/$dir/$file >$dir/$file
+        else
+          cp_mark_as_generated $1/$dir/$file $dir/$file
+        fi
      fi || exit
    done

@@ -616,18 +618,18 @@ slurp() {
      test $dot_ig = x && continue
      ig=$dir/$dot_ig
      if test -n "$copied"; then
-	insert_sorted_if_absent $ig "$copied"
-	# If an ignored file name ends with .in.h, then also add
-	# the name with just ".h".  Many gnulib headers are generated,
-	# e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
-	# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-	f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-	insert_sorted_if_absent $ig "$f"
+        insert_sorted_if_absent $ig "$copied"
+        # If an ignored file name ends with .in.h, then also add
+        # the name with just ".h".  Many gnulib headers are generated,
+        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+        insert_sorted_if_absent $ig "$f"

-	# For files like sys_stat.in.h and sys_time.in.h, record as
-	# ignorable the directory we might eventually create: sys/.
-	f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-	insert_sorted_if_absent $ig "$f"
+        # For files like sys_stat.in.h and sys_time.in.h, record as
+        # ignorable the directory we might eventually create: sys/.
+        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+        insert_sorted_if_absent $ig "$f"
      fi
    done
  done
@@ -733,7 +735,7 @@ if test $with_gettext = yes; then
    /^XGETTEXT_OPTIONS *=/{
      s/$/ \\/
      a\
-	  '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
    }
  ' po/Makevars.template >po/Makevars

@@ -745,9 +747,9 @@ if test $with_gettext = yes; then
      /^subdir *=.*/s/=.*/= runtime-po/
      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
      /^XGETTEXT_OPTIONS *=/{
-	s/$/ \\/
-	a\
-	    '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+        s/$/ \\/
+        a\
+            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
      }
    ' <po/Makevars.template >runtime-po/Makevars

@@ -763,3 +765,7 @@ sed 's,\.\./\.\.,..,g' $m > $m-t
 mv -f $m-t $m

 echo "$0: done.  Now you can run './configure'."
+
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -27,7 +27,6 @@ avoided_gnulib_modules='
 # but leave them in for now to minimize changes.
 obsolete_gnulib_modules='
  atexit
-  memchr
  memcmp
  memcpy
  memmove
@@ -103,7 +102,7 @@ gnulib_modules="
  getline
  getloadavg
  getndelim2
-  getopt
+  getopt-gnu
  getpagesize
  getpass-gnu
  gettext
@@ -141,6 +140,7 @@ gnulib_modules="
  mbsalign
  mbswidth
  memcasecmp
+  memchr
  memcmp2
  mempcpy
  memrchr
@@ -210,6 +210,7 @@ gnulib_modules="
  unlink-busy
  unlinkdir
  unlocked-io
+  update-copyright
  uptime
  useless-if-before-free
  userspec
@@ -301,7 +302,7 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
 # Build prerequisites
 buildreq="\
 autoconf   2.61
-automake   1.10b
+automake   1.11
 autopoint  -
 bison      -
 gettext    -
--- a/build-aux/ChangeLog-2007
+++ b/build-aux/ChangeLog-2007
@@ -234,8 +234,7 @@

 	-----

-	Copyright (C) 2002, 2003, 2004, 2005, 2006 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
@@ -33,18 +33,13 @@ gpg_key_ID = B9AB9A16
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip = strftime-check

-# The local directory containing the checked-out copy of gnulib used in this
-# release.  Used to get gnulib's SHA1 for the "announcement" target and
-# for signing release tags.
-gnulib_dir = gnulib
-
 # Tools used to bootstrap this package, used for "announcement".
 bootstrap-tools = autoconf,automake,gnulib,bison

 # Now that we have better tests, make this the default.
 export VERBOSE = yes

-old_NEWS_hash = 2f661e60191e2c52ba73c22e5ac42b79
+old_NEWS_hash = 8ed224902e335a80ec8340cd0d594d7f

 # Ensure that the list of O_ symbols used to compute O_FULLBLOCK is complete.
 dd = $(srcdir)/src/dd.c
@@ -104,6 +99,18 @@ sc_root_tests:
 	       exit 1; } || :;						\
 	fi

+# Ensure that the syntax_check_exceptions file list in Makefile.am
+# stays in sync with corresponding files in the repository.
+sce = syntax_check_exceptions
+sc_x_sc_dist_check:
+	@test "$$( ($(VC_LIST) | sed -n '/^.x-sc_/p';			\
+		   sed -n '/^$(sce) =[	 ]*\\$$/,/[^\]$$/p'		\
+		     $(srcdir)/Makefile.am				\
+		       | sed 's/^  *//;/^$(sce) =/d'			\
+		       | tr -s '\012\\' '  ' | fmt -1			\
+		   ) | sort | uniq -u)"					\
+	  && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :;
+
 headers_with_interesting_macro_defs = \
  exit.h	\
  fcntl_.h	\
@@ -153,8 +160,7 @@ sc_system_h_headers: .re-list
 	@if test -f $(srcdir)/src/system.h; then			\
 	  trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15;		\
 	  grep -nE -f .re-list						\
-	      $$($(VC_LIST) src |					\
-		 grep -Ev '((copy|system)\.h|parse-gram\.c)$$')		\
+	      $$($(VC_LIST_EXCEPT) | grep '^src/')			\
 	    && { echo '$(ME): the above are already included via system.h'\
 		  1>&2;  exit 1; } || :;				\
 	fi
@@ -170,6 +176,10 @@ ALL_RECURSIVE_TARGETS += sc_tight_scope
 sc_tight_scope:
 	@$(MAKE) -C src $@

+ALL_RECURSIVE_TARGETS += sc_check-AUTHORS
+sc_check-AUTHORS:
+	@$(MAKE) -C src $@
+
 # Perl-based tests used to exec perl from a #!/bin/sh script.
 # Now they all start with #!/usr/bin/perl and the portability
 # infrastructure is in tests/Makefile.am.  Make sure no old-style
--- a/configure.ac
+++ b/configure.ac
@@ -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.10b 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
@@ -60,9 +60,11 @@ if test "$gl_gcc_warnings" = yes; then
  gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
  AC_SUBST([WERROR_CFLAGS])

-  # Add many warnings, except some...
+  nw=
+  # This, $nw, is the list of warnings we disable.
  nw="$nw -Wdeclaration-after-statement" # too useful to forbid
  nw="$nw -Waggregate-return"       # anachronistic
+  nw="$nw -Wlong-long"              # C90 is anachronistic (lib/gethrxtime.h)
  nw="$nw -Wc++-compat"             # We don't care about C++ compilers
  nw="$nw -Wundef"                  # Warns on '#if GNULIB_FOO' etc in gnulib
  nw="$nw -Wtraditional"            # Warns on #elif which we use often
@@ -80,6 +82,7 @@ if test "$gl_gcc_warnings" = yes; then
  nw="$nw -Wnested-externs"         # use of XARGMATCH/verify_function__
  nw="$nw -Wswitch-enum"            # Too many warnings for now
  nw="$nw -Wswitch-default"         # Too many warnings for now
+  nw="$nw -Wstack-protector"        # not worth working around
  # things I might fix soon:
  nw="$nw -Wfloat-equal"            # sort.c, seq.c
  nw="$nw -Wmissing-format-attribute" # copy.c
@@ -97,6 +100,14 @@ if test "$gl_gcc_warnings" = yes; then
  gl_WARN_ADD([-Wno-sign-compare])     # Too many warnings for now
  gl_WARN_ADD([-Wno-pointer-sign])     # Too many warnings for now
  gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now
+
+  # Offenders in pre-fts remove.c; FIXME: remove upon remove.c rewrite
+  gl_WARN_ADD([-Wno-jump-misses-init])
+
+  # In spite of excluding -Wlogical-op above, it is enabled, as of
+  # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c
+  gl_WARN_ADD([-Wno-logical-op])
+
  gl_WARN_ADD([-fdiagnostics-show-option])

  AC_SUBST([WARN_CFLAGS])
@@ -314,6 +325,19 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
  gl_ADD_PROG([optional_bin_progs], [df])
 fi

+# Limit stdbuf to ELF systems with GCC
+optional_pkglib_progs=
+AC_MSG_CHECKING([whether this is an ELF system])
+AC_EGREP_CPP([yes], [#if __ELF__
+yes
+#endif], [elf_sys=yes], [elf_sys=no])
+AC_MSG_RESULT([$elf_sys])
+if test "$elf_sys" = "yes" && \
+   test "$GCC" = "yes"; then
+  gl_ADD_PROG([optional_bin_progs], [stdbuf])
+  gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so])
+fi
+
 ############################################################################
 mk="$srcdir/src/Makefile.am"
 # Extract all literal names from the definition of $(EXTRA_PROGRAMS)
@@ -386,6 +410,8 @@ MAN=`echo "$MAN"|sed 's/\@<:@\.1//'`

 OPTIONAL_BIN_PROGS=`echo "$optional_bin_progs "|sed 's/ /\$(EXEEXT) /g;s/ $//'`
 AC_SUBST([OPTIONAL_BIN_PROGS])
+OPTIONAL_PKGLIB_PROGS=`echo "$optional_pkglib_progs " | sed 's/ $//'`
+AC_SUBST([OPTIONAL_PKGLIB_PROGS])
 NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default
 AC_SUBST([NO_INSTALL_PROGS_DEFAULT])

--- a/dist-check.mk
+++ b/dist-check.mk
@@ -1,6 +1,5 @@
 # Most of this is probably too coreutils-centric to be useful to other packages.

-warn_cflags = -Dlint -O -Werror -Wall -Wformat -Wshadow -Wpointer-arith
 bin=bin-$$$$

 write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)'
@@ -118,9 +117,8 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
 	mkdir -p $(t)
 	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
 	cd $(t)/$(distdir)				\
-	  && ./configure --disable-nls			\
-	  && $(MAKE) CFLAGS='$(warn_cflags)'		\
-	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)'	\
+	  && ./configure --enable-gcc-warnings --disable-nls \
+	  && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
 	  && $(MAKE) dvi				\
 	  && $(install-transform-check)			\
 	  && $(my-instcheck)				\
--- a/doc/ChangeLog-2007
+++ b/doc/ChangeLog-2007
@@ -2002,8 +2002,7 @@

 	-----

-	Copyright (C) 2001, 2003, 2004, 2005, 2006 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/coreutils.texi
+++ b/doc/coreutils.texi
@@ -105,6 +105,7 @@
 * sort: (coreutils)sort invocation.             Sort text files.
 * split: (coreutils)split invocation.           Split into fixed-size pieces.
 * stat: (coreutils)stat invocation.             Report file(system) status.
+* stdbuf: (coreutils)stdbuf invocation.         Modify stdio buffering.
 * stty: (coreutils)stty invocation.             Print/change terminal settings.
 * su: (coreutils)su invocation.                 Modify user and group ID.
 * sum: (coreutils)sum invocation.               Print traditional checksum.
@@ -197,7 +198,7 @@ Free Documentation License''.
 * User information::                   id logname whoami groups users who
 * System context::                     date uname hostname hostid uptime
 * SELinux context::                    chcon runcon
-* Modified command invocation::        chroot env nice nohup su timeout
+* Modified command invocation::        chroot env nice nohup stdbuf su timeout
 * Process control::                    kill
 * Delaying::                           sleep
 * Numeric operations::                 factor seq
@@ -321,7 +322,7 @@ Special file types
 * mkdir invocation::            Make directories
 * mkfifo invocation::           Make FIFOs (named pipes)
 * mknod invocation::            Make block or character special files
-* readlink invocation::         Print the referent of a symbolic link
+* readlink invocation::         Print value of a symlink or canonical file name
 * rmdir invocation::            Remove empty directories
 * unlink invocation::           Remove files via unlink syscall

@@ -425,6 +426,7 @@ System context
 * Examples of date::             Examples.

 SELinux context
+
 * chcon invocation::             Change SELinux context of file
 * runcon invocation::            Run a command in specified SELinux context

@@ -434,6 +436,7 @@ Modified command invocation
 * env invocation::               Run a command in a modified environment
 * nice invocation::              Run a command with modified niceness
 * nohup invocation::             Run a command immune to hangups
+* stdbuf invocation::            Run a command with modified I/O buffering
 * su invocation::                Run a command with substitute user and group ID
 * timeout invocation::           Run a command with a time limit

@@ -1685,9 +1688,9 @@ Analogous to @option{--body-numbering}.
 Analogous to @option{--body-numbering}.

@item -i @var{number}
-@itemx --page-increment=@var{number}
+@itemx --line-increment=@var{number}
@opindex -i
-@opindex --page-increment
+@opindex --line-increment
 Increment line numbers by @var{number} (default 1).

@item -l @var{number}
@@ -2004,7 +2007,7 @@ address.
@exitstatus

@node base64 invocation
-@section @command{base64}: Transform data into printable data.
+@section @command{base64}: Transform data into printable data

@pindex base64
@cindex base64 encoding
@@ -2653,22 +2656,22 @@ The program accepts the following options.  Also see @ref{Common options}.

@table @samp

-@item -c @var{n}
-@itemx --bytes=@var{n}
+@item -c @var{k}
+@itemx --bytes=@var{k}
@opindex -c
@opindex --bytes
-Print the first @var{n} bytes, instead of initial lines.
-However, if @var{n} starts with a @samp{-},
-print all but the last @var{n} bytes of each file.
-@multiplierSuffixes{n}
+Print the first @var{k} bytes, instead of initial lines.
+However, if @var{k} starts with a @samp{-},
+print all but the last @var{k} bytes of each file.
+@multiplierSuffixes{k}

-@itemx -n @var{n}
-@itemx --lines=@var{n}
+@itemx -n @var{k}
+@itemx --lines=@var{k}
@opindex -n
@opindex --lines
-Output the first @var{n} lines.
-However, if @var{n} starts with a @samp{-},
-print all but the last @var{n} lines of each file.
+Output the first @var{k} lines.
+However, if @var{k} starts with a @samp{-},
+print all but the last @var{k} lines of each file.
 Size multiplier suffixes are the same as with the @option{-c} option.

@item -q
@@ -2738,14 +2741,14 @@ The program accepts the following options.  Also see @ref{Common options}.

@table @samp

-@item -c @var{n}
-@itemx --bytes=@var{n}
+@item -c @var{k}
+@itemx --bytes=@var{k}
@opindex -c
@opindex --bytes
-Output the last @var{n} bytes, instead of final lines.
-However, if @var{n} starts with a @samp{+}, start printing with the
-@var{n}th byte from the start of each file, instead of from the end.
-@multiplierSuffixes{n}
+Output the last @var{k} bytes, instead of final lines.
+However, if @var{k} starts with a @samp{+}, start printing with the
+@var{k}th byte from the start of each file, instead of from the end.
+@multiplierSuffixes{k}

@item -f
@itemx --follow[=@var{how}]
@@ -2850,13 +2853,13 @@ number of seconds between when tail prints the last pre-rotation lines
 and when it prints the lines that have accumulated in the new log file.
 This option is meaningful only when following by name.

-@itemx -n @var{n}
-@itemx --lines=@var{n}
+@itemx -n @var{k}
+@itemx --lines=@var{k}
@opindex -n
@opindex --lines
-Output the last @var{n} lines.
-However, if @var{n} starts with a @samp{+}, start printing with the
-@var{n}th line from the start of each file, instead of from the end.
+Output the last @var{k} lines.
+However, if @var{k} starts with a @samp{+}, start printing with the
+@var{k}th line from the start of each file, instead of from the end.
 Size multiplier suffixes are the same as with the @option{-c} option.

@item -q
@@ -3721,7 +3724,9 @@ so portable shell scripts should specify global options first.
@vindex LC_CTYPE
 Ignore leading blanks when finding sort keys in each line.
 By default a blank is a space or a tab, but the @env{LC_CTYPE} locale
-can change this.
+can change this.  Note blanks may be ignored by your locale's collating
+rules, but without this option they will be significant for character
+positions specified in keys with the @option{-k} option.

@item -d
@itemx --dictionary-order
@@ -3785,6 +3790,21 @@ Use this option only if there is no alternative; it is much slower than
@option{--numeric-sort} (@option{-n}) and it can lose information when
 converting to floating point.

+@item -h
+@itemx --human-numeric-sort
+@itemx --sort=human-numeric
+@opindex -h
+@opindex --human-numeric-sort
+@opindex --sort
+@cindex human numeric sort
+@vindex LC_NUMERIC
+Sort numerically, as per the @option{--numeric-sort} option below, and in
+addition handle IEC or SI suffixes like MiB, MB etc (@ref{Block size}).
+Note a mixture of IEC and SI suffixes is not supported and will
+be flagged as an error.  Also the numbers must be abbreviated uniformly.
+I.E. values with different precisions like 6000K and 5M will be sorted
+incorrectly.
+
@item -i
@itemx --ignore-nonprinting
@opindex -i
@@ -3916,7 +3936,7 @@ according to different rules; see below for details.  Keys can span
 multiple fields.

 Example:  To sort on the second field, use @option{--key=2,2}
-(@option{-k 2,2}).  See below for more examples.
+(@option{-k 2,2}).  See below for more notes on keys and more examples.

@item --batch-size=@var{nmerge}
@opindex --batch-size
@@ -4085,15 +4105,15 @@ affect the meaning of character positions in field specifications in
 obscure cases.  The only fix is to add an explicit @option{-b}.

 A position in a sort field specified with @option{-k} may have any
-of the option letters @samp{Mbdfinr} appended to it, in which case the
-global ordering options are not used for that particular field.  The
+of the option letters @samp{MbdfghinRrV} appended to it, in which case no
+global ordering options are inherited by that particular field.  The
@option{-b} option may be independently attached to either or both of
 the start and end positions of a field specification, and if it is
 inherited from the global options it will be attached to both.
 If input lines can contain leading or adjacent blanks and @option{-t}
-is not used, then @option{-k} is typically combined with @option{-b},
-@option{-g}, @option{-M}, or @option{-n}; otherwise the varying
-numbers of leading blanks in fields can cause confusing results.
+is not used, then @option{-k} is typically combined with @option{-b} or
+an option that implicitly ignores leading blanks (@samp{MghnV}) as otherwise
+the varying numbers of leading blanks in fields can cause confusing results.

 If the start position in a sort field specifier falls after the end of
 the line or after the end field, the field is empty.  If the @option{-b}
@@ -4238,6 +4258,17 @@ by the sort operation.
@c printf 'c\n\nb\n\na\n'|perl -0pe 's/\n\n/\n\0/g'|sort -z|perl -0pe 's/\0/\n/g'
@c @end example

+@item
+Use the common @acronym{DSU, Decorate Sort Undecorate} idiom to
+sort lines according to their length.
+
+@example
+awk '@{print length, $0@}' /etc/passwd | sort -n | cut -f2- -d' '
+@end example
+
+In general this technique can be used to sort data that the @command{sort}
+command does not support, or is inefficient at, sorting directly.
+
@item
 Shuffle a list of directories, but preserve the order of files within
 each directory.  For instance, one could use this to generate a music
@@ -4565,7 +4596,7 @@ Columns are separated by a single TAB character.
@opindex -2
@opindex -3
 The options @option{-1}, @option{-2}, and @option{-3} suppress printing of
-the corresponding columns.  Also see @ref{Common options}.
+the corresponding columns (and separators).  Also see @ref{Common options}.

 Unlike some other comparison utilities, @command{comm} has an exit
 status that does not depend on the result of the comparison.
@@ -7373,6 +7404,9 @@ Make hard links instead of copies of non-directories.
@opindex -L
@opindex --dereference
 Follow symbolic links when copying from them.
+With this option, @command{cp} cannot create a symbolic link.
+For example, a symlink (to regular file) in the source tree will be copied to
+a regular file in the destination tree.

@item -n
@itemx --no-clobber
@@ -7420,8 +7454,27 @@ not yet take advantage of that.
@itemx links
 Preserve in the destination files
 any links between corresponding source files.
-@c Give examples illustrating how hard links are preserved.
-@c Also, show how soft links map to hard links with -L and -H.
+Note that with @option{-L} or @option{-H}, this option can convert
+symbolic links to hard links.  For example,
+@example
+$ mkdir c; : > a; ln -s a b; cp -aH a b c; ls -i1 c
+74161745 a
+74161745 b
+@end example
+@noindent
+Note the inputs: @file{b} is a symlink to regular file @file{a},
+yet the files in destination directory, @file{c/}, are hard-linked.
+Since @option{-a} implies @option{--preserve=links}, and since @option{-H}
+tells @command{cp} to dereference command line arguments, it sees two files
+with the same inode number, and preserves the perceived hard link.
+
+Here is a similar example that exercises @command{cp}'s @option{-L} option:
+@smallexample
+$ mkdir b c; (cd b; : > a; ln -s a b); cp -aL b c; ls -i1 c/b
+74163295 a
+74163295 b
+@end smallexample
+
@itemx context
 Preserve SELinux security context of the file. @command{cp} will fail
 if the preserving of SELinux security context is not succesful.
@@ -7490,6 +7543,15 @@ Also, it is not portable to use @option{-R} to copy symbolic links
 unless you also specify @option{-P}, as @acronym{POSIX} allows
 implementations that dereference symbolic links by default.

+@item --reflink
+@opindex --reflink
+Perform a lightweight, copy-on-write (COW) copy.
+Copying with this option can succeed only on some relatively new file systems.
+Once it has succeeded, beware that the source and destination files
+share the same disk data blocks as long as they remain unmodified.
+Thus, if a disk I/O error affects data blocks of one of the files,
+the other suffers the exact same fate.
+
@item --remove-destination
@opindex --remove-destination
 Remove each existing destination file before attempting to open it
@@ -7808,6 +7870,10 @@ same time.
@opindex direct
@cindex direct I/O
 Use direct I/O for data, avoiding the buffer cache.
+Note that the kernel may impose restrictions on read or write buffer sizes.
+For example, with an ext4 destination file system and a linux-based kernel,
+using @samp{oflag=direct} will cause writes to fail with @code{EINVAL} if the
+output buffer size is not a multiple of 512.

@item directory
@opindex directory
@@ -8642,7 +8708,7 @@ Besides directories, other special file types include named pipes
 * mkdir invocation::            Make directories.
 * mkfifo invocation::           Make FIFOs (named pipes).
 * mknod invocation::            Make block or character special files.
-* readlink invocation::         Print the referent of a symbolic link.
+* readlink invocation::         Print value of a symlink or canonical file name.
 * rmdir invocation::            Remove empty directories.
 * unlink invocation::           Remove files via the unlink syscall
@end menu
@@ -9087,10 +9153,14 @@ Set the default SELinux security context to be used for created files.


@node readlink invocation
-@section @command{readlink}: Print the referent of a symbolic link
+@section @command{readlink}: Print value of a symlink or canonical file name

@pindex readlink
@cindex displaying value of a symbolic link
+@cindex canonical file name
+@cindex canonicalize a file name
+@pindex realpath
+@findex realpath

@command{readlink} may work in one of two supported modes:

@@ -9170,6 +9240,9 @@ Report error messages.

 The @command{readlink} utility first appeared in OpenBSD 2.1.

+There is a @command{realpath} command on some systems
+which operates like @command{readlink} in canonicalize mode.
+
@exitstatus


@@ -13066,186 +13139,14 @@ This section describes commands that print or change system-wide
 information.

@menu
-* arch invocation::             Print machine hardware name.
 * date invocation::             Print or set system date and time.
+* arch invocation::             Print machine hardware name.
 * uname invocation::            Print system information.
 * hostname invocation::         Print or set system name.
 * hostid invocation::           Print numeric host identifier.
-* uptime invocation::           Print system uptime and load
+* uptime invocation::           Print system uptime and load.
@end menu

-@node SELinux context
-@chapter SELinux context
-
-@cindex SELinux context
-@cindex SELinux, context
-@cindex commands for SELinux context
-
-This section describes commands for operations with SELinux
-contexts.
-
-@menu
-* chcon invocation::            Change SELinux context of file
-* runcon invocation::           Run a command in specified SELinux context
-@end menu
-
-@node chcon invocation
-@section @command{chcon}: Change SELinux context of file.
-
-@pindex chcon
-@cindex changing security context
-@cindex change SELinux context
-
-@command{chcon} changes the SELinux security context of the selected files.
-Synopses:
-
-@smallexample
-chcon [@var{option}]@dots{} @var{context} @var{file}@dots{}
-chcon [@var{option}]@dots{} [-u @var{user}] [-r @var{role}] [-l @var{range}] [-t @var{type}] @var{file}@dots{}
-chcon [@var{option}]@dots{} --reference=@var{rfile} @var{file}@dots{}
-@end smallexample
-
-Change the SELinux security context of each @var{file} to @var{context}.
-With @option{--reference}, change the security context of each @var{file}
-to that of @var{rfile}.
-
-The program accepts the following options.  Also see @ref{Common options}.
-
-@table @samp
-
-@item -h
-@itemx --no-dereference
-@opindex -h
-@opindex --no-dereference
-@cindex no dereference
-Affect symbolic links instead of any referenced file.
-
-@item --reference=@var{rfile}
-@opindex --reference
-@cindex reference file
-Use @var{rfile}'s security context rather than specifying a @var{context} value.
-
-@item -R
-@itemx --recursive
-@opindex -R
-@opindex --recursive
-Operate on files and directories recursively.
-
-@choptH
-@xref{Traversing symlinks}.
-
-@choptL
-@xref{Traversing symlinks}.
-
-@choptP
-@xref{Traversing symlinks}.
-
-@item -v
-@itemx --verbose
-@opindex -v
-@opindex --verbose
-@cindex diagnostic
-Output a diagnostic for every file processed.
-
-@item -u @var{user}
-@itemx --user=@var{user}
-@opindex -u
-@opindex --user
-Set user @var{user} in the target security context.
-
-@item -r @var{role}
-@itemx --role=@var{role}
-@opindex -r
-@opindex --role
-Set role @var{role} in the target security context.
-
-@item -t @var{type}
-@itemx --type=@var{type}
-@opindex -t
-@opindex --type
-Set type @var{type} in the target security context.
-
-@item -l @var{range}
-@itemx --range=@var{range}
-@opindex -l
-@opindex --range
-Set range @var{range} in the target security context.
-
-@end table
-
-@exitstatus
-
-@node runcon invocation
-@section @command{runcon}: Run a command in specified SELinux context
-
-@pindex runcon
-@cindex run with security context
-
-
-@command{runcon} runs file in specified SELinux security context.
-
-Synopses:
-@smallexample
-runcon @var{context} @var{command} [@var{args}]
-runcon [ -c ] [-u @var{user}] [-r @var{role}] [-t @var{type}] [-l @var{range}] @var{command} [@var{args}]
-@end smallexample
-
-Run @var{command} with completely-specified @var{context}, or with
-current or transitioned security context modified by one or more of @var{level},
-@var{role}, @var{type} and @var{user}.
-
-If none of @option{-c}, @option{-t}, @option{-u}, @option{-r}, or @option{-l}
-is specified, the first argument is used as the complete context.
-Any additional arguments after @var{command}
-are interpreted as arguments to the command.
-
-With neither @var{context} nor @var{command}, print the current security context.
-
-The program accepts the following options.  Also see @ref{Common options}.
-
-@table @samp
-
-@item -c
-@itemx --compute
-@opindex -c
-@opindex --compute
-Compute process transition context before modifying.
-
-@item -u @var{user}
-@itemx --user=@var{user}
-@opindex -u
-@opindex --user
-Set user @var{user} in the target security context.
-
-@item -r @var{role}
-@itemx --role=@var{role}
-@opindex -r
-@opindex --role
-Set role @var{role} in the target security context.
-
-@item -t @var{type}
-@itemx --type=@var{type}
-@opindex -t
-@opindex --type
-Set type @var{type} in the target security context.
-
-@item -l @var{range}
-@itemx --range=@var{range}
-@opindex -l
-@opindex --range
-Set range @var{range} in the target security context.
-
-@end table
-
-@cindex exit status of @command{runcon}
-Exit status:
-
-@display
-126 if @var{command} is found but cannot be invoked
-127 if @command{runcon} itself fails or if @var{command} cannot be found
-the exit status of @var{command} otherwise
-@end display
-
@node date invocation
@section @command{date}: Print or set system date and time

@@ -14053,7 +13954,7 @@ options}.


@node hostid invocation
-@section @command{hostid}: Print numeric host identifier.
+@section @command{hostid}: Print numeric host identifier

@pindex hostid
@cindex printing the host identifier
@@ -14107,6 +14008,178 @@ also include processes in the uninterruptible sleep state (that is,
 those processes which are waiting for disk I/O).  The Linux kernel
 includes uninterruptible processes.

+@node SELinux context
+@chapter SELinux context
+
+@cindex SELinux context
+@cindex SELinux, context
+@cindex commands for SELinux context
+
+This section describes commands for operations with SELinux
+contexts.
+
+@menu
+* chcon invocation::            Change SELinux context of file
+* runcon invocation::           Run a command in specified SELinux context
+@end menu
+
+@node chcon invocation
+@section @command{chcon}: Change SELinux context of file
+
+@pindex chcon
+@cindex changing security context
+@cindex change SELinux context
+
+@command{chcon} changes the SELinux security context of the selected files.
+Synopses:
+
+@smallexample
+chcon [@var{option}]@dots{} @var{context} @var{file}@dots{}
+chcon [@var{option}]@dots{} [-u @var{user}] [-r @var{role}] [-l @var{range}] [-t @var{type}] @var{file}@dots{}
+chcon [@var{option}]@dots{} --reference=@var{rfile} @var{file}@dots{}
+@end smallexample
+
+Change the SELinux security context of each @var{file} to @var{context}.
+With @option{--reference}, change the security context of each @var{file}
+to that of @var{rfile}.
+
+The program accepts the following options.  Also see @ref{Common options}.
+
+@table @samp
+
+@item -h
+@itemx --no-dereference
+@opindex -h
+@opindex --no-dereference
+@cindex no dereference
+Affect symbolic links instead of any referenced file.
+
+@item --reference=@var{rfile}
+@opindex --reference
+@cindex reference file
+Use @var{rfile}'s security context rather than specifying a @var{context} value.
+
+@item -R
+@itemx --recursive
+@opindex -R
+@opindex --recursive
+Operate on files and directories recursively.
+
+@choptH
+@xref{Traversing symlinks}.
+
+@choptL
+@xref{Traversing symlinks}.
+
+@choptP
+@xref{Traversing symlinks}.
+
+@item -v
+@itemx --verbose
+@opindex -v
+@opindex --verbose
+@cindex diagnostic
+Output a diagnostic for every file processed.
+
+@item -u @var{user}
+@itemx --user=@var{user}
+@opindex -u
+@opindex --user
+Set user @var{user} in the target security context.
+
+@item -r @var{role}
+@itemx --role=@var{role}
+@opindex -r
+@opindex --role
+Set role @var{role} in the target security context.
+
+@item -t @var{type}
+@itemx --type=@var{type}
+@opindex -t
+@opindex --type
+Set type @var{type} in the target security context.
+
+@item -l @var{range}
+@itemx --range=@var{range}
+@opindex -l
+@opindex --range
+Set range @var{range} in the target security context.
+
+@end table
+
+@exitstatus
+
+@node runcon invocation
+@section @command{runcon}: Run a command in specified SELinux context
+
+@pindex runcon
+@cindex run with security context
+
+
+@command{runcon} runs file in specified SELinux security context.
+
+Synopses:
+@smallexample
+runcon @var{context} @var{command} [@var{args}]
+runcon [ -c ] [-u @var{user}] [-r @var{role}] [-t @var{type}] [-l @var{range}] @var{command} [@var{args}]
+@end smallexample
+
+Run @var{command} with completely-specified @var{context}, or with
+current or transitioned security context modified by one or more of @var{level},
+@var{role}, @var{type} and @var{user}.
+
+If none of @option{-c}, @option{-t}, @option{-u}, @option{-r}, or @option{-l}
+is specified, the first argument is used as the complete context.
+Any additional arguments after @var{command}
+are interpreted as arguments to the command.
+
+With neither @var{context} nor @var{command}, print the current security context.
+
+The program accepts the following options.  Also see @ref{Common options}.
+
+@table @samp
+
+@item -c
+@itemx --compute
+@opindex -c
+@opindex --compute
+Compute process transition context before modifying.
+
+@item -u @var{user}
+@itemx --user=@var{user}
+@opindex -u
+@opindex --user
+Set user @var{user} in the target security context.
+
+@item -r @var{role}
+@itemx --role=@var{role}
+@opindex -r
+@opindex --role
+Set role @var{role} in the target security context.
+
+@item -t @var{type}
+@itemx --type=@var{type}
+@opindex -t
+@opindex --type
+Set type @var{type} in the target security context.
+
+@item -l @var{range}
+@itemx --range=@var{range}
+@opindex -l
+@opindex --range
+Set range @var{range} in the target security context.
+
+@end table
+
+@cindex exit status of @command{runcon}
+Exit status:
+
+@display
+126 if @var{command} is found but cannot be invoked
+127 if @command{runcon} itself fails or if @var{command} cannot be found
+the exit status of @var{command} otherwise
+@end display
+
@node Modified command invocation
@chapter Modified command invocation

@@ -14123,6 +14196,7 @@ user, etc.
 * env invocation::              Modify environment variables.
 * nice invocation::             Modify niceness.
 * nohup invocation::            Immunize to hangups.
+* stdbuf invocation::           Modify buffering of standard streams.
 * su invocation::               Modify user and group ID.
 * timeout invocation::          Run with time limit.
@end menu
@@ -14144,7 +14218,7 @@ underlying function is non-privileged due to lack of support in MS-Windows.}
 Synopses:

@example
-chroot @var{newroot} [@var{command} [@var{args}]@dots{}]
+chroot @var{option} @var{newroot} [@var{command} [@var{args}]@dots{}]
 chroot @var{option}
@end example

@@ -14157,8 +14231,25 @@ variable or @command{/bin/sh} if not set, invoked with the @option{-i} option.
@var{command} must not be a special built-in utility
 (@pxref{Special built-in utilities}).

-The only options are @option{--help} and @option{--version}.  @xref{Common
-options}.  Options must precede operands.
+The program accepts the following options.  Also see @ref{Common options}.
+Options must precede operands.
+
+@table @samp
+
+@itemx --userspec=@var{user}[:@var{group}]
+@opindex --userspec
+By default, @var{command} is run with the same credentials
+as the invoking process.
+Use this option to run it as a different @var{user} and/or with a
+different primary @var{group}.
+
+@itemx --groups=@var{groups}
+@opindex --groups
+Use this option to specify the supplementary @var{groups} to be
+used by the new process.
+The items in the list (names or numeric IDs) must be separated by commas.
+
+@end table

 Here are a few tips to help avoid common problems in using chroot.
 To start with a simple example, make @var{command} refer to a statically
@@ -14469,6 +14560,85 @@ the exit status of @var{command} otherwise
@end display


+@node stdbuf invocation
+@section @command{stdbuf}: Run a command with modified I/O stream buffering
+
+@pindex stdbuf
+@cindex standard streams, buffering
+@cindex line buffered
+
+@command{stdbuf} allows one to modify the buffering operations of the
+three standard I/O streams associated with a program.  Synopsis:
+
+@example
+stdbuf @var{option}@dots{} @var{command}
+@end example
+
+Any additional @var{arg}s are passed as additional arguments to the
+@var{command}.
+
+The program accepts the following options.  Also see @ref{Common options}.
+
+@table @samp
+
+@item -i @var{mode}
+@itemx --input=@var{mode}
+@opindex -i
+@opindex --input
+Adjust the standard input stream buffering.
+
+@item -o @var{mode}
+@itemx --output=@var{mode}
+@opindex -o
+@opindex --output
+Adjust the standard output stream buffering.
+
+@item -e @var{mode}
+@itemx --error=@var{mode}
+@opindex -e
+@opindex --error
+Adjust the standard error stream buffering.
+
+@end table
+
+The @var{mode} can be specified as follows:
+
+@table @samp
+
+@item L
+Set the stream to line buffered mode.
+In this mode data is coalesced until a newline is output or
+input is read from any stream attached to a terminal device.
+This option is invalid with standard input.
+
+@item 0
+Disable buffering of the selected stream.
+In this mode data is output immediately and only the
+amount of data requested is read from input.
+
+@item @var{size}
+Specify the size of the buffer to use in fully buffered mode.
+@multiplierSuffixesNoBlocks{size}
+
+@end table
+
+NOTE: If @var{command} adjusts the buffering of its standard streams
+(@command{tee} does for e.g.) then that will override corresponding settings
+changed by @command{stdbuf}.  Also some filters (like @command{dd} and
+@command{cat} etc.) don't use streams for I/O, and are thus unaffected
+by @command{stdbuf} settings.
+
+@cindex exit status of @command{stdbuf}
+Exit status:
+
+@display
+125 if @command{stdbuf} 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
+@end display
+
+
@node su invocation
@section @command{su}: Run a command with substitute user and group ID

--- 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
-@c Free Software 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/argv-iter.c
+++ b/gl/lib/argv-iter.c
@@ -1,117 +0,0 @@
-/* Iterate over arguments from argv or --files0-from=FILE
-   Copyright (C) 2008 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/>.  */
-
-/* Written by Jim Meyering.  */
-
-#include <config.h>
-#include "argv-iter.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-struct argv_iterator
-{
-  /* Test FP to determine whether in read-mode or argv-mode. */
-  /* file-mode: fp records position */
-  FILE *fp;
-  size_t item_idx;
-  char *tok;
-  size_t buf_len;
-
-  /* argv-mode: record just argv and current pointer */
-  char **arg_list;
-  char **p;
-};
-
-struct argv_iterator *
-argv_iter_init_argv (char **argv)
-{
-  struct argv_iterator *ai = malloc (sizeof *ai);
-  if (!ai)
-    return NULL;
-  ai->fp = NULL;
-  ai->arg_list = argv;
-  ai->p = argv;
-  return ai;
-}
-
-/* Initialize to read from the stream, FP.
-   The input is expected to contain a list of NUL-delimited tokens.  */
-struct argv_iterator *
-argv_iter_init_stream (FILE *fp)
-{
-  struct argv_iterator *ai = malloc (sizeof *ai);
-  if (!ai)
-    return NULL;
-  ai->fp = fp;
-  ai->tok = NULL;
-  ai->buf_len = 0;
-
-  ai->item_idx = 0;
-  ai->arg_list = NULL;
-  return ai;
-}
-
-char *
-argv_iter (struct argv_iterator *ai, enum argv_iter_err *err)
-{
-  if (ai->fp)
-    {
-      ssize_t len = getdelim (&ai->tok, &ai->buf_len, '\0', ai->fp);
-      if (len < 0)
-        {
-          *err = feof (ai->fp) ? AI_ERR_EOF : AI_ERR_READ;
-          return NULL;
-        }
-
-      *err = AI_ERR_OK;
-      ai->item_idx++;
-      return ai->tok;
-    }
-  else
-    {
-      if (*(ai->p) == NULL)
-        {
-          *err = AI_ERR_EOF;
-          return NULL;
-        }
-      else
-        {
-          *err = AI_ERR_OK;
-          return *(ai->p++);
-        }
-    }
-}
-
-size_t
-argv_iter_n_args (struct argv_iterator const *ai)
-{
-  return ai->fp ? ai->item_idx : ai->p - ai->arg_list;
-}
-
-void
-argv_iter_free (struct argv_iterator *ai)
-{
-  if (ai->fp)
-    free (ai->tok);
-  free (ai);
-}
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- * End:
- */
--- a/gl/lib/argv-iter.h
+++ b/gl/lib/argv-iter.h
@@ -1,47 +0,0 @@
-/* Iterate over arguments from argv or --files0-from=FILE
-   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 <stdio.h>
-#include <stdbool.h>
-
-struct argv_iterator;
-enum argv_iter_err;
-
-#undef _ATTRIBUTE_NONNULL_
-#if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__
-# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m)))
-#else
-# define _ATTRIBUTE_NONNULL_(m)
-#endif
-
-enum argv_iter_err
-{
-  AI_ERR_OK = 1,
-  AI_ERR_EOF,
-  AI_ERR_MEM,
-  AI_ERR_READ
-};
-
-struct argv_iterator *argv_iter_init_argv (char **argv)
-  _ATTRIBUTE_NONNULL_ (1);
-struct argv_iterator *argv_iter_init_stream (FILE *fp)
-  _ATTRIBUTE_NONNULL_ (1);
-char *argv_iter (struct argv_iterator *, enum argv_iter_err *)
-  _ATTRIBUTE_NONNULL_ (1) _ATTRIBUTE_NONNULL_ (2);
-size_t argv_iter_n_args (struct argv_iterator const *)
-  _ATTRIBUTE_NONNULL_ (1);
-void argv_iter_free (struct argv_iterator *)
-  _ATTRIBUTE_NONNULL_ (1);
--- a/gl/lib/mgetgroups.h
+++ b/gl/lib/mgetgroups.h
@@ -1,5 +1,5 @@
 /* Get a list of all group IDs associated with a specified user ID.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   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
--- 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 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 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 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 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 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.h
+++ b/gl/lib/randread.h
@@ -1,6 +1,6 @@
 /* Generate buffers of random data.

-   Copyright (C) 2006 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/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 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 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/selinux-at.c
+++ b/gl/lib/selinux-at.c
@@ -1,88 +0,0 @@
-/* openat-style fd-relative functions for SE Linux
-   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/>.  */
-
-/* written by Jim Meyering */
-
-#include <config.h>
-
-#include "selinux-at.h"
-#include "openat.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
-#include "save-cwd.h"
-
-#include "openat-priv.h"
-
-#define AT_FUNC_NAME getfileconat
-#define AT_FUNC_F1 getfilecon
-#define AT_FUNC_F2 getfilecon
-#define AT_FUNC_USE_F1_COND 1
-#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t *con
-#define AT_FUNC_POST_FILE_ARGS        , con
-#include "at-func.c"
-#undef AT_FUNC_NAME
-#undef AT_FUNC_F1
-#undef AT_FUNC_F2
-#undef AT_FUNC_USE_F1_COND
-#undef AT_FUNC_POST_FILE_PARAM_DECLS
-#undef AT_FUNC_POST_FILE_ARGS
-
-#define AT_FUNC_NAME lgetfileconat
-#define AT_FUNC_F1 lgetfilecon
-#define AT_FUNC_F2 lgetfilecon
-#define AT_FUNC_USE_F1_COND 1
-#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t *con
-#define AT_FUNC_POST_FILE_ARGS        , con
-#include "at-func.c"
-#undef AT_FUNC_NAME
-#undef AT_FUNC_F1
-#undef AT_FUNC_F2
-#undef AT_FUNC_USE_F1_COND
-#undef AT_FUNC_POST_FILE_PARAM_DECLS
-#undef AT_FUNC_POST_FILE_ARGS
-
-#define AT_FUNC_NAME setfileconat
-#define AT_FUNC_F1 setfilecon
-#define AT_FUNC_F2 setfilecon
-#define AT_FUNC_USE_F1_COND 1
-#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t con
-#define AT_FUNC_POST_FILE_ARGS        , con
-#include "at-func.c"
-#undef AT_FUNC_NAME
-#undef AT_FUNC_F1
-#undef AT_FUNC_F2
-#undef AT_FUNC_USE_F1_COND
-#undef AT_FUNC_POST_FILE_PARAM_DECLS
-#undef AT_FUNC_POST_FILE_ARGS
-
-#define AT_FUNC_NAME lsetfileconat
-#define AT_FUNC_F1 lsetfilecon
-#define AT_FUNC_F2 lsetfilecon
-#define AT_FUNC_USE_F1_COND 1
-#define AT_FUNC_POST_FILE_PARAM_DECLS , security_context_t con
-#define AT_FUNC_POST_FILE_ARGS        , con
-#include "at-func.c"
-#undef AT_FUNC_NAME
-#undef AT_FUNC_F1
-#undef AT_FUNC_F2
-#undef AT_FUNC_USE_F1_COND
-#undef AT_FUNC_POST_FILE_PARAM_DECLS
-#undef AT_FUNC_POST_FILE_ARGS
--- a/gl/lib/selinux-at.h
+++ b/gl/lib/selinux-at.h
@@ -1,23 +0,0 @@
-/* Prototypes for openat-style fd-relative SELinux functions
-   Copyright (C) 2007 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 <selinux/selinux.h>
-#include <selinux/context.h>
-
-int  getfileconat (int fd, char const *file, security_context_t *con);
-int lgetfileconat (int fd, char const *file, security_context_t *con);
-int  setfileconat (int fd, char const *file, security_context_t con);
-int lsetfileconat (int fd, char const *file, security_context_t con);
--- a/gl/lib/tempname.c
+++ b/gl/lib/tempname.c
@@ -1,7 +1,7 @@
 /* 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 Free Software Foundation,
+   2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009 Free Software Foundation,
   Inc.

   This program is free software: you can redistribute it and/or modify
--- a/gl/lib/tempname.h
+++ b/gl/lib/tempname.h
@@ -1,6 +1,6 @@
 /* Create a temporary file or directory.

-   Copyright (C) 2006, 2007 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/xfreopen.c
+++ b/gl/lib/xfreopen.c
@@ -1,5 +1,5 @@
 /* a wrapper for frepoen
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   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
--- a/gl/m4/mgetgroups.m4
+++ b/gl/m4/mgetgroups.m4
@@ -1,5 +1,5 @@
 #serial 3
-dnl Copyright (C) 2007-2008 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/gl/m4/root-dev-ino.m4
+++ b/gl/m4/root-dev-ino.m4
@@ -1,5 +1,5 @@
 #serial 3
-dnl Copyright (C) 2005, 2006 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/argv-iter
+++ b/gl/modules/argv-iter
@@ -1,24 +0,0 @@
-Description:
-iterate through argv or a --files0-from=-specified file
-
-Files:
-lib/argv-iter.c
-lib/argv-iter.h
-
-Depends-on:
-getdelim
-stdbool
-
-configure.ac:
-
-Makefile.am:
-lib_SOURCES += argv-iter.c argv-iter.h
-
-Include:
-"argv-iter.h"
-
-License
-GPL
-
-Maintainer:
-Jim Meyering
--- a/gl/modules/argv-iter-tests
+++ b/gl/modules/argv-iter-tests
@@ -1,10 +0,0 @@
-Files:
-tests/test-argv-iter.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-argv-iter
-check_PROGRAMS += test-argv-iter
--- a/gl/modules/selinux-at
+++ b/gl/modules/selinux-at
@@ -1,33 +0,0 @@
-Description:
-openat-style fd-relative functions for SE Linux
-
-Files:
-lib/selinux-at.c
-lib/selinux-at.h
-
-Depends-on:
-selinux-h
-
-configure.ac:
-# FIXME: put this in an .m4 file?
-# For runcon.
-AC_CHECK_HEADERS([selinux/flask.h])
-AC_LIBOBJ([selinux-at])
-gl_save_LIBS=$LIBS
-  LIB_SELINUX=
-  AC_SEARCH_LIBS([setfilecon], [selinux],
-                 [test "$ac_cv_search_setfilecon" = "none required" ||
-                  LIB_SELINUX=$ac_cv_search_setfilecon])
-  AC_SUBST(LIB_SELINUX)
-LIBS=$gl_save_LIBS
-
-Makefile.am:
-
-Include:
-selinux-at.h
-
-License:
-LGPL
-
-Maintainer:
-Jim Meyering
--- a/gl/tests/test-argv-iter.c
+++ b/gl/tests/test-argv-iter.c
@@ -1,120 +0,0 @@
-/* Test argv iterator
-   Copyright (C) 2008 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/>.  */
-
-/* Written by Jim Meyering.  */
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
-
-#include "argv-iter.h"
-
-static FILE *
-write_nul_delimited_argv (char **argv)
-{
-  FILE *fp = tmpfile ();
-  ASSERT (fp);
-  while (*argv)
-    {
-      size_t len = strlen (*argv) + 1;
-      ASSERT (fwrite (*argv, len, 1, fp) == 1);
-      argv++;
-    }
-  ASSERT (fflush (fp) == 0);
-  rewind (fp);
-  return fp;
-}
-
-int
-main ()
-{
-  /* set_program_name (argv[0]); placate overzealous "syntax-check" test.  */
-  static char *av[][4] = {
-    {NULL},
-    {"1", NULL},
-    {"1", "2", NULL},
-    {"1", "2", "3", NULL}
-  };
-
-  int use_stream;
-  for (use_stream = 0; use_stream < 2; use_stream++)
-    {
-      size_t i;
-      for (i = 0; i < ARRAY_CARDINALITY (av); i++)
-        {
-          FILE *fp;
-          struct argv_iterator *ai;
-          size_t n_found = 0;
-          if (use_stream)
-            {
-              /* Generate an identical list to be read via FP.  */
-              ASSERT ((fp = write_nul_delimited_argv (av[i])) != NULL);
-              ai = argv_iter_init_stream (fp);
-            }
-          else
-            {
-              fp = NULL;
-              ai = argv_iter_init_argv (av[i]);
-            }
-          ASSERT (ai);
-
-          while (1)
-            {
-              enum argv_iter_err ai_err;
-              char *s = argv_iter (ai, &ai_err);
-              ASSERT ((i == n_found) == (ai_err == AI_ERR_EOF));
-              ASSERT ((s == NULL) ^ (ai_err == AI_ERR_OK));
-              ASSERT (ai_err == AI_ERR_OK || ai_err == AI_ERR_EOF);
-              if (ai_err == AI_ERR_OK)
-                ++n_found;
-              if (ai_err == AI_ERR_EOF)
-                break;
-              /* In stream mode, the strings are equal, but
-                 in argv mode the actual pointers are equal.  */
-              ASSERT (use_stream
-                      ? STREQ (s, av[i][n_found - 1])
-                      : s == av[i][n_found - 1]);
-            }
-          ASSERT (argv_iter_n_args (ai) == i);
-          argv_iter_free (ai);
-          if (fp)
-            ASSERT (fclose (fp) == 0);
-        }
-    }
-
-  return 0;
-}
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- * End:
- */
--- a/2
+++ b/2
--- a/lib/ChangeLog-2007
+++ b/lib/ChangeLog-2007
@@ -8746,8 +8746,7 @@

 	-----

-	Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 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/TODO
+++ b/lib/TODO
@@ -1,40 +0,0 @@
-Things to do to hash.c:
-
-Always use curly braces around statements in if/else/while/do/etc.
-that span more than a line -- even around multiline simple statements
-or single-line simple statements preceded by a comment line.
-
-Never have lines longer than 80 chars.
-
-Remove ^L characters.  We don't want/need such crutches.
-Get a good (smart) pagination filter.  I have one (a perl script)
-that usually does a decent job for me -- I called it something
-like stdc-print and think I sent you an early verison.
-
-I don't like the name `cursor'.  I much prefer short names
-like `p' for index variables.  I doubt I'll change all of them,
-but thought you should know why some will probably end up changing.
-
-#define USE_OBSTACK somewhere
-
-Fix this comment.  Depending on system and application...
-Mention fragmentation.
-  +#if USE_OBSTACK
-  +    /* Whenever obstacks are used, it is possible to allocate all overflowed
-  +       entries into a single stack, so they all can be freed in a single
-  +       operation.  It is not clear if the speedup is worth the trouble.  */
-  +    struct obstack entry_stack;
-  +#endif
-
-
-assert (bucket_limit - bucket == n_buckets) ?
-
-remove.c: s/done/successful or ok
-
-
-----
-Copyright (C) 1998 Free Software Foundation, Inc.
-
-Copying and distribution of this file, with or without
-modification, are permitted provided the copyright notice
-and this notice are preserved.
--- 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 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 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/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 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 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/fdopendir-glibc.c
+++ b/lib/fdopendir-glibc.c
@@ -1,6 +1,6 @@
 /* fdopendir implementation derived from glibc.

-   Copyright (C) 2006 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/memxfrm.c
+++ b/lib/memxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

-   Copyright (C) 2006 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 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, 1992, 1993, 1995, 1996, 1998, 1999, 2000,
-   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   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 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 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 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
--- a/lib/xmemxfrm.c
+++ b/lib/xmemxfrm.c
@@ -1,6 +1,6 @@
 /* Locale-specific memory transformation

-   Copyright (C) 2006 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
@@ -5005,7 +5005,7 @@
 	-----

 	Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-	2005, 2006 Free Software Foundation, Inc.
+	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,7 +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 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 24
 # Check declarations for this package.

-dnl Copyright (C) 1997-2001, 2003-2006, 2008
-dnl Free Software Foundation, 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,
--- a/m4/euidaccess-stat.m4
+++ b/m4/euidaccess-stat.m4
@@ -1,5 +1,5 @@
 # serial 1
-dnl Copyright (C) 2005 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 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 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,
--- a/m4/include-exclude-prog.m4
+++ b/m4/include-exclude-prog.m4
@@ -1,5 +1,5 @@
 #serial 2
-dnl Copyright (C) 2007 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
@@ -47,11 +47,30 @@ AC_DEFUN([coreutils_MACROS],
  AC_CHECK_FUNCS_ONCE([directio])

  # Used by install.c.
-  AC_CHECK_FUNCS_ONCE([matchpathcon_init_prefix])
+  coreutils_saved_libs=$LIBS
+    LIBS="$LIBS $LIB_SELINUX"
+    AC_CHECK_FUNCS([matchpathcon_init_prefix], [],
+    [
+      case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in
+	no:*) # SELinux disabled
+	  ;;
+	*:no) # SELinux disabled
+	  ;;
+	*)
+	AC_MSG_WARN([SELinux enabled, but matchpathcon_init_prefix not found])
+	AC_MSG_WARN([The install utility may run slowly])
+      esac
+    ])
+  LIBS=$coreutils_saved_libs

  # Used by sort.c.
  AC_CHECK_FUNCS_ONCE([nl_langinfo])

+  # Used by tail.c.
+  AC_CHECK_FUNCS([inotify_init],
+    [AC_DEFINE([HAVE_INOTIFY], [1],
+     [Define to 1 if you have usable inotify support.])])
+
  AC_CHECK_FUNCS_ONCE( \
    endgrent \
    endpwent \
@@ -70,6 +89,9 @@ AC_DEFUN([coreutils_MACROS],
    tcgetpgrp \
  )

+  # for cp.c
+  AC_CHECK_FUNCS_ONCE([utimensat])
+
  dnl This can't use AC_REQUIRE; I'm not quite sure why.
  cu_PREREQ_STAT_PROG

--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -2,7 +2,7 @@

 dnl Misc lib-related macros for coreutils.

-# Copyright (C) 1993-1997, 2000-2001, 2003-2006, 2008
+# 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
--- a/m4/memxfrm.m4
+++ b/m4/memxfrm.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 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/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 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 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/xfts.m4
+++ b/m4/xfts.m4
@@ -1,5 +1,5 @@
 #serial 1
-dnl Copyright (C) 2005 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
@@ -72,6 +72,7 @@ sleep.1
 sort.1
 split.1
 stat.1
+stdbuf.1
 stty.1
 su.1
 sum.1
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -105,6 +105,7 @@ sleep.1:	$(common_dep)	$(srcdir)/sleep.x	../src/sleep.c
 sort.1:		$(common_dep)	$(srcdir)/sort.x	../src/sort.c
 split.1:	$(common_dep)	$(srcdir)/split.x	../src/split.c
 stat.1:		$(common_dep)	$(srcdir)/stat.x	../src/stat.c
+stdbuf.1:	$(common_dep)	$(srcdir)/stdbuf.x	../src/stdbuf.c
 stty.1:		$(common_dep)	$(srcdir)/stty.x	../src/stty.c
 su.1:		$(common_dep)	$(srcdir)/su.x		../src/su.c
 sum.1:		$(common_dep)	$(srcdir)/sum.x		../src/sum.c
@@ -148,14 +149,14 @@ mapped_name = `echo $*|sed 's/^install$$/ginstall/; s/^test$$/[/'`
 # That is necessary to avoid failures for programs that are also shell built-in
 # functions like echo, false, printf, pwd.
 .x.1:
-	@case '$(PERL)' in					\
+	$(AM_V_GEN)case '$(PERL)' in				\
 	  *"/missing "*)					\
 	    echo 'WARNING: cannot update man page $@ since perl is missing' \
-	      'or inadequate' 1>&2 \
+	      'or inadequate' 1>&2				\
 	    ;;							\
 	  *)							\
-	    rm -f $@						\
-	    && { echo "Updating man page $@";			\
+	    rm -f $@ $@-t					\
+	    && {						\
 		 rm -rf $t;					\
 		 mkdir $t;					\
 		 (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
@@ -164,8 +165,11 @@ mapped_name = `echo $*|sed 's/^install$$/ginstall/; s/^test$$/[/'`
 		     --include=$(srcdir)/$*.x			\
 		     --output=$t/$@ $t/$*;			\
 	       }						\
-	    && sed 's|$*\.td/||g' $t/$@ > $@			\
-	    && rm -rf $t ;;					\
+	    && sed 's|$*\.td/||g' $t/$@ > $@-t			\
+	    && rm -rf $t					\
+	    && chmod -w $@-t					\
+	    && mv $@-t $@					\
+	    ;;							\
 	esac

 distcheck-hook: check-x-vs-1 check-programs-vs-x
@@ -181,8 +185,8 @@ ASSORT = LC_ALL=C sort
 # add them here manually.
 .PHONY: check-x-vs-1
 check-x-vs-1:
-	PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;		\
-	t=ls-files.$$$$;						\
+	$(AM_V_GEN)PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;	\
+	t=$@-t;								\
 	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
 	(echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT)		\
 	  | tr -s ' ' '\n' | sed 's/\.1$$//')				\
@@ -195,7 +199,7 @@ all_programs =								\

 .PHONY: check-programs-vs-x
 check-programs-vs-x:
-	status=0;					\
+	$(AM_V_GEN)status=0;				\
 	for p in dummy `$(all_programs)`; do		\
 	  test $$p = dummy && continue;			\
 	  test $$p = ginstall && p=install || : ;	\
--- a/man/chmod.x
+++ b/man/chmod.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006, 2007 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,4 +1,4 @@
-'\" Copyright (C) 1998, 1999, 2001, 2006 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/comm.x
+++ b/man/comm.x
@@ -2,3 +2,5 @@
 comm \- compare two sorted files line by line
 [DESCRIPTION]
 .\" Add any additional description here
+[SEE ALSO]
+join(1), uniq(1)
--- a/man/df.x
+++ b/man/df.x
@@ -1,4 +1,4 @@
-'\" Copyright (C) 1998, 1999, 2004 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, 1999, 2000, 2002 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/join.x
+++ b/man/join.x
@@ -2,3 +2,5 @@
 join \- join lines of two files on a common field
 [DESCRIPTION]
 .\" Add any additional description here
+[SEE ALSO]
+comm(1), uniq(1)
--- a/man/readlink.x
+++ b/man/readlink.x
@@ -1,5 +1,5 @@
 [NAME]
-readlink \- display value of a symbolic link
+readlink \- print value of a symbolic link or canonical file name
 [DESCRIPTION]
 .\" Add any additional description here
 [SEE ALSO]
--- a/man/rm.x
+++ b/man/rm.x
@@ -1,5 +1,5 @@
-'\" Copyright (C) 1998, 1999, 2001, 2003, 2004, 2006 Free Software
-'\" Foundation, Inc.
+'\" Copyright (C) 1998, 1999, 2001, 2003, 2004,
+'\" 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/stdbuf.x
+++ b/man/stdbuf.x
@@ -0,0 +1,16 @@
+'\" Copyright (C) 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>.
+'\" There is NO WARRANTY, to the extent permitted by law.
+[NAME]
+stdbuf \- Run COMMAND, with modified buffering operations for its standard streams.
+[DESCRIPTION]
+.\" Add any additional description here
+[EXAMPLES]
+.B tail -f access.log | stdbuf -oL cut -d \(aq \(aq -f1 | uniq
+.br
+This will immedidately display unique entries from access.log
+[BUGS]
+On GLIBC platforms, specifying a buffer size, i.e. using fully buffered mode
+will result in undefined operation.
--- a/man/uniq.x
+++ b/man/uniq.x
@@ -2,3 +2,5 @@
 uniq \- report or omit repeated lines
 [DESCRIPTION]
 .\" Add any additional description here
+[SEE ALSO]
+comm(1), join(1)
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -8390,8 +8390,7 @@

 	-----

-	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006 Free Software
-	Foundation, Inc.
+	Copyright (C) 1998-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/fileutils/NEWS
+++ b/old/fileutils/NEWS
@@ -750,7 +750,7 @@ Major changes in release 3.3:
 ========================================================================

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003 Free Software Foundation, Inc.
+2001, 2002, 2003, 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
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -274,7 +274,7 @@ Major changes in release 1.7:
 ========================================================================

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003 Free Software Foundation, Inc.
+2001, 2002, 2003, 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
--- a/old/textutils/ChangeLog
+++ b/old/textutils/ChangeLog
@@ -8745,8 +8745,7 @@ Sat Dec 16 15:15:50 1989  David J. MacKenzie  (djm at hobbes.ai.mit.edu)

 	-----

-	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006 Free Software
-	Foundation, Inc.
+	Copyright (C) 1998-2009 Free Software Foundation, Inc.

 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
--- a/old/textutils/NEWS
+++ b/old/textutils/NEWS
@@ -462,7 +462,7 @@ Major changes in release 1.4:
 ========================================================================

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2006 Free Software Foundation, Inc.
+2001, 2002, 2006, 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
--- a/po/ChangeLog-2007
+++ b/po/ChangeLog-2007
@@ -246,8 +246,7 @@

 	-----

-	Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 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/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,6 +73,7 @@ src/id.c
 src/install.c
 src/join.c
 src/kill.c
+src/libstdbuf.c
 src/link.c
 src/ln.c
 src/logname.c
@@ -109,6 +110,7 @@ src/sleep.c
 src/sort.c
 src/split.c
 src/stat.c
+src/stdbuf.c
 src/stty.c
 src/su.c
 src/sum.c
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -40,6 +40,7 @@ hostname
 id
 join
 kill
+libstdbuf.so
 libver.a
 link
 ln
@@ -81,6 +82,7 @@ sleep
 sort
 split
 stat
+stdbuf
 stty
 su
 sum
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ no_install__progs = \
  arch hostname su

 build_if_possible__progs = \
-  chroot df hostid nice pinky stty su uname uptime users who
+  chroot df hostid nice pinky stdbuf libstdbuf.so stty su uname uptime users who

 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)

@@ -48,6 +48,8 @@ bin_PROGRAMS = $(OPTIONAL_BIN_PROGS)

 noinst_PROGRAMS = setuidgid getlimits

+pkglib_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS)
+
 noinst_HEADERS = \
  chown-core.h \
  copy.h \
@@ -70,7 +72,7 @@ BUILT_SOURCES =
 CLEANFILES = $(SCRIPTS) su

 # Also remove these sometimes-built programs.
-# For example, even when excluded, they're built via check-AUTHORS.
+# For example, even when excluded, they're built via sc_check-AUTHORS.
 CLEANFILES += $(no_install__progs)

 AM_CPPFLAGS = -I$(top_srcdir)/lib
@@ -91,6 +93,7 @@ du_LDADD = $(LDADD)
 getlimits_LDADD = $(LDADD)
 ptx_LDADD = $(LDADD)
 split_LDADD = $(LDADD)
+stdbuf_LDADD = $(LDADD)
 timeout_LDADD = $(LDADD)
 truncate_LDADD = $(LDADD)

@@ -170,6 +173,7 @@ du_LDADD += $(LIBICONV)
 getlimits_LDADD += $(LIBICONV)
 ptx_LDADD += $(LIBICONV)
 split_LDADD += $(LIBICONV)
+stdbuf_LDADD += $(LIBICONV)
 timeout_LDADD += $(LIBICONV)
 truncate_LDADD += $(LIBICONV)

@@ -286,6 +290,16 @@ sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS)

 ginstall_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS)

+# Ensure we don't link against libcoreutils.a as that lib is
+# not compiled with -fPIC which causes issues on 64 bit at least
+libstdbuf_so_LDADD =
+
+# Note libstdbuf is only compiled if GCC is available
+# (as per the check in configure.ac), so these flags should be available.
+# libtool is probably required to relax this dependency.
+libstdbuf_so_LDFLAGS = -shared
+libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS)
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g'

 BUILT_SOURCES += dircolors.h
@@ -359,16 +373,22 @@ all_programs.list:
 	@echo $(all_programs) | tr ' ' '\n' | sed -e 's,$(EXEEXT)$$,,' \
 	  | $(ASSORT) -u

+# This is required because we have broken inter-directory dependencies:
+# in order to generate all man pages, even those for which we don't
+# install a binary, require that all programs be built at distribution time.
+dist-hook: $(all_programs)
+
 pm = progs-makefile
 pr = progs-readme
 # Ensure that the list of programs in README matches the list
 # of programs we can build.
-check: check-README check-duplicate-no-install check-AUTHORS
+check: check-README check-duplicate-no-install
 .PHONY: check-README
 check-README:
 	rm -rf $(pr) $(pm)
 	echo $(all_programs) \
 	 | tr -s ' ' '\n' | sed -e 's,$(EXEEXT)$$,,;s/ginstall/install/' \
+	 | sed /libstdbuf/d \
 	 | $(ASSORT) -u > $(pm) && \
 	sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \
 	  | sed -n '/^   */s///p' | tr -s ' ' '\n' > $(pr)
@@ -386,14 +406,15 @@ check-duplicate-no-install: tr
 # translation inhibits printing of UTF-8 names, just skip this test.
 au_dotdot = authors-dotdot
 au_actual = authors-actual
-.PHONY: check-AUTHORS
-check-AUTHORS: $(all_programs)
+.PHONY: sc_check-AUTHORS
+sc_check-AUTHORS: $(all_programs)
 	$(AM_V_GEN)locale=en_US.UTF-8;			\
 	LC_ALL="$$locale" ./cat --version		\
 	    | grep ' Torbjorn '	> /dev/null		\
 	  && { echo "$@: skipping this check"; exit 0; }; \
 	rm -f $(au_actual) $(au_dotdot);		\
 	for i in `ls $(all_programs) | sed -e 's,$(EXEEXT)$$,,' \
+	    | sed /libstdbuf/d				\
 	    | $(ASSORT) -u`; do				\
 	  test "$$i" = '[' && continue;			\
 	  exe=$$i;					\
@@ -416,7 +437,9 @@ check-AUTHORS: $(all_programs)
 # Most functions in src/*.c should have static scope.
 # Any that don't must be marked with `extern', but `main'
 # and `usage' are exceptions.  They're always extern, but
-# don't need to be marked.
+# don't need to be marked. Also functions starting with __
+# are exempted due to possibly being added by the compiler
+# (when compiled as a shared library for example).
 #
 # The second nm|grep checks for file-scope variables with `extern' scope.
 .PHONY: sc_tight_scope
@@ -427,7 +450,7 @@ sc_tight_scope: $(bin_PROGRAMS)
 	       test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;	\
 	hdr=`for f in $(noinst_HEADERS); do				\
 	       test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`;	\
-	( printf 'main\nusage\n';					\
+	( printf 'main\nusage\n_.*\n';					\
 	  grep -h -A1 '^extern .*[^;]$$' $$src				\
 	    | grep -vE '^(extern |--)' | sed 's/ .*//';			\
 	  perl -ne '/^extern \S+ (\S*) \(/ and print "$$1\n"' $$hdr;	\
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
 /* Base64 encode/decode strings or files.
-   Copyright (C) 2004-2008 Free Software Foundation, Inc.
+   Copyright (C) 2004-2009 Free Software Foundation, Inc.

   This file is part of Base64.

--- a/src/basename.c
+++ b/src/basename.c
@@ -1,5 +1,5 @@
 /* basename -- strip directory and suffix from file names
-   Copyright (C) 1990-1997, 1999-2008 Free Software Foundation, Inc.
+   Copyright (C) 1990-1997, 1999-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/src/chcon.c
+++ b/src/chcon.c
@@ -1,5 +1,5 @@
 /* chcon -- change security context of files
-   Copyright (C) 2005-2008 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/Show More
+++ b/Show More
@@ -1 +1 @@
 .3
 .4