ignore-value: revert previous code change

[gnulib.git] / lib / tmpdir.c

diff --git a/lib/tmpdir.c b/lib/tmpdir.c
index 405c4bd..97fc3ff 100644 (file)
--- a/lib/tmpdir.c
+++ b/lib/tmpdir.c
@@ -140,10 +140,10 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
     }
 
   dlen = strlen (dir);
-  add_slash = dlen != 0 && !ISSLASH (dir[dlen - 1]);
 #ifdef __VMS
-  if (dlen != 0 && dir[dlen - 1] == ':')
-    add_slash = false;
+  add_slash = 0;
+#else
+  add_slash = dlen != 0 && !ISSLASH (dir[dlen - 1]);
 #endif
 
   /* check we have room for "${dir}/${pfx}XXXXXX\0" */
@@ -154,6 +154,6 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
     }
 
   memcpy (tmpl, dir, dlen);
-  sprintf (tmpl + dlen, &"/%.*sXXXXXX"[!add_slash], pfx, (int) plen);
+  sprintf (tmpl + dlen, &"/%.*sXXXXXX"[!add_slash], (int) plen, pfx);
   return 0;
 }