[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#10347: 24.0.50; archive-mode includes warning messages from unzip in
bug#10347: 24.0.50; archive-mode includes warning messages from unzip in the content of extracted files
Thu, 22 Dec 2011 14:23:30 -0800
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)
Juri Linkov <address@hidden> writes:
>> archive-extract-by-stdout intermingles stderr and stdout unless the
>> caller passes in a buffer to send the stderr too. As none of the callers
>> do, I think it would be best to disable stderr unless the caller
>> supplies a buffer.
>> [2. fix --- application/octet-stream; archive-mode-stdout.bundle]...
> Unfortunately, I can't read what you've encrypted into this git bundle.
> But I think we should use the same solution as we developed for
> `archive-7z-extract' - to redirect stdout into a temporary file
> and display its contents in the echo area.
It is a binary file, which is unfortunate. Mercurial has a way to export
a commit (or a set of commits) with all of the necessary metadata as a
text file that I really like, but I digress.
> This patch fixes `archive-zip-extract' by duplicating the logic of
Yes, this is a good idea. However, let's avoid duplicating the code by
defining a function. Here's what I've got so far, although it doesn't
actually display the messages, for whatever reason. I'll debug it when I
get a spare minute.
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 00023a6..442a258 100644
@@ -1113,7 +1113,7 @@ using `make-temp-file', and the generated name is
-(defun archive-extract-by-stdout (archive name command &optional stderr-file)
+(defun archive-extract-by-stdout-with-stderr (archive name command &optional
@@ -1121,6 +1121,16 @@ using `make-temp-file', and the generated name is
(append (cdr command) (list archive name))))
+(defun archive-extract-by-stdout (archive name command)
+ (let ((tmpfile (make-temp-file "zip-stderr")))
+ (prog1 (archive-extract-by-stdout archive name command tmpfile)
+ (insert-file-contents tmpfile)
+ (if (buffer-size)
+ (message "%s" (buffer-string)))
+ (delete-file tmpfile)))))
(defun archive-extract-other-window ()
"In archive mode, find this member in another window."
@@ -1826,9 +1836,7 @@ This doesn't recover lost files, it just undoes changes
in the buffer itself."
(let ((archive-7z-extract archive-zip-extract))
(archive-7z-extract archive name)))
- (let ((tmpfile (make-temp-file "zip-stderr")))
- (prog1 (archive-extract-by-stdout
+ (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
@@ -1840,13 +1848,7 @@ This doesn't recover lost files, it just undoes changes
in the buffer itself."
(equal (car archive-zip-extract) "unzip"))
- (insert-file-contents tmpfile)
- (unless (search-forward "Everything is Ok" nil t)
- (message "%s" (buffer-string)))
- (delete-file tmpfile)))))))
(defun archive-zip-write-file-member (archive descr)