Re: [Findutils-patches] [PATCH] bug 20273

[Eric Blake]

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

According to Eric Blake-1 on 6/27/2007 12:10 PM:
> 
> Since this is a bug fix, is it worth backporting this to the 
> 4.2 branch?

Earlier you said this is okay; I still haven't attempted it, because the
branch's use of gnulib is so much further out of date.

> 
> 2007-06-27  Eric Blake  <address@hidden>
> 
>       Fix Savannah bug #20273, xargs -E with seekable stdin.
>       * import-gnulib.config (modules): Sort, add closein.

Here's the followup that fixes find -ok.  OK to apply?

2007-08-20  Eric Blake  <address@hidden>

        Fix for Savannah bug #20273, find -ok with seekable stdin.
        * find/find.c (main): Use close_stdin, not close_stdout.
        * import-gnulib.config (gnulib_version): Pick up yesno tests.
        * NEWS: Document the change.

- --
Don't work too hard, make some time for fun as well!

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

iD8DBQFGyZU084KuGfSFAYARAoxbAJ0b2pZLRgAOztLfFBcU17pYeGGcDgCgi3cs
Uq1fH9pA60rTJe/x4uoCfW8=
=IJRG
-----END PGP SIGNATURE-----

? build-aux/compile
Index: ChangeLog
===================================================================
RCS file: /sources/findutils/findutils/ChangeLog,v
retrieving revision 1.258
diff -u -p -r1.258 ChangeLog
--- ChangeLog   20 Aug 2007 09:51:00 -0000      1.258
+++ ChangeLog   20 Aug 2007 12:42:26 -0000
@@ -1,3 +1,10 @@
+2007-08-20  Eric Blake  <address@hidden>
+
+       Fix for Savannah bug #20273, find -ok with seekable stdin.
+       * find/find.c (main): Use close_stdin, not close_stdout.
+       * import-gnulib.config (gnulib_version): Pick up yesno tests.
+       * NEWS: Document the change.
+
 2007-08-20  James Youngman  <address@hidden>
 
        * doc/find.texi (Directories): Clarify that built commands which
Index: NEWS
===================================================================
RCS file: /sources/findutils/findutils/NEWS,v
retrieving revision 1.201
diff -u -p -r1.201 NEWS
--- NEWS        19 Aug 2007 15:31:38 -0000      1.201
+++ NEWS        20 Aug 2007 12:42:27 -0000
@@ -21,7 +21,8 @@ as well as (correctly) from less than N 
 #20273: When xargs is successful without consuming all of stdin (for
 example, with the -E option), and stdin is seekable, xargs now
 correctly restores the file position, even on platforms where exit()
-does not follow the POSIX rules of doing likewise.
+does not follow the POSIX rules of doing likewise.  Likewise for find
+(for example, with the -ok action).
 
 #20547: The version information printed by find, xargs, locate,
 updatedb, frcode and code now complies with the GNU Project's coding
Index: import-gnulib.config
===================================================================
RCS file: /sources/findutils/findutils/import-gnulib.config,v
retrieving revision 1.23
diff -u -p -r1.23 import-gnulib.config
--- import-gnulib.config        22 Jul 2007 13:08:21 -0000      1.23
+++ import-gnulib.config        20 Aug 2007 12:42:27 -0000
@@ -1,7 +1,7 @@
 # findutils gnulib.config -*- sh -*-
 
 # What version of gnulib to use?
-gnulib_version="2007-07-07"
+gnulib_version="2007-08-20"
 
 destdir="gnulib"
 
Index: find/find.c
===================================================================
RCS file: /sources/findutils/findutils/find/find.c,v
retrieving revision 1.123
diff -u -p -r1.123 find.c
--- find/find.c 5 Aug 2007 12:22:13 -0000       1.123
+++ find/find.c 20 Aug 2007 12:42:27 -0000
@@ -44,7 +44,7 @@
 #include "canonicalize.h"
 #include <modetype.h>
 
-#include "closeout.h"
+#include "closein.h"
 #include "savedirinfo.h"
 #include "buildcmd.h"
 #include "dirname.h"
@@ -141,7 +141,7 @@ main (int argc, char **argv)
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-  atexit (close_stdout);
+  atexit (close_stdin);
 
   /* Check for -P, -H or -L options. */
   end_of_leading_options = process_leading_options(argc, argv);