Re: Fwd: basename/dirname // patch resubmit

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Jim Meyering on 3/26/2006 7:08 AM:
> I've applied that.  Thank you.
> 
> Some minor changes I made in the process:
>   - spell `file names' with a space so `make check' passes.
>   - use a macro to avoid duplicating the two paragraphs shared
>       by the basename and dirname sections in coreutils.texi

Your macro was a good idea, but overbroad, and needs this followup patch.
 Also, I noticed a couple of conflicts with copyright dates - for example,
in lib/dirname.h, where my patch spelled out "2003, 2004, 2005, 2006"
according to GNU coding standards, you changed it to "2003-2006".  Is this
worth making consistent to coding standards, at least in the files that
will be synced back to gnulib?

> 
> Regarding your cp.c change, I've adjusted it to do what your
> ChangeLog entry suggests you intended.

Thanks for catching that.

2006-03-27  Eric Blake  <address@hidden>

        * coreutils.texi (dirname invocation): Macro in previous patch
        was too broad.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEJ+7j84KuGfSFAYARAh/BAKCn8PwZ7LcahPjjOeLOs4Ovv4sB4ACfZ0sR
sTs9y7v+104OE/CyLlQXFSc=
=Ad2z
-----END PGP SIGNATURE-----

Index: doc/coreutils.texi
===================================================================
RCS file: /sources/coreutils/coreutils/doc/coreutils.texi,v
retrieving revision 1.318
diff -u -p -r1.318 coreutils.texi
--- doc/coreutils.texi  26 Mar 2006 12:11:40 -0000      1.318
+++ doc/coreutils.texi  27 Mar 2006 13:46:58 -0000
@@ -10599,14 +10599,14 @@ Together, @command{basename} and @comman
 that if @samp{ls "$name"} succeeds, then the command sequence @samp{cd
 "$(dirname "$name")"; ls "$(basename "$name")"} will, too.  This works
 for everything except file names containing a trailing newline.
address@hidden macro
address@hidden
 
 @acronym{POSIX} allows the implementation to define the results if
 @var{name} is empty or @samp{//}.  In the former case, @acronym{GNU}
 @command{basename} returns the empty string.  In the latter case, the
 result is @samp{//} on platforms where @var{//} is distinct from
 @var{/}, and @samp{/} on platforms where there is no difference.
address@hidden macro
address@hidden
 
 The only options are @option{--help} and @option{--version}.  @xref{Common
 options}.  Options must precede operands.
@@ -10644,6 +10644,11 @@ If @var{name} is a single component, @co
 
 @basenameAndDirname
 
address@hidden allows the implementation to define the results if
address@hidden is @samp{//}.  With @acronym{GNU} @command{dirname}, the
+result is @samp{//} on platforms where @var{//} is distinct from
address@hidden/}, and @samp{/} on platforms where there is no difference.
+
 The only options are @option{--help} and @option{--version}.  @xref{Common
 options}.