X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftmpdir.c;h=5590ac3babfe2e5b5474dbcc3d34ef00be46a3a3;hb=6b66ce308dae8448f02da645a9fd8fb992349f06;hp=d29a00578996e8903785cb13e69f5027e08d0352;hpb=81a77bddc1480a21aa73bf3a257de3c33964aef2;p=gnulib.git

diff --git a/lib/tmpdir.c b/lib/tmpdir.c
index d29a00578..5590ac3ba 100644
--- a/lib/tmpdir.c
+++ b/lib/tmpdir.c
@@ -1,10 +1,11 @@
-/* Copyright (C) 1999, 2001-2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001-2002, 2006, 2009-2011 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from sysdeps/posix/tempname.c.  */
 
@@ -77,7 +77,7 @@ direxists (const char *dir)
    enough space in TMPL. */
 int
 path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
-	     bool try_tmpdir)
+             bool try_tmpdir)
 {
   const char *d;
   size_t dlen, plen;
@@ -91,35 +91,35 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
     {
       plen = strlen (pfx);
       if (plen > 5)
-	plen = 5;
+        plen = 5;
     }
 
   if (try_tmpdir)
     {
       d = __secure_getenv ("TMPDIR");
       if (d != NULL && direxists (d))
-	dir = d;
+        dir = d;
       else if (dir != NULL && direxists (dir))
-	/* nothing */ ;
+        /* nothing */ ;
       else
-	dir = NULL;
+        dir = NULL;
     }
   if (dir == NULL)
     {
       if (direxists (P_tmpdir))
-	dir = P_tmpdir;
+        dir = P_tmpdir;
       else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
-	dir = "/tmp";
+        dir = "/tmp";
       else
-	{
-	  __set_errno (ENOENT);
-	  return -1;
-	}
+        {
+          __set_errno (ENOENT);
+          return -1;
+        }
     }
 
   dlen = strlen (dir);
   while (dlen >= 1 && ISSLASH (dir[dlen - 1]))
-    dlen--;			/* remove trailing slashes */
+    dlen--;                     /* remove trailing slashes */
 
   /* check we have room for "${dir}/${pfx}XXXXXX\0" */
   if (tmpl_len < dlen + 1 + plen + 6 + 1)