X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fopen-safer.c;h=15bf6a65d01dda9e563ffc7aed925b54ac7ce0ef;hb=217969cf220de4c0515eccd614de1640c3f46bcf;hp=ff7f45d4481ce41c51b99e978e8bf3e808b41d43;hpb=be1c8adeedf52b5ceee7091a43c1937ea2caaa7d;p=gnulib.git

diff --git a/lib/open-safer.c b/lib/open-safer.c
index ff7f45d44..15bf6a65d 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 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,38 @@
    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.  */
 
-#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>
-
-#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
-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);
+      va_list ap;
+      va_start (ap, flags);
+
+      /* Assume mode_t promotes to int if and only if it is smaller.
+	 This assumption isn't guaranteed by the C standard, but we
+	 don't know of any real-world counterexamples.  */
+      if (sizeof (mode_t) < sizeof (int))
+	mode = va_arg (ap, int);
       else
-	mode = va_arg (args, int);
-      va_end (args);
-    }
-
-  fd = open (file, oflag, mode);
+	mode = va_arg (ap, 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));
 }