From 555d92ca3cefb0ba3878b663645db22696e67d0c Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 17 Mar 2005 14:21:33 +0000 Subject: [PATCH] (Fexpand_file_name) [VMS]: Use NO_HYPHENS_IN_FILENAMES, not VMS4_4. --- src/fileio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 7b07a1cdaa4..d70c6704fa2 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1181,23 +1181,23 @@ See also the function `substitute-in-file-name'.") slash = p; } if (p[0] == '-') -#ifndef VMS4_4 - /* VMS pre V4.4,convert '-'s in filenames. */ +#ifdef NO_HYPHENS_IN_FILENAMES if (lbrack == rbrack) { - if (dots < 2) /* this is to allow negative version numbers */ + /* Avoid clobbering negative version numbers. */ + if (dots < 2) p[0] = '_'; } else -#endif /* VMS4_4 */ +#endif /* NO_HYPHENS_IN_FILENAMES */ if (lbrack > rbrack && ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') && (p[1] == '.' || p[1] == ']' || p[1] == '>'))) lose = 1; -#ifndef VMS4_4 +#ifdef NO_HYPHENS_IN_FILENAMES else p[0] = '_'; -#endif /* VMS4_4 */ +#endif /* NO_HYPHENS_IN_FILENAMES */ /* count open brackets, reset close bracket pointer */ if (p[0] == '[' || p[0] == '<') lbrack++, brack = 0; @@ -1568,12 +1568,12 @@ See also the function `substitute-in-file-name'.") } else { -#ifndef VMS4_4 +#ifdef NO_HYPHENS_IN_FILENAMES if (*p == '-' && o[-1] != '[' && o[-1] != '<' && o[-1] != '.' && p[1] != ']' && p[1] != '>' && p[1] != '.') *p = '_'; -#endif /* VMS4_4 */ +#endif /* NO_HYPHENS_IN_FILENAMES */ *o++ = *p++; } #else /* not VMS */ -- 2.11.4.GIT