From d8d3b66971dab2b54dd0946d85fd45a2470714a8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 22 Feb 2017 16:48:55 +0100 Subject: [PATCH] Make "openssl rehash" work on VMS 8.3 and up A spelling error prevented it from building correctly. Furthermore, we need to be more careful when to add a / at the end of the dirname and when not. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2706) (cherry picked from commit 5c80e2af3a7d8aa5129a1668c286c1464983e1ac) --- apps/rehash.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/apps/rehash.c b/apps/rehash.c index 4e10ded790..6544ae1a1d 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -16,7 +16,7 @@ #include "apps.h" #if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \ - (defined(__VMS) && defined(__DECC) && __CTRL_VER >= 80300000) + (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000) # include # include # include @@ -267,6 +267,20 @@ static void str_free(char *s) OPENSSL_free(s); } +static int ends_with_dirsep(const char *path) +{ + if (*path != '\0') + path += strlen(path) - 1; +# ifdef __VMS + if (*path == ']' || *path == '>' || *path == ':') + return 1; +# elif _WIN32 + if (*path == '\\') + return 1; +# endif + return *path == '/'; +} + /* * Process a directory; return number of errors found. */ @@ -289,7 +303,7 @@ static int do_dir(const char *dirname, enum Hash h) return 1; } buflen = strlen(dirname); - pathsep = (buflen && dirname[buflen - 1] == '/') ? "" : "/"; + pathsep = (buflen && !ends_with_dirsep(dirname)) ? "/": ""; buflen += NAME_MAX + 1 + 1; buf = app_malloc(buflen, "filename buffer"); -- 2.25.1