diff options
| author | DJ Delorie <dj@delorie.com> | 2010-07-21 16:08:00 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2010-07-21 16:08:00 +0000 |
| commit | c7730817ca1a50c9dbfcee1455932ffbb3011401 (patch) | |
| tree | 55eb58d937ada7ad09cec88326eacd8e578b5de1 /libiberty | |
| parent | 09585c444faac3133f5cd039898ebd56582d067e (diff) | |
| download | gdb-c7730817ca1a50c9dbfcee1455932ffbb3011401.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/make-temp-file.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 1b1610b6929..0a31b0c4c45 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2010-07-21 Pascal Obry <obry@adacore.com> + + * make-temp-file.c (choose_tmpdir): Append a dot to P_tmpdir if needed. + 2010-07-06 Ken Werner <ken.werner@de.ibm.com> * floatformat.c (floatformat_ieee_half_big): New variable. diff --git a/libiberty/make-temp-file.c b/libiberty/make-temp-file.c index 13e19256534..4e3876676e2 100644 --- a/libiberty/make-temp-file.c +++ b/libiberty/make-temp-file.c @@ -121,7 +121,12 @@ choose_tmpdir (void) #endif #ifdef P_tmpdir - base = try_dir (P_tmpdir, base); + /* We really want a directory name here as if concatenated with say \dir + we do not end up with a double \\ which defines an UNC path. */ + if (strcmp (P_tmpdir, "\\") == 0) + base = try_dir ("\\.", base); + else + base = try_dir (P_tmpdir, base); #endif /* Try /var/tmp, /usr/tmp, then /tmp. */ |