procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix decoding non-ASCII file names in zip archives on MS-Windows

Browse source 
* lisp/arc-mode.el (archive-zip-summarize): On MS-Windows,
override archive-file-name-coding-system for files compressed
on MS-Windows, and use the local console encoding instead.
This commit is contained in:
Eli Zaretskii 2023-03-11 13:30:37 +02:00
parent 4803f97204
commit 157a91b54b
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/arc-mode.el
View file

@ -1960,6 +1960,16 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(goto-char (- (point-max) (- 22 18)))
(search-backward-regexp "[P]K\005\006")
(let ((p (archive-l-e (+ (point) 16) 4))
(w32-fname-encoding
;; On MS-Windows, both InfoZip's Zip and the system's
;; built-in File Explorer use the console codepage for
;; encoding file names. Problem: the codepage of the system
;; where the zip file was created cannot be known; we assume
;; it is the same as the one of the current system. Also,
;; the zip file doesn't tell us the OS where the file was
;; created, it only tells the filesystem.
(if (eq system-type 'windows-nt)
(intern (format "cp%d" (w32-get-console-codepage)))))
files)
(when (or (= p #xffffffff) (= p -1))
;; If the offset of end-of-central-directory is 0xFFFFFFFF, this
@ -1989,7 +1999,15 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
;; (lheader (archive-l-e (+ p 42) 4))
(efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen))))
(decode-coding-string
str archive-file-name-coding-system)))
str
(or (if (and w32-fname-encoding
(memq creator
;; This should be just 10 and
;; 14, but InfoZip uses 0 and
;; File Explorer uses 11(??).
'(0 10 11 14)))
w32-fname-encoding)
archive-file-name-coding-system))))
(ucsize (if (and (or (= ucsize #xffffffff) (= ucsize -1))
(> exlen 0))
;; APPNOTE.TXT, para 4.5.3: the Extra Field