X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffopen-safer.c;h=0151182d0851e58912ed7090ec2feedee77fd66e;hb=d0ed135f8b494a0adf869a311c7bdc1d9d03f050;hp=ccaf1219f0446683eedbc2d1ccf1affc9db9c072;hpb=794b55ff3dcebba4518b555161f97ef6524a7270;p=gnulib.git
diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index ccaf1219f..0151182d0 100644
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,10 +1,11 @@
/* Invoke fopen, but avoid some glitches.
- Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2001, 2004-2006, 2009-2010 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
- 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,14 +13,11 @@
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 . */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
#include "stdio-safer.h"
@@ -27,10 +25,6 @@
#include
#include "unistd-safer.h"
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
/* Like fopen, but do not return stdin, stdout, or stderr. */
FILE *
@@ -43,26 +37,26 @@ fopen_safer (char const *file, char const *mode)
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;
- }
-
- if (fclose (fp) != 0
- || ! (fp = fdopen (f, mode)))
- {
- 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;
+ }
+
+ if (fclose (fp) != 0
+ || ! (fp = fdopen (f, mode)))
+ {
+ int e = errno;
+ close (f);
+ errno = e;
+ return NULL;
+ }
+ }
}
return fp;