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#19274: tar-mode.el: allow for adding new archive members Date: Thu, 04 Dec 2014 21:17:54 +0000 Message-ID: <877fy7nmgt.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1417727967 2130 80.91.229.3 (4 Dec 2014 21:19:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 4 Dec 2014 21:19:27 +0000 (UTC) To: 19274@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 04 22:19:22 2014 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 1Xwdo1-0003vL-Mb for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Dec 2014 22:19:21 +0100 Original-Received: from localhost ([::1]:47748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwdo1-00015y-7a for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Dec 2014 16:19:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwdns-00015c-QS for bug-gnu-emacs@gnu.org; Thu, 04 Dec 2014 16:19:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xwdnj-00072k-8K for bug-gnu-emacs@gnu.org; Thu, 04 Dec 2014 16:19:12 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwdni-000727-Fi for bug-gnu-emacs@gnu.org; Thu, 04 Dec 2014 16:19:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xwdni-0002cr-7S for bug-gnu-emacs@gnu.org; Thu, 04 Dec 2014 16:19:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Dec 2014 21:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19274 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141772789010028 (code B ref -1); Thu, 04 Dec 2014 21:19:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Dec 2014 21:18:10 +0000 Original-Received: from localhost ([127.0.0.1]:54031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xwdmr-0002bd-HH for submit@debbugs.gnu.org; Thu, 04 Dec 2014 16:18:10 -0500 Original-Received: from fely.am-1.org ([78.47.74.50]:43489) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xwdmo-0002bT-1r for submit@debbugs.gnu.org; Thu, 04 Dec 2014 16:18:07 -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:Date:Sender:Subject:To:From; bh=MBxMoEJG5CJAPnTfe5NwOYdpkl+tzpV9CxqignFsb9I=; b=UtPcaIB5Hdo3VJnneABI3DWnVsSpcP3PHPGEjdUtqMFW58ktfSVHRA41uDTZ80YiiYNRD+lWrEl2muTd+PEom+cNglx1X0q/STQCkKqhVcyx7JwEKaNMdxWp9RYEoakHMj1OL/EkhQcVEjT3tNZTXL/rHZXqEoE69WJ9TdtJGfk=; 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 1Xwdml-0008VZ-1B for submit@debbugs.gnu.org; Thu, 04 Dec 2014 21:18:03 +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 1Xwdmd-0005m5-IB for submit@debbugs.gnu.org; Fri, 05 Dec 2014 04:17:55 +0700 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:96870 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs Severity: wishlist Please consider the patch MIMEd. * tar-mode.el: Allow for adding new archive members. (tar--pad-to, tar--put-at, tar-header-serialize): New functions. (tar-current-position): Split from tar-current-descriptor. (tar-current-descriptor): Use it. (tar-new-entry): New command. (tar-mode-map): Bind it. --=20 FSF associate member #7257 http://boycottsystemd.org/ =E2=80=A6 3013 B6A0= 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -369,6 +369,58 @@ string) (tar-parse-octal-integer string)) +(defun tar--pad-to (pos) + (make-string (+ pos (- (point)) (point-min)) 0)) + +(defun tar--put-at (pos val) + (when val + (insert (tar--pad-to pos) val))) + +(defun tar-header-serialize (header &optional update-checksum) + (with-temp-buffer + (set-buffer-multibyte nil) + (let ((encoded-name + (encode-coding-string (tar-header-name header) + tar-file-name-coding-system))) + (unless (< (length encoded-name) 99) + ;; FIXME: implement it + (error "Long file name support is not implemented")) + (insert encoded-name)) + (insert (tar--pad-to tar-mode-offset) + (format "%6o\0 " (logand #o777777 (tar-header-mode header))) + (format "%6o\0 " (logand #o777777 (tar-header-uid header))) + (format "%6o\0 " (logand #o777777 (tar-header-gid header)))) + (insert (tar--pad-to tar-size-offset) + (format "%11o " (tar-header-size header))) + (insert (tar--pad-to tar-time-offset) + (tar-octal-time (tar-header-date header)) + " ") + ;; omit tar-header-checksum (tar-chk-offset) for now + (tar--put-at tar-linkp-offset (tar-header-link-type header)) + (tar--put-at tar-link-offset (tar-header-link-name header)) + (when (tar-header-magic header) + (tar--put-at tar-magic-offset (tar-header-magic header)) + (tar--put-at tar-uname-offset (tar-header-uname header)) + (tar--put-at tar-gname-offset (tar-header-gname header)) + (let ((dmaj (tar-header-dmaj header)) + (dmin (tar-header-dmin header))) + (tar--put-at tar-dmaj-offset + (and dmaj (format "%7o\0" (logand #o7777777 dmaj)))) + (tar--put-at tar-dmin-offset + (and dmin (format "%7o\0" (logand #o7777777 dmin)))))) + (tar--put-at 512 "") + (let ((ck (tar-header-block-checksum (buffer-string)))) + (goto-char (+ (point-min) tar-chk-offset)) + (delete-char 8) + (insert (format "%6o\0 " ck)) + (when update-checksum + (setf (tar-header-checksum header) ck)) + (tar-header-block-check-checksum (buffer-string) + (tar-header-checksum header) + (tar-header-name header))) + ;; . + (buffer-string))) + (defun tar-header-block-checksum (string) "Compute and return a tar-acceptable checksum for this block." @@ -547,6 +599,7 @@ defvar tar-mode-map (define-key map "p" 'tar-previous-line) (define-key map "\^P" 'tar-previous-line) (define-key map [up] 'tar-previous-line) + (define-key map "I" 'tar-new-entry) (define-key map "R" 'tar-rename-entry) (define-key map "u" 'tar-unflag) (define-key map "v" 'tar-view) @@ -731,10 +784,14 @@ (interactive "p") (tar-next-line (- arg))) +(defun tar-current-position () + "Return the `tar-parse-info' index for the current line." + (count-lines (point-min) (line-beginning-position))) + (defun tar-current-descriptor (&optional noerror) "Return the tar-descriptor of the current line, or signals an error." ;; I wish lines had plists, like in ZMACS... - (or (nth (count-lines (point-min) (line-beginning-position)) + (or (nth (tar-current-position) tar-parse-info) (if noerror nil @@ -948,6 +1005,45 @@ (write-region start end to-file nil nil nil t))) (message "Copied tar entry %s to %s" name to-file))) +(defun tar-new-entry (filename &optional index) + "Insert a new empty regular file before point." + (interactive "*sNew file name: ") + (let* ((buffer (current-buffer)) + (index (or index (tar-current-position))) + (d-list (and (not (zerop index)) + (nthcdr (+ -1 index) tar-parse-info))) + (pos (if d-list + (tar-header-data-end (car d-list)) + (point-min))) + (new-descriptor + (make-tar-header + nil + filename + #o644 0 0 0 + (current-time) + nil ; checksum + nil nil + nil nil nil nil nil))) + ;; update the data buffer; fill the missing descriptor fields + (with-current-buffer tar-data-buffer + (goto-char pos) + (insert (tar-header-serialize new-descriptor t)) + (setf (tar-header-data-start new-descriptor) + (copy-marker (point) nil))) + ;; update tar-parse-info + (if d-list + (setcdr d-list (cons new-descriptor (cdr d-list))) + (setq tar-parse-info (cons new-descriptor + tar-parse-info))) + ;; update the listing buffer + (save-excursion + (goto-char (point-min)) + (forward-line index) + (let ((inhibit-read-only t)) + (insert (tar-header-block-summarize new-descriptor) ?\n))) + ;; . + index)) + (defun tar-flag-deleted (p &optional unflag) "In Tar mode, mark this sub-file to be deleted from the tar file. With a prefix argument, mark that many files." --=-=-=--