Changeset 1192

Timestamp:

Feb 6, 2004, 12:13:21 PM (22 years ago)

Author:

bird

Message:

859: Don't add more slashes if tmpdir already have a slash.

Location:

trunk/src

Files:

• binutils/libiberty/make-temp-file.c (modified) (2 diffs, 1 prop)
• gcc/libiberty/make-temp-file.c (modified) (2 diffs, 1 prop)

trunk/src/binutils/libiberty/make-temp-file.c

@@ -117 +117 @@
   base = try (usrtmp, base);
   base = try (tmp, base);
- 
+
   /* If all else fails, use the current directory!  */
   if (base == 0)
@@ -127 +127 @@
   tmpdir = xmalloc (len + 2);
   strcpy (tmpdir, base);
+#ifdef __EMX__
+  if (tmpdir[len - 1] == '\\' || tmpdir[len - 1] == '/')
+    tmpdir[--len] = DIR_SEPARATOR;
+  else
+    tmpdir[len] = DIR_SEPARATOR;
+#else
   tmpdir[len] = DIR_SEPARATOR;
+#endif
   tmpdir[len+1] = '\0';
 

trunk/src/gcc/libiberty/make-temp-file.c

@@ -117 +117 @@
   base = try (usrtmp, base);
   base = try (tmp, base);
- 
+
   /* If all else fails, use the current directory!  */
   if (base == 0)
@@ -127 +127 @@
   tmpdir = xmalloc (len + 2);
   strcpy (tmpdir, base);
+#ifdef __EMX__
+  if (tmpdir[len - 1] == '\\' || tmpdir[len - 1] == '/')
+    tmpdir[--len] = DIR_SEPARATOR;
+  else
+    tmpdir[len] = DIR_SEPARATOR;
+#else
   tmpdir[len] = DIR_SEPARATOR;
+#endif
   tmpdir[len+1] = '\0';