# HG changeset patch # User Richard M. Stallman # Date 828391115 0 # Node ID b909bb3e64c90360047d5ed687651b5b16a90ae0 # Parent b584b8da62cdda6524fcc2ef764d2ba1285c6a09 (absolutefn) [DOS_NT]: Support Novell drives whose drive letter isn't an alphabetic character. (main) [DOS_NT]: Use binary mode on redirected `stdout'. (process_file) [DOS_NT]: Convert all slashes to forward style. (absolute_filename) [DOS_NT]: Emit error message for relative paths with a drive letter. (absolute_filename) [DOS_NT]: Handle absolute pathnames with DOS/NT drive letters which try to reference the parent of the root. (absolute_dirname) [DOS_NT]: Convert all slashes to forward style. info, and don't record undo info for the conversion. diff -r b584b8da62cd -r b909bb3e64c9 lib-src/etags.c --- a/lib-src/etags.c Sun Mar 31 20:27:53 1996 +0000 +++ b/lib-src/etags.c Mon Apr 01 20:38:35 1996 +0000 @@ -41,6 +41,7 @@ #endif #ifdef MSDOS +# include # include # include #endif /* MSDOS */ @@ -114,7 +115,7 @@ #ifdef DOS_NT # define absolutefn(fn) (fn[0] == '/' \ - || (isalpha (fn[0]) && fn[1] == ':' && fn[2] == '/')) + || (fn[1] == ':' && fn[2] == '/')) #else # define absolutefn(fn) (fn[0] == '/') #endif @@ -874,7 +875,15 @@ if (!CTAGS) { if (streq (tagfile, "-")) - tagf = stdout; + { + tagf = stdout; +#ifdef DOS_NT + /* Switch redirected `stdout' to binary mode (setting `_fmode' + doesn't take effect until after `stdout' is already open), */ + if (!isatty (fileno (stdout))) + setmode (fileno (stdout), O_BINARY); +#endif /* DOS_NT */ + } else tagf = fopen (tagfile, append_to_tagfile ? "a" : "w"); if (tagf == NULL) @@ -1060,6 +1069,17 @@ { struct stat stat_buf; FILE *inf; +#ifdef DOS_NT + /* The rest of the program can't grok `\\'-style slashes. */ + char *p = file; + + while (*p) + { + if (*p == '\\') + *p = '/'; + ++p; + } +#endif if (stat (file, &stat_buf) == 0 && !S_ISREG (stat_buf.st_mode)) { @@ -4299,10 +4319,12 @@ getwd (path); p = path; while (*p) - if (*p == '\\') - *p++ = '/'; - else - *p++ = lowcase (*p); + { + if (*p == '\\') + *p++ = '/'; + else + *p++ = lowcase (*p); + } return strdup (path); #else /* not DOS_NT */ @@ -4382,6 +4404,12 @@ if (absolutefn (file)) res = concat (file, "", ""); +#ifdef DOS_NT + /* We don't support non-absolute filenames with a drive + letter, like `d:NAME' (it's too much hassle). */ + else if (file[1] == ':') + fatal ("%s: relative filenames with drive letters not supported", file); +#endif else res = concat (cwd, file, ""); @@ -4402,6 +4430,13 @@ { strcpy (cp, slashp + 3); } +#ifdef DOS_NT + /* Under MSDOS and NT we get `d:/NAME' as absolute + filename, so the luser could say `d:/../NAME'. + We silently treat this as `d:/NAME'. */ + else if (cp[1] == ':') + strcpy (cp + 3, slashp + 4); +#endif else /* else (cp == res) */ { if (slashp[3] != '\0') @@ -4434,6 +4469,16 @@ { char *slashp, *res; char save; +#ifdef DOS_NT + char *p = file; + + while (*p) + { + if (*p == '\\') + *p = '/'; + ++p; + } +#endif slashp = etags_strrchr (file, '/'); if (slashp == NULL)