projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strtod: fix bug in replacement function on AIX
[gnulib.git]
/
lib
/
open-safer.c
diff --git
a/lib/open-safer.c
b/lib/open-safer.c
index
ff7f45d
..
3b36471
100644
(file)
--- a/
lib/open-safer.c
+++ b/
lib/open-safer.c
@@
-1,11
+1,11
@@
/* Invoke open, but avoid some glitches.
/* Invoke open, but avoid some glitches.
- Copyright (C) 200
4
Free Software Foundation, Inc.
+ Copyright (C) 200
5-2006, 2008-2010
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
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
@@
-13,63
+13,34
@@
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
+#include <config.h>
-#include
<fcntl-safer.h>
+#include
"fcntl-safer.h"
-#include <unistd-safer.h>
-
-#include <errno.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <stdarg.h>
-
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
-
-/* Like open, but do not return STDIN_FILENO, STDOUT_FILENO, or
- STDERR_FILENO. */
+#include "unistd-safer.h"
int
int
-open_safer (char const *file, int
oflag
, ...)
+open_safer (char const *file, int
flags
, ...)
{
{
- int fd;
mode_t mode = 0;
mode_t mode = 0;
- if (
oflag
& O_CREAT)
+ if (
flags
& O_CREAT)
{
{
- va_list args;
- va_start (args, oflag);
- if (sizeof (int) <= sizeof (mode_t))
- mode = va_arg (args, mode_t);
- else
- mode = va_arg (args, int);
- va_end (args);
- }
+ va_list ap;
+ va_start (ap, flags);
- fd = open (file, oflag, mode);
+ /* We have to use PROMOTED_MODE_T instead of mode_t, otherwise GCC 4
+ creates crashing code when 'mode_t' is smaller than 'int'. */
+ mode = va_arg (ap, PROMOTED_MODE_T);
- if (0 <= fd && fd <= STDERR_FILENO)
- {
- int f = dup_safer (fd);
- int e = errno;
- close (fd);
- errno = e;
- fd = f;
+ va_end (ap);
}
}
- return fd;
+ return fd
_safer (open (file, flags, mode))
;
}
}