X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fopen-safer.c;h=3b36471f2373bb47973c280915769af4ee5b5071;hb=ab43907148e80f3895280928c05d4be93875580f;hp=ff7f45d4481ce41c51b99e978e8bf3e808b41d43;hpb=be1c8adeedf52b5ceee7091a43c1937ea2caaa7d;p=gnulib.git
diff --git a/lib/open-safer.c b/lib/open-safer.c
index ff7f45d44..3b36471f2 100644
--- a/lib/open-safer.c
+++ b/lib/open-safer.c
@@ -1,11 +1,11 @@
/* Invoke open, but avoid some glitches.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2005-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
- 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
@@ -13,63 +13,34 @@
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
+#include
-#include
+#include "fcntl-safer.h"
-#include
-
-#include
+#include
#include
-
-#if HAVE_FCNTL_H
-# include
-#endif
-
-#if HAVE_UNISTD_H
-# include
-#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
-open_safer (char const *file, int oflag, ...)
+open_safer (char const *file, int flags, ...)
{
- int fd;
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));
}