aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-01-20 23:36:07 +0000
committerRichard M. Stallman1995-01-20 23:36:07 +0000
commitdffb28c7ca5aa40dda40cfac9a26a38bcfefe1c7 (patch)
tree162595c7acf58e5f63c9e1565a42f0c998f02991
parente01ac82c3ea516c9212744de441ff769c96a3dcf (diff)
downloademacs-dffb28c7ca5aa40dda40cfac9a26a38bcfefe1c7.tar.gz
emacs-dffb28c7ca5aa40dda40cfac9a26a38bcfefe1c7.zip
(file_name_as_directory, Ffile_name_directory)
(Ffile_name_nondirectory): Delete special MSDOG code now covered by macros.
-rw-r--r--src/fileio.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 079c7d0dc7c..d47a17c0536 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -306,9 +306,6 @@ on VMS, perhaps instead a string ending in `:', `]' or `>'.")
306#ifdef VMS 306#ifdef VMS
307 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>' 307 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
308#endif /* VMS */ 308#endif /* VMS */
309#ifdef MSDOS
310 && p[-1] != ':' && p[-1] != '\\'
311#endif
312 ) p--; 309 ) p--;
313 310
314 if (p == beg) 311 if (p == beg)
@@ -372,9 +369,6 @@ or the entire name if it contains no slash.")
372#ifdef VMS 369#ifdef VMS
373 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>' 370 && p[-1] != ':' && p[-1] != ']' && p[-1] != '>'
374#endif /* VMS */ 371#endif /* VMS */
375#ifdef MSDOS
376 && p[-1] != ':'
377#endif
378 ) p--; 372 ) p--;
379 373
380 return make_string (p, end - p); 374 return make_string (p, end - p);
@@ -470,15 +464,11 @@ file_name_as_directory (out, in)
470 } 464 }
471#else /* not VMS */ 465#else /* not VMS */
472 /* For Unix syntax, Append a slash if necessary */ 466 /* For Unix syntax, Append a slash if necessary */
473#ifdef MSDOS
474 if (out[size] != ':' && out[size] != '/' && out[size] != '\\')
475#else /* not MSDOS */
476 if (!IS_ANY_SEP (out[size])) 467 if (!IS_ANY_SEP (out[size]))
477 { 468 {
478 out[size + 1] = DIRECTORY_SEP; 469 out[size + 1] = DIRECTORY_SEP;
479 out[size + 2] = '\0'; 470 out[size + 2] = '\0';
480 } 471 }
481#endif /* not MSDOS */
482#endif /* not VMS */ 472#endif /* not VMS */
483 return out; 473 return out;
484} 474}