From 84dd1ea9a61f4fe3cba7e7483b4c50a753711c02 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 15 Jul 2013 09:44:19 -0700 Subject: [PATCH] tmpdir: port to VMS, to // != /, and to long dirs * lib/tmpdir.c (__libc_secure_getenv) [!_LIBC]: Rename from __secure_getenv, so that we're more like the glibc version. All uses changed. (path_search): Don't put slash after directory if __VMS. Problem reported by Steven M. Schweda in . Do not remove trailing slash from "//". Do not assume dlen <= INT_MAX. --- ChangeLog | 12 ++++++++++++ lib/tmpdir.c | 22 ++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d73a269c..6929de02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-07-15 Paul Eggert + + tmpdir: port to VMS, to // != /, and to long dirs + * lib/tmpdir.c (__libc_secure_getenv) [!_LIBC]: Rename from + __secure_getenv, so that we're more like the glibc version. + All uses changed. + (path_search): Don't put slash after directory if __VMS. + Problem reported by Steven M. Schweda in + . + Do not remove trailing slash from "//". + Do not assume dlen <= INT_MAX. + 2013-07-09 Paul Eggert regex: port to --with-included-regex --enable-gcc-warnings non-threaded diff --git a/lib/tmpdir.c b/lib/tmpdir.c index e8044162c..aa2164dfa 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -53,7 +53,7 @@ # define struct_stat64 struct stat64 #else # define struct_stat64 struct stat -# define __secure_getenv secure_getenv +# define __libc_secure_getenv secure_getenv # define __xstat64(version, path, buf) stat (path, buf) #endif @@ -89,6 +89,11 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, { const char *d; size_t dlen, plen; +#ifdef __VMS + bool add_slash = false; +#else + bool add_slash = true; +#endif if (!pfx || !pfx[0]) { @@ -104,7 +109,7 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, if (try_tmpdir) { - d = __secure_getenv ("TMPDIR"); + d = __libc_secure_getenv ("TMPDIR"); if (d != NULL && direxists (d)) dir = d; else if (dir != NULL && direxists (dir)) @@ -138,17 +143,22 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, } } + /* Remove trailing slashes, except remove just one from "//". */ dlen = strlen (dir); - while (dlen >= 1 && ISSLASH (dir[dlen - 1])) - dlen--; /* remove trailing slashes */ + if (dlen == 2 && ISSLASH (dir[0]) && ISSLASH (dir[1])) + dlen--; + else + while (0 < dlen && ISSLASH (dir[dlen - 1])) + dlen--; /* check we have room for "${dir}/${pfx}XXXXXX\0" */ - if (tmpl_len < dlen + 1 + plen + 6 + 1) + if (tmpl_len < dlen + add_slash + plen + 6 + 1) { __set_errno (EINVAL); return -1; } - sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx); + memcpy (tmpl, dir, dlen); + sprintf (tmpl + dlen, &"/%.*sXXXXXX"[!add_slash], pfx, (int) plen); return 0; } -- 2.11.0