diff options
| author | Thien-Thi Nguyen <[email protected]> | 2005-03-04 21:57:21 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <[email protected]> | 2005-03-04 21:57:21 +0000 |
| commit | ad204e956ac4821908cbb4a53270ba52523ae2e3 (patch) | |
| tree | 4ddca45d28d83cd11448e1e2679f0838a5913c68 | |
| parent | f17bb0913a82da0eac22de39ff772fb8f960dd57 (diff) | |
(Fexpand_file_name) [VMS]:
Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.
| -rw-r--r-- | src/fileio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fileio.c b/src/fileio.c index ee03e63cc1..7f73a55bce 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1222,23 +1222,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; @@ -1618,12 +1618,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 */ |