tmpdir: fix bug in VMS port

* lib/tmpdir.c (path_search) [__VMS]: Never add slash.
See Steven M. Schweda in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-07/msg00026.html>.

diff --git a/ChangeLog b/ChangeLog
index 9b0cccd..fac6e06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       tmpdir: fix bug in VMS port
+       * lib/tmpdir.c (path_search) [__VMS]: Never add slash.
+       See Steven M. Schweda in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2013-07/msg00026.html>.
+
 2013-07-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        tmpdir: port to VMS, to // != /, and to long dirs

diff --git a/lib/tmpdir.c b/lib/tmpdir.c
index 46768c6..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" */