X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffopen-safer.c;h=c0a1f16b763a20912568c3386e89d94031e09937;hb=0e9ef9b9c9cd7036960656c797f0567b742e7b80;hp=9c799223715fd436f8d90b5b729f0f39c0f9e9c9;hpb=ae5dae6fd1caa993e969b869e42820a119385cbc;p=gnulib.git diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c index 9c7992237..c0a1f16b7 100644 --- a/lib/fopen-safer.c +++ b/lib/fopen-safer.c @@ -1,7 +1,6 @@ /* Invoke fopen, but avoid some glitches. - Copyright (C) 2001, 2004, 2005, 2006, 2009 Free Software - Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-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 @@ -38,26 +37,26 @@ fopen_safer (char const *file, char const *mode) int fd = fileno (fp); if (0 <= fd && fd <= STDERR_FILENO) - { - int f = dup_safer (fd); - - if (f < 0) - { - int e = errno; - fclose (fp); - errno = e; - return NULL; - } - - if (fclose (fp) != 0 - || ! (fp = fdopen (f, mode))) - { - int e = errno; - close (f); - errno = e; - return NULL; - } - } + { + int f = dup_safer (fd); + + if (f < 0) + { + int e = errno; + fclose (fp); + errno = e; + return NULL; + } + + if (fclose (fp) != 0 + || ! (fp = fdopen (f, mode))) + { + int e = errno; + close (f); + errno = e; + return NULL; + } + } } return fp;