From 39aceac320a1561d50c7d71ac2560aec7ab8eddb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 23 Feb 2017 01:45:04 +0100 Subject: [PATCH] On VMS, massage the fetch file names to remove the generation number The generation number is ';nnn' at the end of the file name fetched with readdir(). Because rehash checks for specific extensions and doesn't expect an additional generation number, the easiest is to massage the received file name early by simply removing the generation number. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2717) --- apps/rehash.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/apps/rehash.c b/apps/rehash.c index 77541120a8..e837d27614 100644 --- a/apps/rehash.c +++ b/apps/rehash.c @@ -281,6 +281,24 @@ static int ends_with_dirsep(const char *path) return *path == '/'; } +static int massage_filename(char *name) +{ +# ifdef __VMS + char *p = strchr(name, ';'); + char *q = p; + + if (q != NULL) { + for (q++; *q != '\0'; q++) { + if (!isdigit(*q)) + return 1; + } + } + + *p = '\0'; +# endif + return 1; +} + /* * Process a directory; return number of errors found. */ @@ -316,6 +334,7 @@ static int do_dir(const char *dirname, enum Hash h) } while ((filename = OPENSSL_DIR_read(&d, dirname)) != NULL) { if ((copy = strdup(filename)) == NULL + || !massage_filename(copy) || sk_OPENSSL_STRING_push(files, copy) == 0) { BIO_puts(bio_err, "out of memory\n"); exit(1); -- GitLab