(make_temp_name): Handle multibyte prefixes.

0cedd530 · Stefan Monnier · abaf2e77 · 0cedd530 · 0cedd530
Commit 0cedd530 authored Aug 07, 2004 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

src/ChangeLog src/ChangeLog +4 -0

src/fileio.c src/fileio.c +5 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2004-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (make_temp_name): Handle multibyte prefixes.
+
 2004-08-06  Luc Teirlinck  <teirllm@auburn.edu>
  
 	* keyboard.c (syms_of_keyboard) <overriding-terminal-local-map>:

--- a/src/fileio.c
+++ b/src/fileio.c
@@ -886,7 +886,7 @@ make_temp_name (prefix, base64_p)
     int base64_p;
 {
  Lisp_Object val;
-  int len;
+  int len, clen;
  int pid;
  unsigned char *p, *data;
  char pidbuf[20];
@@ -921,8 +921,10 @@ make_temp_name (prefix, base64_p)
 #endif
    }

-  len = SCHARS (prefix);
-  val = make_uninit_string (len + 3 + pidlen);
+  len = SBYTES (prefix); clen = SCHARS (prefix);
+  val = make_uninit_multibyte_string (clen + 3 + pidlen, len + 3 + pidlen);
+  if (!STRING_MULTIBYTE (prefix))
+    STRING_SET_UNIBYTE (val);
  data = SDATA (val);
  bcopy(SDATA (prefix), data, len);
  p = data + len;