Mercurial > hg > octave-lyh > gnulib-hg
changeset 4873:8b1923c943a6
On systems without utime and without a utimes function capable of
dealing with a NULL struct utimbuf* argument, this utime replacement
could -- in unusual circumstances -- leak a file descriptor.
Include <unistd.h> and <errno.h>.
(utime_null): Be sure to close `fd' and to preserve errno.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Mon, 17 Nov 2003 16:16:00 +0000 |
parents | c5afc99b8ce5 |
children | 310bf22ff300 |
files | lib/utime.c |
diffstat | 1 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/utime.c +++ b/lib/utime.c @@ -32,6 +32,12 @@ # include <fcntl.h> #endif +#include <unistd.h> +#include <errno.h> +#ifndef errno +extern int errno; +#endif + #include "full-write.h" #include "safe-read.h" @@ -59,6 +65,7 @@ char c; int status = 0; struct stat st; + int saved_errno = 0; fd = open (file, O_RDWR); if (fd < 0 @@ -70,9 +77,23 @@ of patches, but that system doesn't use this code: it has utimes. || fsync (fd) < 0 */ - || (st.st_size == 0 && ftruncate (fd, st.st_size) < 0) - || close (fd) < 0) - status = -1; + || (st.st_size == 0 && ftruncate (fd, st.st_size) < 0)) + { + saved_errno = errno; + status = -1; + } + + if (0 <= fd) + { + if (close (fd) < 0) + status = -1; + + /* If there was a prior failure, use the saved errno value. + But if the only failure was in the close, don't change errno. */ + if (saved_errno) + errno = saved_errno; + } + return status; #endif }