diff options
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 12 | ||||
| -rw-r--r-- | libiberty/make-temp-file.c | 12 | ||||
| -rw-r--r-- | libiberty/mkstemps.c | 7 |
3 files changed, 27 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index bf52f9eb491..fa8abf51415 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,15 @@ +2008-07-31 Jakub Jelinek <jakub@redhat.com> + + * mkstemps.c (mkstemps): Keep looping even for EISDIR. + +2008-07-31 Denys Vlasenko <dvlasenk@redhat.com> + + * mkstemps.c (mkstemps): If open failed with errno other than + EEXIST, return immediately. + * make-temp-file.c: Include errno.h. + (make_temp_file): If mkstemps failed, print an error message + before aborting. + 2008-07-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * maint-tool (deps): Output config.h instead of stamp-h. diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index 5e21414ad8e..94c76d700bd 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA. */ #include <stdio.h> /* May get P_tmpdir. */ #include <sys/types.h> +#include <errno.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -166,11 +167,14 @@ make_temp_file (const char *suffix) strcpy (temp_filename + base_len + TEMP_FILE_LEN, suffix); fd = mkstemps (temp_filename, suffix_len); - /* If mkstemps failed, then something bad is happening. Maybe we should - issue a message about a possible security attack in progress? */ + /* Mkstemps failed. It may be EPERM, ENOSPC etc. */ if (fd == -1) - abort (); - /* Similarly if we can not close the file. */ + { + fprintf (stderr, "Cannot create temporary file in %s: %s\n", + base, strerror (errno)); + abort (); + } + /* We abort on failed close out of sheer paranoia. */ if (close (fd)) abort (); return temp_filename; diff --git a/libiberty/mkstemps.c b/libiberty/mkstemps.c index 6c2e472528b..a0e68a73b49 100644 --- a/libiberty/mkstemps.c +++ b/libiberty/mkstemps.c @@ -127,6 +127,13 @@ mkstemps (char *pattern, int suffix_len) if (fd >= 0) /* The file does not exist. */ return fd; + if (errno != EEXIST +#ifdef EISDIR + && errno != EISDIR +#endif + ) + /* Fatal error (EPERM, ENOSPC etc). Doesn't make sense to loop. */ + break; /* This is a random value. It is only necessary that the next TMP_MAX values generated by adding 7777 to VALUE are different |