* arc-mode.el (archive-zip-extract): Quote the argument passed to unzip (Bug#5475).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a12dc0256f9325b6addf83e64fa06aa1ce466b0..d6e3597f18c47541f3ed5cf7605f7de17c67ccad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+       * arc-mode.el (archive-zip-extract): Quote the argument passed to
+       unzip (Bug#5475).
+
 2010-01-28  Nil Geisweiller  <ngeiswei@googlemail.com>  (tiny change)
 
        * progmodes/flymake.el (flymake-allowed-file-name-masks)

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 3629a16f29efe3753c12fa16ca0b46ea26e48e6d..4a0576fdded2d7606086585d2df1c48edd37f9f6 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1784,7 +1784,10 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 (defun archive-zip-extract (archive name)
   (if (equal (car archive-zip-extract) "pkzip")
       (archive-*-extract archive name archive-zip-extract)
-    (archive-extract-by-stdout archive name archive-zip-extract)))
+    ;; unzip expands wildcards in NAME, so we need to quote it.
+    ;; FIXME: Does pkzip need similar treatment?
+    (archive-extract-by-stdout archive (shell-quote-argument name)
+                              archive-zip-extract)))
 
 (defun archive-zip-write-file-member (archive descr)
   (archive-*-write-file-member