X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fopen-safer.c;h=e8c6a1fd6c6b2065a37a6d12ef2b4bb3d1276742;hb=a6b16b69fe1cad695b270dd5bf3deb2850fc4dd1;hp=d3ba894ac7bc0be60822184e7e7b4cf85d09a335;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git

diff --git a/lib/open-safer.c b/lib/open-safer.c
index d3ba894ac..e8c6a1fd6 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-2011 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 <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fcntl-safer.h"
 
@@ -37,12 +35,9 @@ open_safer (char const *file, int flags, ...)
       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.  */
-      mode = (sizeof (mode_t) < sizeof (int)
-	      ? va_arg (ap, int)
-	      : va_arg (ap, mode_t));
+      /* 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);
 
       va_end (ap);
     }