summaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authormmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2009-02-22 18:43:30 +0000
committermmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>2009-02-22 18:43:30 +0000
commit0bbd5c2189473e54a29b5e2a7019e6a64ed4f6d7 (patch)
tree5040628f6f2636b492320ef004f8221f02342596 /libiberty
parent24449a172961270c95f24ca48893fb87cf902e77 (diff)
downloadgcc-0bbd5c2189473e54a29b5e2a7019e6a64ed4f6d7.tar.gz
* make-temp-file.c (<windows.h>): Include on Windows.
(choose_tmpdir): On Windows, use GetTempPath. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144375 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/make-temp-file.c87
2 files changed, 61 insertions, 31 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3101aeac5f3..db7d2878bc0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-21 Mark Mitchell <mark@codesourcery.com>
+
+ * make-temp-file.c (<windows.h>): Include on Windows.
+ (choose_tmpdir): On Windows, use GetTempPath.
+
2009-01-18 Dave Korn <dave.korn.cygwin@gmail.com>
* configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin,
diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c
index 94c76d700bd..eadcf850213 100644
--- a/libiberty/make-temp-file.c
+++ b/libiberty/make-temp-file.c
@@ -36,6 +36,9 @@ Boston, MA 02110-1301, USA. */
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h> /* May get R_OK, etc. on some systems. */
#endif
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <windows.h>
+#endif
#ifndef R_OK
#define R_OK 4
@@ -56,6 +59,8 @@ extern int mkstemps (char *, int);
#define TEMP_FILE "ccXXXXXX"
#define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
+#if !defined(_WIN32) || defined(__CYGWIN__)
+
/* Subroutine of choose_tmpdir.
If BASE is non-NULL, return it.
Otherwise it checks if DIR is a usable directory.
@@ -81,6 +86,8 @@ static const char usrtmp[] =
static const char vartmp[] =
{ DIR_SEPARATOR, 'v', 'a', 'r', DIR_SEPARATOR, 't', 'm', 'p', 0 };
+#endif
+
static char *memoized_tmpdir;
/*
@@ -97,40 +104,58 @@ files in.
char *
choose_tmpdir (void)
{
- const char *base = 0;
- char *tmpdir;
- unsigned int len;
-
- if (memoized_tmpdir)
- return memoized_tmpdir;
-
- base = try_dir (getenv ("TMPDIR"), base);
- base = try_dir (getenv ("TMP"), base);
- base = try_dir (getenv ("TEMP"), base);
-
+ if (!memoized_tmpdir)
+ {
+#if !defined(_WIN32) || defined(__CYGWIN__)
+ const char *base = 0;
+ char *tmpdir;
+ unsigned int len;
+
+ base = try_dir (getenv ("TMPDIR"), base);
+ base = try_dir (getenv ("TMP"), base);
+ base = try_dir (getenv ("TEMP"), base);
+
#ifdef P_tmpdir
- base = try_dir (P_tmpdir, base);
+ base = try_dir (P_tmpdir, base);
#endif
- /* Try /var/tmp, /usr/tmp, then /tmp. */
- base = try_dir (vartmp, base);
- base = try_dir (usrtmp, base);
- base = try_dir (tmp, base);
-
- /* If all else fails, use the current directory! */
- if (base == 0)
- base = ".";
-
- /* Append DIR_SEPARATOR to the directory we've chosen
- and return it. */
- len = strlen (base);
- tmpdir = XNEWVEC (char, len + 2);
- strcpy (tmpdir, base);
- tmpdir[len] = DIR_SEPARATOR;
- tmpdir[len+1] = '\0';
-
- memoized_tmpdir = tmpdir;
- return tmpdir;
+ /* Try /var/tmp, /usr/tmp, then /tmp. */
+ base = try_dir (vartmp, base);
+ base = try_dir (usrtmp, base);
+ base = try_dir (tmp, base);
+
+ /* If all else fails, use the current directory! */
+ if (base == 0)
+ base = ".";
+ /* Append DIR_SEPARATOR to the directory we've chosen
+ and return it. */
+ len = strlen (base);
+ tmpdir = XNEWVEC (char, len + 2);
+ strcpy (tmpdir, base);
+ tmpdir[len] = DIR_SEPARATOR;
+ tmpdir[len+1] = '\0';
+ memoized_tmpdir = tmpdir;
+#else /* defined(_WIN32) && !defined(__CYGWIN__) */
+ DWORD len;
+
+ /* Figure out how much space we need. */
+ len = GetTempPath(0, NULL);
+ if (len)
+ {
+ memoized_tmpdir = XNEWVEC (char, len);
+ if (!GetTempPath(len, memoized_tmpdir))
+ {
+ XDELETEVEC (memoized_tmpdir);
+ memoized_tmpdir = NULL;
+ }
+ }
+ if (!memoized_tmpdir)
+ /* If all else fails, use the current directory. */
+ memoized_tmpdir = xstrdup (".\\");
+#endif /* defined(_WIN32) && !defined(__CYGWIN__) */
+ }
+
+ return memoized_tmpdir;
}
/*