diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-08-16 15:34:09 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-08-16 15:34:09 +0300 |
| commit | 205d87cdca09c648da4fc8ec622c135e1655a08b (patch) | |
| tree | d0c66f238ca5d03f811faf9d33da604ae0d0fea1 | |
| parent | 3712e8bc385e05520b4f410abd4f627ac668c65d (diff) | |
| download | emacs-205d87cdca09c648da4fc8ec622c135e1655a08b.tar.gz | |
Fix unpacking ZIP archives on MS-Windows
* lisp/arc-mode.el (archive-zip-summarize): Decode file names as
UTF-8 when bit 11 of flags is set, even on MS-Windows.
(Bug#65305)
| -rw-r--r-- | lisp/arc-mode.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 5e696c091b2..05a71fb4c5a 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1990,6 +1990,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (setq p (+ p (point-min))) (while (string= "PK\001\002" (buffer-substring p (+ p 4))) (let* ((creator (get-byte (+ p 5))) + (gpflags (archive-l-e (+ p 8) 2)) ;; (method (archive-l-e (+ p 10) 2)) (modtime (archive-l-e (+ p 12) 2)) (moddate (archive-l-e (+ p 14) 2)) @@ -2001,7 +2002,12 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen)))) (decode-coding-string str - (or (if (and w32-fname-encoding + ;; Bit 11 of general purpose bit flags (bytes + ;; 8-9) of Central Directory: 1 means UTF-8 + ;; encoded file names. + (or (if (/= 0 (logand gpflags #x0800)) + 'utf-8-unix) + (if (and w32-fname-encoding (memq creator ;; This should be just 10 and ;; 14, but InfoZip uses 0 and |