X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftmpfile-safer.c;h=bee05bc26f991e4d509550da091ac2a26af1c987;hb=8099cad631717c6f59d3b1e149971e243eee796e;hp=e8d05aec367b1efb33cb07016ae216c2012ee868;hpb=ae5dae6fd1caa993e969b869e42820a119385cbc;p=gnulib.git diff --git a/lib/tmpfile-safer.c b/lib/tmpfile-safer.c index e8d05aec3..bee05bc26 100644 --- a/lib/tmpfile-safer.c +++ b/lib/tmpfile-safer.c @@ -1,5 +1,5 @@ /* Invoke tmpfile, but avoid some glitches. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2010 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 @@ -41,28 +41,28 @@ tmpfile_safer (void) 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; - } - - /* Keep the temporary file in binary mode, on platforms - where that matters. */ - if (fclose (fp) != 0 - || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+"))) - { - 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; + } + + /* Keep the temporary file in binary mode, on platforms + where that matters. */ + if (fclose (fp) != 0 + || ! (fp = fdopen (f, O_BINARY ? "wb+" : "w+"))) + { + int e = errno; + close (f); + errno = e; + return NULL; + } + } } return fp;