1 files changed, 24 insertions, 23 deletions

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index f922591d0b..ad856b588a 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -210,7 +210,8 @@ void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
   if (msg_silent != 0) {
     return;
   }
-  add_quoted_fname((char *)IObuff, IOSIZE - 80, buf, (const char *)name);
+  add_quoted_fname((char *)IObuff, IOSIZE - 100, buf, (const char *)name);
+  // Avoid an over-long translation to cause trouble.
   xstrlcat((char *)IObuff, (const char *)s, IOSIZE);
   // For the first message may have to start a new line.
   // For further ones overwrite the previous one, reset msg_scroll before
@@ -349,6 +350,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
 
@@ -443,21 +445,31 @@ readfile(
   else
     msg_scroll = TRUE;          /* don't overwrite previous file message */
 
-  /*
-   * If the name is too long we might crash further on, quit here.
-   */
+  // If the name is too long we might crash further on, quit here.
   if (fname != NULL && *fname != NUL) {
-    if (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((const char *)fname, (const char *)(fname + namelen))) {
+      filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0);
+      msg_end();
+      msg_scroll = msg_save;
+      return FAIL;
+    }
   }
 
   if (!read_buffer && !read_stdin && !read_fifo) {
     perm = os_getperm((const char *)fname);
-#ifdef UNIX
     // On Unix it is possible to read a directory, so we have to
     // check for it before os_open().
     if (perm >= 0 && !S_ISREG(perm)                 // not a regular file ...
@@ -473,7 +485,7 @@ readfile(
 # endif
         ) {
       if (S_ISDIR(perm)) {
-        filemess(curbuf, fname, (char_u *)_("is a directory"), 0);
+        filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0);
       } else {
         filemess(curbuf, fname, (char_u *)_("is not a file"), 0);
       }
@@ -481,7 +493,6 @@ readfile(
       msg_scroll = msg_save;
       return S_ISDIR(perm) ? NOTDONE : FAIL;
     }
-#endif
   }
 
   /* Set default or forced 'fileformat' and 'binary'. */
@@ -540,13 +551,6 @@ readfile(
 
   if (fd < 0) {                     // cannot open at all
     msg_scroll = msg_save;
-#ifndef UNIX
-    // On non-unix systems we can't open a directory, check here.
-    if (os_isdir(fname)) {
-      filemess(curbuf, sfname, (char_u *)_("is a directory"), 0);
-      curbuf->b_p_ro = true;        // must use "w!" now
-    } else {
-#endif
     if (!newfile) {
       return FAIL;
     }
@@ -604,9 +608,6 @@ readfile(
 
     return FAIL;
   }
-#ifndef UNIX
-  }
-#endif
 
   /*
    * Only set the 'ro' flag for readonly files the first time they are
@@ -1797,6 +1798,7 @@ failed:
       linecnt--;
     }
     curbuf->deleted_bytes = 0;
+    curbuf->deleted_bytes2 = 0;
     curbuf->deleted_codepoints = 0;
     curbuf->deleted_codeunits = 0;
     linecnt = curbuf->b_ml.ml_line_count - linecnt;
@@ -3591,7 +3593,7 @@ restore_backup:
    * the backup file our 'original' file.
    */
   if (*p_pm && dobackup) {
-    char *org = modname((char *)fname, (char *)p_pm, FALSE);
+    char *const org = modname((char *)fname, (char *)p_pm, false);
 
     if (backup != NULL) {
       /*
@@ -5553,7 +5555,6 @@ static void au_del_cmd(AutoCmd *ac)
 static void au_cleanup(void)
 {
   AutoPat     *ap, **prev_ap;
-  AutoCmd     *ac, **prev_ac;
   event_T event;
 
   if (autocmd_busy || !au_need_clean) {
@@ -5566,11 +5567,11 @@ static void au_cleanup(void)
     // Loop over all autocommand patterns.
     prev_ap = &(first_autopat[(int)event]);
     for (ap = *prev_ap; ap != NULL; ap = *prev_ap) {
-      // Loop over all commands for this pattern.
-      prev_ac = &(ap->cmds);
       bool has_cmd = false;
 
-      for (ac = *prev_ac; ac != NULL; ac = *prev_ac) {
+      // Loop over all commands for this pattern.
+      AutoCmd **prev_ac = &(ap->cmds);
+      for (AutoCmd *ac = *prev_ac; ac != NULL; ac = *prev_ac) {
         // Remove the command if the pattern is to be deleted or when
         // the command has been marked for deletion.
         if (ap->pat == NULL || ac->cmd == NULL) {