diff options
| author | Eli Zaretskii | 2017-09-08 10:51:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-08 10:51:14 +0300 |
| commit | e2a10d7fa8092ef51a3b61a363061e37224e2ca1 (patch) | |
| tree | e6efaca41d7e006f88250e44213eb9fbaf2c41ae /src | |
| parent | 442fe111436264e1a610fbf5686ccf1314407d4a (diff) | |
| download | emacs-e2a10d7fa8092ef51a3b61a363061e37224e2ca1.tar.gz emacs-e2a10d7fa8092ef51a3b61a363061e37224e2ca1.zip | |
Fix 'directory-file-name' on DOS_NT systems as well
* src/fileio.c (directory_file_name) [DOS_NT]: Fix the DOS_NT case
to be consistent with last change.
* test/src/fileio-tests.el (fileio-tests--odd-symlink-chars):
Disable on MS-Windows.
(fileio-tests--directory-file-name-dos-nt)
(fileio-tests--file-name-as-directory-dos-nt): New tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 9df3b1bedae..a1cea94c0b6 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -572,7 +572,7 @@ directory_file_name (char *dst, char *src, ptrdiff_t srclen, bool multibyte) | |||
| 572 | if (! (srclen == 2 && IS_DIRECTORY_SEP (src[0]))) | 572 | if (! (srclen == 2 && IS_DIRECTORY_SEP (src[0]))) |
| 573 | while (srclen > 1 | 573 | while (srclen > 1 |
| 574 | #ifdef DOS_NT | 574 | #ifdef DOS_NT |
| 575 | && !IS_ANY_SEP (src[srclen - 2]) | 575 | && !(srclen > 2 && IS_DEVICE_SEP (src[srclen - 2])) |
| 576 | #endif | 576 | #endif |
| 577 | && IS_DIRECTORY_SEP (src[srclen - 1])) | 577 | && IS_DIRECTORY_SEP (src[srclen - 1])) |
| 578 | srclen--; | 578 | srclen--; |