From 41724e6a1387d9135026dae1a25f912d6f6d8372 Mon Sep 17 00:00:00 2001 From: "Aaron W. LaFramboise" Date: Sat, 30 Oct 2004 10:23:23 -0600 Subject: config.h.in: Regenerate. 2004-10-30 Aaron W. LaFramboise * config.h.in: Regenerate. * configure: Regenerate. * configure.ac (AC_CHECK_FUNCS): Add mkstemp. * io/unix.c (S_IRGRP): Define if undefined. (S_IWGRP): Same. (S_IROTH): Same. (S_IWOTH): Same. (tempfile): Use mktemp if mkstemp missing, fix typos. From-SVN: r89893 --- libgfortran/io/unix.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'libgfortran/io') diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index 03dc66f..45d8cfd 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -54,6 +54,24 @@ Boston, MA 02111-1307, USA. */ #define PROT_WRITE 2 #endif +/* These flags aren't defined on all targets (mingw32), so provide them + here. */ +#ifndef S_IRGRP +#define S_IRGRP 0 +#endif + +#ifndef S_IWGRP +#define S_IWGRP 0 +#endif + +#ifndef S_IROTH +#define S_IROTH 0 +#endif + +#ifndef S_IWOTH +#define S_IWOTH 0 +#endif + /* This implementation of stream I/O is based on the paper: * * "Exploiting the advantages of mapped files for stream I/O", @@ -921,8 +939,8 @@ unpack_filename (char *cstring, const char *fstring, int len) /* tempfile()-- Generate a temporary filename for a scratch file and * open it. mkstemp() opens the file for reading and writing, but the * library mode prevents anything that is not allowed. The descriptor - * is returns, which is less than zero on error. The template is - * pointed to by ioparm.file, which is copied into the unit structure + * is returned, which is -1 on error. The template is pointed to by + * ioparm.file, which is copied into the unit structure * and freed later. */ static int @@ -940,10 +958,23 @@ tempfile (void) template = get_mem (strlen (tempdir) + 20); - st_sprintf (template, "%s/gfortantmpXXXXXX", tempdir); + st_sprintf (template, "%s/gfortrantmpXXXXXX", tempdir); + +#ifdef HAVE_MKSTEMP fd = mkstemp (template); +#else /* HAVE_MKSTEMP */ + + if (mktemp (template)) + do + fd = open (template, O_CREAT | O_EXCL, S_IREAD | S_IWRITE); + while (!(fd == -1 && errno == EEXIST) && mktemp (template)); + else + fd = -1; + +#endif /* HAVE_MKSTEMP */ + if (fd < 0) free_mem (template); else -- cgit v1.1