projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...
[gnulib.git]
/
lib
/
fopen-safer.c
diff --git
a/lib/fopen-safer.c
b/lib/fopen-safer.c
index
6825f9b
..
3c9e286
100644
(file)
--- a/
lib/fopen-safer.c
+++ b/
lib/fopen-safer.c
@@
-1,10
+1,11
@@
/* Invoke fopen, but avoid some glitches.
/* 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
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
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
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 <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <unistd-safer.h>
+#include <config.h>
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
+#include "stdio-safer.h"
#include <errno.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#include <stdio.h>
-#include <stdio-safer.h>
+#include <unistd.h>
+#include "unistd-safer.h"
/* Like fopen, but do not return stdin, stdout, or stderr. */
/* 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 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;
}
return fp;