]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
build: update gnulib submodule to latest; adapt a patch
authorJim Meyering <meyering@redhat.com>
Fri, 11 Dec 2009 18:18:04 +0000 (19:18 +0100)
committerJim Meyering <meyering@redhat.com>
Fri, 11 Dec 2009 18:30:59 +0000 (19:30 +0100)
* 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
gnulib

index 8ffc5069295d45fea70a488f2ed75e3461a50e5a..1bf111963ed082383262df5495f89a7d0c6fd286 100644 (file)
@@ -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 63983c0aac914c1a585cb6a7d0b16dc170b6ee3e..a3984e06bca84a7654624dd754a7c4c7a5a39a59 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 63983c0aac914c1a585cb6a7d0b16dc170b6ee3e
+Subproject commit a3984e06bca84a7654624dd754a7c4c7a5a39a59