X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fopen-safer.c;h=15bf6a65d01dda9e563ffc7aed925b54ac7ce0ef;hb=fa3486514bd8f15f8eb4c49821d0356b52e5a335;hp=c7800a3959eb6bbdd225f875d02429c8c99a762b;hpb=d49e12fd465868c5fb45f1cf5cfb701843f9bc69;p=gnulib.git
diff --git a/lib/open-safer.c b/lib/open-safer.c
index c7800a395..15bf6a65d 100644
--- a/lib/open-safer.c
+++ b/lib/open-safer.c
@@ -1,10 +1,11 @@
/* Invoke open, but avoid some glitches.
- Copyright (C) 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2005, 2006, 2008 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,14 +13,11 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
#include "fcntl-safer.h"
@@ -40,9 +38,10 @@ open_safer (char const *file, int 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. */
- mode = (sizeof (mode_t) < sizeof (int)
- ? va_arg (ap, int)
- : va_arg (ap, mode_t));
+ if (sizeof (mode_t) < sizeof (int))
+ mode = va_arg (ap, int);
+ else
+ mode = va_arg (ap, mode_t);
va_end (ap);
}