Mercurial > emacs
comparison lisp/arc-mode.el @ 107071:bdf05c504564
* arc-mode.el (archive-zip-extract): Use `member-ignore-case' to
compare with "pkunzip" and "pkzip" instead of only "pkzip".
In the `archive-extract-by-stdout' branch use `shell-quote-argument'
only when (car archive-zip-extract) is "unzip". (Bug#5475)
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Tue, 02 Feb 2010 00:35:04 +0200 |
parents | 2220de986185 |
children | 00c6bb12d924 |
comparison
equal
deleted
inserted
replaced
107070:456aad5db2ee | 107071:bdf05c504564 |
---|---|
1780 (if (= 1 (length files)) "" "s")) | 1780 (if (= 1 (length files)) "" "s")) |
1781 "\n")) | 1781 "\n")) |
1782 (apply 'vector (nreverse files)))) | 1782 (apply 'vector (nreverse files)))) |
1783 | 1783 |
1784 (defun archive-zip-extract (archive name) | 1784 (defun archive-zip-extract (archive name) |
1785 (if (equal (car archive-zip-extract) "pkzip") | 1785 (if (member-ignore-case (car archive-zip-extract) '("pkunzip" "pkzip")) |
1786 (archive-*-extract archive name archive-zip-extract) | 1786 (archive-*-extract archive name archive-zip-extract) |
1787 ;; unzip expands wildcards in NAME, so we need to quote it. | 1787 (archive-extract-by-stdout |
1788 ;; FIXME: Does pkzip need similar treatment? | 1788 archive |
1789 (archive-extract-by-stdout archive (shell-quote-argument name) | 1789 ;; unzip expands wildcards in NAME, so we need to quote it. |
1790 archive-zip-extract))) | 1790 ;; FIXME: Does pkunzip need similar treatment? |
1791 (if (equal (car archive-zip-extract) "unzip") | |
1792 (shell-quote-argument name) | |
1793 name) | |
1794 archive-zip-extract))) | |
1791 | 1795 |
1792 (defun archive-zip-write-file-member (archive descr) | 1796 (defun archive-zip-write-file-member (archive descr) |
1793 (archive-*-write-file-member | 1797 (archive-*-write-file-member |
1794 archive | 1798 archive |
1795 descr | 1799 descr |