bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] build: update gnulib submodule to latest; adapt a patch


From: Jim Meyering
Subject: [PATCH] build: update gnulib submodule to latest; adapt a patch
Date: Fri, 11 Dec 2009 19:33:07 +0100

Staying in sync with gnulib required a little more work,
this time.  I posted the patch-xform script to bug-gnulib today
and will add it to gnulib's build-aux/ directory soon.

>From 5a514de955684edeb8b8fc27c9338204dd640109 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 11 Dec 2009 19:18:04 +0100
Subject: [PATCH] build: update gnulib submodule to latest; adapt a patch

* gl/lib/tempname.c.diff: Adjust patch to apply to gnulib, now that
most TABs in indentation have been converted to spaces by running
this command: f=tempname.c.diff; patch-xform $f > k && mv k $f
---
 gl/lib/tempname.c.diff |   72 ++++++++++++++++++++++++------------------------
 gnulib                 |    2 +-
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/gl/lib/tempname.c.diff b/gl/lib/tempname.c.diff
index 8ffc506..1bf1119 100644
--- a/gl/lib/tempname.c.diff
+++ b/gl/lib/tempname.c.diff
@@ -127,48 +127,48 @@ index 2da5afe..562955a 100644
 +        XXXXXX[i] = letters[randint_genmax (rand_src, sizeof letters - 2)];

        switch (kind)
-       {
+         {
 @@ -276,7 +271,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int 
kind)
-         break;
-
-       case __GT_NOCREATE:
--        /* This case is backward from the other three.  __gen_tempname
-+        /* This case is backward from the other three.  This function
-            succeeds if __xstat fails because the name does not exist.
-            Note the continue to bypass the common logic at the bottom
-            of the loop.  */
+           break;
+
+         case __GT_NOCREATE:
+-          /* This case is backward from the other three.  __gen_tempname
++          /* This case is backward from the other three.  This function
+              succeeds if __xstat fails because the name does not exist.
+              Note the continue to bypass the common logic at the bottom
+              of the loop.  */
 @@ -285,11 +280,15 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, 
int kind)
-             if (errno == ENOENT)
-               {
-                 __set_errno (save_errno);
--                return 0;
-+                fd = 0;
-+                goto done;
-               }
-             else
--              /* Give up now. */
--              return -1;
-+              {
-+                /* Give up now. */
-+                fd = -1;
-+                goto done;
-+              }
-           }
-         continue;
+               if (errno == ENOENT)
+                 {
+                   __set_errno (save_errno);
+-                  return 0;
++                  fd = 0;
++                  goto done;
+                 }
+               else
+-                /* Give up now. */
+-                return -1;
++                {
++                  /* Give up now. */
++                  fd = -1;
++                  goto done;
++                }
+             }
+           continue;

 @@ -301,13 +300,32 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, 
int kind)
        if (fd >= 0)
-       {
-         __set_errno (save_errno);
--        return fd;
-+        goto done;
-       }
+         {
+           __set_errno (save_errno);
+-          return fd;
++          goto done;
+         }
        else if (errno != EEXIST)
--      return -1;
-+      {
-+        fd = -1;
-+        goto done;
-+      }
+-        return -1;
++        {
++          fd = -1;
++          goto done;
++        }
      }

 +  randint_all_free (rand_src);
diff --git a/gnulib b/gnulib
index 63983c0..a3984e0 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 63983c0aac914c1a585cb6a7d0b16dc170b6ee3e
+Subproject commit a3984e06bca84a7654624dd754a7c4c7a5a39a59
--
1.6.6.rc1.319.g9b57d




reply via email to

[Prev in Thread] Current Thread [Next in Thread]