mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-15 20:20:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

make-temp-file.c (<windows.h>): Include on Windows.

Browse Source 
* make-temp-file.c (<windows.h>): Include on Windows.
	(choose_tmpdir): On Windows, use GetTempPath.

From-SVN: r144375
This commit is contained in:
Mark Mitchell 2009-02-22 18:43:30 +00:00 committed by Mark Mitchell
parent 1f20025aa2
commit 8c9abf1f38
2 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libiberty/ChangeLog
View File

@ -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> 2009-01-18 Dave Korn <dave.korn.cygwin@gmail.com>
* configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin, * configure.ac (funcs, vars, checkfuncs): Don't munge on Cygwin,

83
libiberty/make-temp-file.c
View File

@ -36,6 +36,9 @@ Boston, MA 02110-1301, USA. */
#ifdef HAVE_SYS_FILE_H #ifdef HAVE_SYS_FILE_H
#include <sys/file.h> /* May get R_OK, etc. on some systems. */ #include <sys/file.h> /* May get R_OK, etc. on some systems. */
#endif #endif
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#endif
#ifndef R_OK #ifndef R_OK
#define R_OK 4 #define R_OK 4
@ -56,6 +59,8 @@ extern int mkstemps (char *, int);
#define TEMP_FILE "ccXXXXXX" #define TEMP_FILE "ccXXXXXX"
#define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1) #define TEMP_FILE_LEN (sizeof(TEMP_FILE) - 1)
#if !defined(_WIN32) || defined(__CYGWIN__)
/* Subroutine of choose_tmpdir. /* Subroutine of choose_tmpdir.
If BASE is non-NULL, return it. If BASE is non-NULL, return it.
Otherwise it checks if DIR is a usable directory. Otherwise it checks if DIR is a usable directory.
@ -81,6 +86,8 @@ static const char usrtmp[] =
static const char vartmp[] = static const char vartmp[] =
{ DIR_SEPARATOR, 'v', 'a', 'r', DIR_SEPARATOR, 't', 'm', 'p', 0 }; { DIR_SEPARATOR, 'v', 'a', 'r', DIR_SEPARATOR, 't', 'm', 'p', 0 };
#endif
static char *memoized_tmpdir; static char *memoized_tmpdir;
/* /*
@ -97,40 +104,58 @@ files in.
char * char *
choose_tmpdir (void) choose_tmpdir (void)
{ {
const char *base = 0; if (!memoized_tmpdir)
char *tmpdir; {
unsigned int len; #if !defined(_WIN32) || defined(__CYGWIN__)
const char *base = 0;
if (memoized_tmpdir) char *tmpdir;
return memoized_tmpdir; unsigned int len;
base = try_dir (getenv ("TMPDIR"), base); base = try_dir (getenv ("TMPDIR"), base);
base = try_dir (getenv ("TMP"), base); base = try_dir (getenv ("TMP"), base);
base = try_dir (getenv ("TEMP"), base); base = try_dir (getenv ("TEMP"), base);
#ifdef P_tmpdir #ifdef P_tmpdir
base = try_dir (P_tmpdir, base); base = try_dir (P_tmpdir, base);
#endif #endif
/* Try /var/tmp, /usr/tmp, then /tmp. */ /* Try /var/tmp, /usr/tmp, then /tmp. */
base = try_dir (vartmp, base); base = try_dir (vartmp, base);
base = try_dir (usrtmp, base); base = try_dir (usrtmp, base);
base = try_dir (tmp, base); base = try_dir (tmp, base);
/* If all else fails, use the current directory! */ /* If all else fails, use the current directory! */
if (base == 0) if (base == 0)
base = "."; 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;
/* Append DIR_SEPARATOR to the directory we've chosen /* Figure out how much space we need. */
and return it. */ len = GetTempPath(0, NULL);
len = strlen (base); if (len)
tmpdir = XNEWVEC (char, len + 2); {
strcpy (tmpdir, base); memoized_tmpdir = XNEWVEC (char, len);
tmpdir[len] = DIR_SEPARATOR; if (!GetTempPath(len, memoized_tmpdir))
tmpdir[len+1] = '\0'; {
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__) */
}
memoized_tmpdir = tmpdir; return memoized_tmpdir;
return tmpdir;
} }
/* /*