X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftmpfile.c;h=52d72e3bb9b7a89e21c50e100a067dba132e1a1f;hb=a918da4d61d28be61a12605c9d35e2cf3966d866;hp=19c8a5e243db425f390c0f56f0d8b3f3b386e305;hpb=031df21c6364b13eda68722c44d7d08e9ce7db39;p=gnulib.git

diff --git a/lib/tmpfile.c b/lib/tmpfile.c
index 19c8a5e24..52d72e3bb 100644
--- a/lib/tmpfile.c
+++ b/lib/tmpfile.c
@@ -1,5 +1,5 @@
 /* Create a temporary file.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2011 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
@@ -52,9 +52,9 @@ supports_delete_on_close ()
       OSVERSIONINFO v;
 
       if (GetVersionEx (&v))
-	known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
+        known = (v.dwPlatformId == VER_PLATFORM_WIN32_NT ? 1 : -1);
       else
-	known = -1;
+        known = -1;
     }
   return (known > 0);
 }
@@ -75,49 +75,49 @@ tmpfile (void)
       char xtemplate[PATH_MAX];
 
       if (path_search (xtemplate, PATH_MAX, dir, NULL, true) >= 0)
-	{
-	  size_t len = strlen (xtemplate);
-	  int o_temporary = (supports_delete_on_close () ? _O_TEMPORARY : 0);
-	  int fd;
-
-	  do
-	    {
-	      memcpy (&xtemplate[len - 6], "XXXXXX", 6);
-	      if (gen_tempname (xtemplate, 0, GT_NOCREATE) < 0)
-		{
-		  fd = -1;
-		  break;
-		}
-
-	      fd = _open (xtemplate,
-			  _O_CREAT | _O_EXCL | o_temporary
-			  | _O_RDWR | _O_BINARY,
-			  _S_IREAD | _S_IWRITE);
-	    }
-	  while (fd < 0 && errno == EEXIST);
-
-	  if (fd >= 0)
-	    {
-	      FILE *fp = _fdopen (fd, "w+b");
-
-	      if (fp != NULL)
-		return fp;
-	      else
-		{
-		  int saved_errno = errno;
-		  _close (fd);
-		  errno = saved_errno;
-		}
-	    }
-	}
+        {
+          size_t len = strlen (xtemplate);
+          int o_temporary = (supports_delete_on_close () ? _O_TEMPORARY : 0);
+          int fd;
+
+          do
+            {
+              memcpy (&xtemplate[len - 6], "XXXXXX", 6);
+              if (gen_tempname (xtemplate, 0, 0, GT_NOCREATE) < 0)
+                {
+                  fd = -1;
+                  break;
+                }
+
+              fd = _open (xtemplate,
+                          _O_CREAT | _O_EXCL | o_temporary
+                          | _O_RDWR | _O_BINARY,
+                          _S_IREAD | _S_IWRITE);
+            }
+          while (fd < 0 && errno == EEXIST);
+
+          if (fd >= 0)
+            {
+              FILE *fp = _fdopen (fd, "w+b");
+
+              if (fp != NULL)
+                return fp;
+              else
+                {
+                  int saved_errno = errno;
+                  _close (fd);
+                  errno = saved_errno;
+                }
+            }
+        }
     }
   else
     {
       if (retval > 0)
-	errno = ENAMETOOLONG;
+        errno = ENAMETOOLONG;
       else
-	/* Ideally this should translate GetLastError () to an errno value.  */
-	errno = ENOENT;
+        /* Ideally this should translate GetLastError () to an errno value.  */
+        errno = ENOENT;
     }
 
   return NULL;