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

Fix extraction of files with wildcards in names from zip archives

Browse source 
* lisp/arc-mode.el (archive-zip-extract): Quote wildcard
characters in file names as [C].  (Bug#67926)
This commit is contained in:
Eli Zaretskii 2023-12-28 16:51:45 +02:00
parent 24e71050ea
commit 714942b1c3
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/arc-mode.el
View file

@ -2108,16 +2108,14 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
(t
(archive-extract-by-stdout
archive
;; unzip expands wildcards in NAME, so we need to quote it. But
;; not on DOS/Windows, since that fails extraction on those
;; systems (unless w32-quote-process-args is nil), and file names
;; with wildcards in zip archives don't work there anyway.
;; FIXME: Does pkunzip need similar treatment?
(if (and (or (not (memq system-type '(windows-nt ms-dos)))
(and (boundp 'w32-quote-process-args)
(null w32-quote-process-args)))
(equal (car archive-zip-extract) "unzip"))
(shell-quote-argument name)
;; unzip expands wildcard characters in NAME, so we need to quote
;; wildcard characters in a special way: replace each such
;; character C with a single-character alternative [C]. We
;; cannot use 'shell-quote-argument' here because that doesn't
;; protect wildcard characters from being expanded by unzip
;; itself.
(if (equal (car archive-zip-extract) "unzip")
(replace-regexp-in-string "[[?*]" "[\\&]" name)
name)
archive-zip-extract))))