X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffopen-safer.c;h=3c9e286ab69f155b36792d77abef05e22d039f31;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=6825f9b9f21b4cc5db2d953b73a183c0f7424618;hpb=196a4d4693a1b50eb309df386dfb5a0f72169d88;p=gnulib.git
diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c
index 6825f9b9f..3c9e286ab 100644
--- a/lib/fopen-safer.c
+++ b/lib/fopen-safer.c
@@ -1,10 +1,11 @@
/* Invoke fopen, but avoid some glitches.
- Copyright (C) 2001 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2001, 2004-2006, 2009-2014 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,31 +13,17 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include
-#endif
-
-#if HAVE_UNISTD_H
-# include
-#endif
-#include
+#include
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
+#include "stdio-safer.h"
#include
-#ifndef errno
-extern int errno;
-#endif
-
-#include
-#include
+#include
+#include "unistd-safer.h"
/* Like fopen, but do not return stdin, stdout, or stderr. */
@@ -50,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;