diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-04-13 13:45:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-04-13 13:45:46 +0300 |
| commit | ced78c5a65b64b0e520b03cd3a987374ea4ca7d2 (patch) | |
| tree | 0bfd621bb3f145f31046bdfa061ef34fc743e5c0 | |
| parent | f2d164a4c6f3f0eb6f175b57012738aeaad2f294 (diff) | |
| download | emacs-ced78c5a65b64b0e520b03cd3a987374ea4ca7d2.tar.gz | |
Fix open-dribble-file's treatment of non-ASCII file names.
src/keyboard.c (Fopen_dribble_file): Encode the dribble file-name
before passing it to system APIs.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/keyboard.c | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2deeb61b95c..d885863d73c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2014-04-13 Eli Zaretskii <eliz@gnu.org> + * keyboard.c (Fopen_dribble_file): Encode the dribble file-name + before passing it to system APIs. + * puresize.h (BASE_PURESIZE): Bump by 1K. (Bug#17255) 2014-04-13 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/src/keyboard.c b/src/keyboard.c index a66054f153f..1f4b23d9905 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -10087,10 +10087,13 @@ This may include sensitive information such as passwords. */) if (!NILP (file)) { int fd; + Lisp_Object encfile; + file = Fexpand_file_name (file, Qnil); - fd = emacs_open (SSDATA (file), O_WRONLY | O_CREAT | O_EXCL, 0600); - if (fd < 0 && errno == EEXIST && unlink (SSDATA (file)) == 0) - fd = emacs_open (SSDATA (file), O_WRONLY | O_CREAT | O_EXCL, 0600); + encfile = ENCODE_FILE (file); + fd = emacs_open (SSDATA (encfile), O_WRONLY | O_CREAT | O_EXCL, 0600); + if (fd < 0 && errno == EEXIST && unlink (SSDATA (encfile)) == 0) + fd = emacs_open (SSDATA (encfile), O_WRONLY | O_CREAT | O_EXCL, 0600); dribble = fd < 0 ? 0 : fdopen (fd, "w"); if (dribble == 0) report_file_error ("Opening dribble", file); |