Merge remote-tracking branch 'origin/master' into feature/android

2 files changed, 19 insertions, 10 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 72f75d7890d..36914967dc7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -3076,24 +3076,31 @@ shut_down_emacs (int sig, Lisp_Object stuff)
       reset_all_sys_modes ();
       if (sig && sig != SIGTERM)
         {
-          static char const fmt[] = "Fatal error %d: %n%s\n";
 #ifdef HAVE_HAIKU
           if (haiku_debug_on_fatal_error)
             debugger ("Fatal error in Emacs");
 #endif
-          char buf[max ((sizeof fmt - sizeof "%d%n%s\n"
+          /* Output a "Fatal error NUM: DESC\n" diagnostic with a single write,
+             but use multiple writes if the diagnosic is absurdly long
+             and likely couldn't be written atomically anyway.  */
+          static char const fmt[] = "Fatal error %d: ";
+          char buf[max ((sizeof fmt - sizeof "%d"
                          + INT_STRLEN_BOUND (int) + 1),
                         min (PIPE_BUF, MAX_ALLOCA))];
           char const *sig_desc = safe_strsignal (sig);
-          int nlen;
-          int buflen = snprintf (buf, sizeof buf, fmt, sig, &nlen, sig_desc);
-          if (0 <= buflen && buflen < sizeof buf)
-            emacs_write (STDERR_FILENO, buf, buflen);
+          size_t sig_desclen = strlen (sig_desc);
+          int nlen = sprintf (buf, fmt, sig);
+          if (nlen + sig_desclen < sizeof buf - 1)
+            {
+              char *p = mempcpy (buf + nlen, sig_desc, sig_desclen);
+              *p++ = '\n';
+              emacs_write (STDERR_FILENO, buf, p - buf);
+            }
           else
             {
               emacs_write (STDERR_FILENO, buf, nlen);
-              emacs_write (STDERR_FILENO, sig_desc, strlen (sig_desc));
-              emacs_write (STDERR_FILENO, fmt + sizeof fmt - 2, 1);
+              emacs_write (STDERR_FILENO, sig_desc, sig_desclen);
+              emacs_write (STDERR_FILENO, "\n", 1);
             }
         }
     }
diff --git a/src/fileio.c b/src/fileio.c
index b815a1bdd79..290481c2b5d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2566,12 +2566,14 @@ DEFUN ("delete-directory-internal", Fdelete_directory_internal,
 }
 
 DEFUN ("delete-file-internal", Fdelete_file_internal, Sdelete_file_internal, 1, 1, 0,
-       doc: /* Delete file named FILENAME.  If it is a symlink, remove the symlink.
+       doc: /* Delete file named FILENAME; internal use only.
+If it is a symlink, remove the symlink.
 If file has multiple names, it continues to exist with the other names. */)
   (Lisp_Object filename)
 {
   Lisp_Object encoded_file;
 
+  filename = Fexpand_file_name (filename, Qnil);
   encoded_file = ENCODE_FILE (filename);
 
   if (emacs_unlink (SSDATA (encoded_file)) != 0
@@ -2596,7 +2598,7 @@ internal_delete_file (Lisp_Object filename)
 {
   Lisp_Object tem;
 
-  tem = internal_condition_case_2 (Fdelete_file, filename, Qnil,
+  tem = internal_condition_case_2 (Fdelete_file_internal, filename,
                                    Qt, internal_delete_file_1);
   return NILP (tem);
 }