X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftmpfile-safer.c;h=2320f5d7345ec514141a8136faf334c88c43ac7f;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=cd8dddf4cfa70ef14df900d950af697d82935f4e;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git

diff --git a/lib/tmpfile-safer.c b/lib/tmpfile-safer.c
index cd8dddf4c..2320f5d73 100644
--- a/lib/tmpfile-safer.c
+++ b/lib/tmpfile-safer.c
@@ -1,10 +1,10 @@
 /* Invoke tmpfile, but avoid some glitches.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc.
 
-   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 +12,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/>.  */
 
 /* Written by Eric Blake, based on ideas from Paul Eggert.  */
 
@@ -27,10 +26,6 @@
 
 #include "binary-io.h"
 
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
 /* Like tmpfile, but do not return stdin, stdout, or stderr.
 
    Remember that tmpfile can leave files behind if your program calls _exit,
@@ -46,28 +41,28 @@ tmpfile_safer (void)
       int fd = fileno (fp);
 
       if (0 <= fd && fd <= STDERR_FILENO)
-	{
-	  int f = dup_safer (fd);
-
-	  if (f < 0)
-	    {
-	      int e = errno;
-	      fclose (fp);
-	      errno = e;
-	      return NULL;
-	    }
-
-	  /* Keep the temporary file in binary mode, on platforms
-	     where that matters.  */
-	  if (fclose (fp) != 0
-	      || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+")))
-	    {
-	      int e = errno;
-	      close (f);
-	      errno = e;
-	      return NULL;
-	    }
-	}
+        {
+          int f = dup_safer (fd);
+
+          if (f < 0)
+            {
+              int e = errno;
+              fclose (fp);
+              errno = e;
+              return NULL;
+            }
+
+          /* Keep the temporary file in binary mode, on platforms
+             where that matters.  */
+          if (fclose (fp) != 0
+              || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+")))
+            {
+              int e = errno;
+              close (f);
+              errno = e;
+              return NULL;
+            }
+        }
     }
 
   return fp;