From c8fe645c198e2ca55c4e3446efbbdb9b995c63ce Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 3 Oct 2020 17:04:37 +0200 Subject: patch 8.2.1793: not consistently giving the "is a directory" warning Problem: Not consistently giving the "is a directory" warning. Solution: Adjust check for illegal file name and directory. (Yasuhiro Matsumoto, closes #7067) --- src/fileio.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/fileio.c') diff --git a/src/fileio.c b/src/fileio.c index aa6596df64..83924b352c 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -211,6 +211,7 @@ readfile( char_u *old_b_fname; int using_b_ffname; int using_b_fname; + static char *msg_is_a_directory = N_("is a directory"); au_did_filetype = FALSE; // reset before triggering any autocommands @@ -310,22 +311,29 @@ readfile( else msg_scroll = TRUE; // don't overwrite previous file message - /* - * If the name ends in a path separator, we can't open it. Check here, - * because reading the file may actually work, but then creating the swap - * file may destroy it! Reported on MS-DOS and Win 95. - * If the name is too long we might crash further on, quit here. - */ if (fname != NULL && *fname != NUL) { - p = fname + STRLEN(fname); - if (after_pathsep(fname, p) || STRLEN(fname) >= MAXPATHL) + size_t namelen = STRLEN(fname); + + // If the name is too long we might crash further on, quit here. + if (namelen >= MAXPATHL) { filemess(curbuf, fname, (char_u *)_("Illegal file name"), 0); msg_end(); msg_scroll = msg_save; return FAIL; } + + // If the name ends in a path separator, we can't open it. Check here, + // because reading the file may actually work, but then creating the + // swap file may destroy it! Reported on MS-DOS and Win 95. + if (after_pathsep(fname, fname + namelen)) + { + filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); + msg_end(); + msg_scroll = msg_save; + return FAIL; + } } if (!read_stdin && !read_buffer && !read_fifo) @@ -349,7 +357,7 @@ readfile( if (S_ISDIR(perm)) { - filemess(curbuf, fname, (char_u *)_("is a directory"), 0); + filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0); retval = NOTDONE; } else @@ -475,7 +483,7 @@ readfile( perm = mch_getperm(fname); // check if the file exists if (isdir_f) { - filemess(curbuf, sfname, (char_u *)_("is a directory"), 0); + filemess(curbuf, sfname, (char_u *)_(msg_is_a_directory), 0); curbuf->b_p_ro = TRUE; // must use "w!" now } else -- cgit v1.2.3