From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.bugs Subject: bug#19865: tar-untar-buffer: should honor default-directory Date: Sat, 14 Feb 2015 16:27:29 +0000 Message-ID: <87bnkwbgr2.fsf@violet.siamics.net> References: <87a90gd91b.fsf@violet.siamics.net> <87oaowbkgv.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1423931309 30642 80.91.229.3 (14 Feb 2015 16:28:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Feb 2015 16:28:29 +0000 (UTC) To: 19865@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 14 17:28:17 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YMfZo-0007BC-R5 for geb-bug-gnu-emacs@m.gmane.org; Sat, 14 Feb 2015 17:28:17 +0100 Original-Received: from localhost ([::1]:60288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMfZo-0004uF-1V for geb-bug-gnu-emacs@m.gmane.org; Sat, 14 Feb 2015 11:28:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMfZf-0004mx-LJ for bug-gnu-emacs@gnu.org; Sat, 14 Feb 2015 11:28:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMfZb-0001OX-7k for bug-gnu-emacs@gnu.org; Sat, 14 Feb 2015 11:28:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMfZa-0001OP-1a for bug-gnu-emacs@gnu.org; Sat, 14 Feb 2015 11:28:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YMfZZ-0003Bj-J0 for bug-gnu-emacs@gnu.org; Sat, 14 Feb 2015 11:28:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Feb 2015 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19865 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19865-submit@debbugs.gnu.org id=B19865.142393126112229 (code B ref 19865); Sat, 14 Feb 2015 16:28:01 +0000 Original-Received: (at 19865) by debbugs.gnu.org; 14 Feb 2015 16:27:41 +0000 Original-Received: from localhost ([127.0.0.1]:43973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YMfZE-0003BA-Qv for submit@debbugs.gnu.org; Sat, 14 Feb 2015 11:27:41 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:43811) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YMfZC-0003B2-S9 for 19865@debbugs.gnu.org; Sat, 14 Feb 2015 11:27:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=k8UBoqFw+61BwC/s4G1xCFpOu3LupfRpaAlrFtSwuAY=; b=UhBzM/5fgyBDsPw7mX4r8I1CLeBRhn22ObsuiLL/0YGl/r0gfVqkG/YN0AVlWysLYIV98epavITWjZAdEc2OAeKkXsDOIoB2UGfttAOb/QgOof606GPVKmC4mOdkHB3Y8BVuGiFmOwUBdOVLvJaKJ/JtZZ9kykJgw+hSTGgNmTk=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YMfZB-0003XJ-8v for 19865@debbugs.gnu.org; Sat, 14 Feb 2015 16:27:37 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YMfZ4-0002ar-Fp for 19865@debbugs.gnu.org; Sat, 14 Feb 2015 23:27:30 +0700 Mail-Followup-To: 19865@debbugs.gnu.org In-Reply-To: <87oaowbkgv.fsf@violet.siamics.net> (Ivan Shmakov's message of "Sat, 14 Feb 2015 15:07:12 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:99392 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable >>>>> Ivan Shmakov writes: [=E2=80=A6] > Avoiding switching buffers until around the actual write-region call > may still be a better alternative (as that should make mistakes of > this kind hardier to introduce), but results in a lengthier patch. > Any opinion on which way I should go there? Per my reading of the code, with-current-buffer is generally used in tar-mode.el around the smallest fragments possible. Please thus consider the revised patch MIMEd, which I=E2=80=99ve tried to make consistent with such an approach. Also to note is that the awareness of the general =E2=80=9Cdata buffer default-directory=E2=80=9D issue dates back to 2001 at the least (considering the excerpt below, for instance), so I don=E2=80=99t seem to understand how making tar-untar-buffer consistent with the rest of the tar-mode.el code could ever be harmful? TIA. commit e8421604cdd386af0c32fb7cf698882ec6b74015 Author: Gerd Moellmann Date: 2001-08-07 13:36:14 +0000 (tar-extract): Avoid generating a new buffer for each file visited. From Markus Rost . $ git archive --format=3Dtar e8421604cdd3 -- tar-mode.el | tar -xO | nl -b= a=20 =E2=80=A6 749 ;; Set the default-directory to the dir of the 750 ;; superior buffer.=20 751 (setq default-directory 752 (save-excursion 753 (set-buffer tar-buffer) 754 default-directory)) =E2=80=A6 $=20 --=20 FSF associate member #7257 np. Meditation =E2=80=94 David Modica 3013 B6A0= 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 6c7f755..c6eef01 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -531,25 +531,28 @@ defun tar-untar-buffer () "Extract all archive members in the tar-file into the current directory." (interactive) ;; FIXME: make it work even if we're not in tar-mode. - (let ((descriptors tar-parse-info)) ;Read the var in its buffer. - (with-current-buffer - (if (tar-data-swapped-p) tar-data-buffer (current-buffer)) - (set-buffer-multibyte nil) ;Hopefully, a no-op. - (dolist (descriptor descriptors) - (let* ((name (tar-header-name descriptor)) - (dir (if (eq (tar-header-link-type descriptor) 5) - name - (file-name-directory name))) - (start (tar-header-data-start descriptor)) - (end (+ start (tar-header-size descriptor)))) - (unless (file-directory-p name) - (message "Extracting %s" name) - (if (and dir (not (file-exists-p dir))) - (make-directory dir t)) - (unless (file-directory-p name) - (let ((coding-system-for-write 'no-conversion)) - (write-region start end name))) - (set-file-modes name (tar-header-mode descriptor)))))))) + (let ((data-buf (if (tar-data-swapped-p) tar-data-buffer (current-buffer)))) + (with-current-buffer data-buf + (set-buffer-multibyte nil)) ; Hopefully, a no-op. + (dolist (descriptor tar-parse-info) + (let* ((name (tar-header-name descriptor)) + (dir (if (eq (tar-header-link-type descriptor) 5) + name + (file-name-directory name))) + (start (tar-header-data-start descriptor)) + (end (+ start (tar-header-size descriptor)))) + (unless (file-directory-p name) + (message "Extracting %s" name) + (if (and dir (not (file-exists-p dir))) + (make-directory dir t)) + (unless (file-directory-p name) + (let ((coding-system-for-write 'no-conversion) + ;; Note that default-directory may have a different + ;; value in the data buffer. + (name (expand-file-name name default-directory))) + (with-current-buffer data-buf + (write-region start end name)))) + (set-file-modes name (tar-header-mode descriptor))))))) (defun tar-summarize-buffer () "Parse the contents of the tar file in the current buffer." --=-=-=--