;;; arc-mode.el --- simple editing of archives
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
-;; Author: Morten Welinder (terra@diku.dk)
+;; Author: Morten Welinder <terra@diku.dk>
;; Keywords: archives msdog editing major-mode
;; Favourite-brand-of-beer: None, I hate beer.
-;;; This file is part of GNU Emacs.
-;;;
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING. If not, write to
-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
-;;
+
;; NAMING: "arc" is short for "archive" and does not refer specifically
;; to files whose name end in ".arc"
;;
;; -------------------------------------------------------------------------
;; Section: Configuration.
-(defvar archive-dos-members t
- "*If non-nil then recognize member files using ^M^J as line terminator
-and do The Right Thing.")
-
-(defvar archive-tmpdir
- (expand-file-name
- (make-temp-name (if (eq system-type 'ms-dos) "ar" "archive.tmp"))
- (or (getenv "TMPDIR") (getenv "TMP") "/tmp"))
- "*Directory for temporary files made by arc-mode.el")
-
-(defvar archive-remote-regexp "^/[^/:]*[^/:]:"
- "*Regexp recognizing archive files names that are not local (i.e., are
-not proper file names outside Emacs). A local copy a the archive will
-be used when updating.")
-
-(defvar archive-extract-hooks nil
- "*Hooks to run when an archive member has been extracted.")
+(defgroup archive nil
+ "Simple editing of archives."
+ :group 'data)
+
+(defgroup archive-arc nil
+ "ARC-specific options to archive."
+ :group 'archive)
+
+(defgroup archive-lzh nil
+ "LZH-specific options to archive."
+ :group 'archive)
+
+(defgroup archive-zip nil
+ "ZIP-specific options to archive."
+ :group 'archive)
+
+(defgroup archive-zoo nil
+ "ZOO-specific options to archive."
+ :group 'archive)
+
+(defcustom archive-tmpdir
+ (make-temp-name
+ (expand-file-name (if (eq system-type 'ms-dos) "ar" "archive.tmp")
+ temporary-file-directory))
+ "*Directory for temporary files made by arc-mode.el"
+ :type 'directory
+ :group 'archive)
+
+(defcustom archive-remote-regexp "^/[^/:]*[^/:.]:"
+ "*Regexp recognizing archive files names that are not local.
+A non-local file is one whose file name is not proper outside Emacs.
+A local copy of the archive will be used when updating."
+ :type 'regexp
+ :group 'archive)
+
+(defcustom archive-extract-hooks nil
+ "*Hooks to run when an archive member has been extracted."
+ :type 'hook
+ :group 'archive)
;; ------------------------------
;; Arc archive configuration
;; We always go via a local file since there seems to be no reliable way
;; to extract to stdout without junk getting added.
-(defvar archive-arc-extract
+(defcustom archive-arc-extract
'("arc" "x")
- "*Program and its options to run in order to extract an arc file member
-to the current directory. Archive and member name will be added.")
-
-(defvar archive-arc-expunge
+ "*Program and its options to run in order to extract an arc file member.
+Extraction should happen to the current directory. Archive and member
+name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-arc)
+
+(defcustom archive-arc-expunge
'("arc" "d")
"*Program and its options to run in order to delete arc file members.
-Archive and member names will be added.")
-
-(defvar archive-arc-write-file-member
+Archive and member names will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-arc)
+
+(defcustom archive-arc-write-file-member
'("arc" "u")
"*Program and its options to run in order to update an arc file member.
-Archive and member name will be added.")
+Archive and member name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-arc)
;; ------------------------------
;; Lzh archive configuration
-(defvar archive-lzh-extract
+(defcustom archive-lzh-extract
'("lha" "pq")
- "*Program and its options to run in order to extract an lzh file member
-to standard output. Archive and member name will be added.")
-
-(defvar archive-lzh-expunge
+ "*Program and its options to run in order to extract an lzh file member.
+Extraction should happen to standard output. Archive and member name will
+be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-lzh)
+
+(defcustom archive-lzh-expunge
'("lha" "d")
"*Program and its options to run in order to delete lzh file members.
-Archive and member names will be added.")
-
-(defvar archive-lzh-write-file-member
+Archive and member names will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-lzh)
+
+(defcustom archive-lzh-write-file-member
'("lha" "a")
"*Program and its options to run in order to update an lzh file member.
-Archive and member name will be added.")
+Archive and member name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-lzh)
;; ------------------------------
;; Zip archive configuration
-(defvar archive-zip-use-pkzip (memq system-type '(ms-dos windows-nt))
- "*If non-nil then all zip options default to values suitable when using
-pkzip and pkunzip. Only set to true for msdog systems!")
-
-(defvar archive-zip-extract
- (if archive-zip-use-pkzip '("pkunzip" "-e") '("unzip" "-qq" "-c"))
- "*Program and its options to run in order to extract a zip file member
-to standard output. Archive and member name will be added.\n
-If `archive-zip-use-pkzip' is non-nil then this program is expected to
-extract to a file junking the directory part of the name.")
-
-;; For several reasons the latter behaviour is not desireable in general.
+(defcustom archive-zip-use-pkzip (memq system-type '(ms-dos windows-nt))
+ "*If non-nil then pkzip option are used instead of zip options.
+Only set to true for msdog systems!"
+ :type 'boolean
+ :group 'archive-zip)
+
+(defcustom archive-zip-extract
+ (if archive-zip-use-pkzip '("pkunzip" "-e" "-o-") '("unzip" "-qq" "-c"))
+ "*Program and its options to run in order to extract a zip file member.
+Extraction should happen to standard output. Archive and member name will
+be added. If `archive-zip-use-pkzip' is non-nil then this program is
+expected to extract to a file junking the directory part of the name."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zip)
+
+;; For several reasons the latter behaviour is not desirable in general.
;; (1) It uses more disk space. (2) Error checking is worse or non-
;; existent. (3) It tends to do funny things with other systems' file
;; names.
-(defvar archive-zip-expunge
+(defcustom archive-zip-expunge
(if archive-zip-use-pkzip '("pkzip" "-d") '("zip" "-d" "-q"))
"*Program and its options to run in order to delete zip file members.
-Archive and member names will be added.")
-
-(defvar archive-zip-update
+Archive and member names will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zip)
+
+(defcustom archive-zip-update
(if archive-zip-use-pkzip '("pkzip" "-u") '("zip" "-q"))
"*Program and its options to run in order to update a zip file member.
Options should ensure that specified directory will be put into the zip
-file. Archive and member name will be added.")
-
-(defvar archive-zip-update-case
+file. Archive and member name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zip)
+
+(defcustom archive-zip-update-case
(if archive-zip-use-pkzip archive-zip-update '("zip" "-q" "-k"))
- "*Program and its options to run in order to update a case fiddled
-zip file member. Options should ensure that specified directory will
-be put into the zip file. Archive and member name will be added.")
-
-(defvar archive-zip-case-fiddle t
- "*If non-nil then zip file members are mapped to lower case if created
-by a system that under single case file names.")
+ "*Program and its options to run in order to update a case fiddled zip member.
+Options should ensure that specified directory will be put into the zip file.
+Archive and member name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zip)
+
+(defcustom archive-zip-case-fiddle t
+ "*If non-nil then zip file members may be down-cased.
+This case fiddling will only happen for members created by a system
+that uses caseless file names."
+ :type 'boolean
+ :group 'archive-zip)
;; ------------------------------
;; Zoo archive configuration
-(defvar archive-zoo-extract
+(defcustom archive-zoo-extract
'("zoo" "xpq")
- "*Program and its options to run in order to extract a zoo file member
-to standard output. Archive and member name will be added.")
-
-(defvar archive-zoo-expunge
+ "*Program and its options to run in order to extract a zoo file member.
+Extraction should happen to standard output. Archive and member name will
+be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zoo)
+
+(defcustom archive-zoo-expunge
'("zoo" "DqPP")
"*Program and its options to run in order to delete zoo file members.
-Archive and member names will be added.")
-
-(defvar archive-zoo-write-file-member
+Archive and member names will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zoo)
+
+(defcustom archive-zoo-write-file-member
'("zoo" "a")
"*Program and its options to run in order to update a zoo file member.
-Archive and member name will be added.")
+Archive and member name will be added."
+ :type '(list (string :tag "Program")
+ (repeat :tag "Options"
+ :inline t
+ (string :format "%v")))
+ :group 'archive-zoo)
;; -------------------------------------------------------------------------
;; Section: Variables
(defvar archive-file-list-end nil "*Position just after last contents line.")
(defvar archive-proper-file-start nil "*Position of real archive's start.")
(defvar archive-read-only nil "*Non-nil if the archive is read-only on disk.")
-(defvar archive-remote nil "*Non-nil if the archive is outside file system.")
(defvar archive-local-name nil "*Name of local copy of remote archive.")
(defvar archive-mode-map nil "*Local keymap for archive mode listings.")
(defvar archive-file-name-indent nil "*Column where file names start.")
+(defvar archive-remote nil "*Non-nil if the archive is outside file system.")
+(make-variable-buffer-local 'archive-remote)
+(put 'archive-remote 'permanent-local t)
+
+(defvar archive-member-coding-system nil "Coding-system of archive member.")
+(make-variable-buffer-local 'archive-member-coding-system)
+
(defvar archive-alternate-display nil
"*Non-nil when alternate information is shown.")
(make-variable-buffer-local 'archive-alternate-display)
(make-variable-buffer-local 'archive-subfile-mode)
(put 'archive-subfile-mode 'permanent-local t)
-;; buffer-file-type is a per-buffer variable in the msdog configuration
-(if (boundp 'buffer-file-type) nil
- (defvar buffer-file-type nil
- "*Nil for dos-style text file, non-nil otherwise.")
- (make-variable-buffer-local 'buffer-file-type)
- (put 'buffer-file-type 'permanent-local t)
- (setq-default buffer-file-type nil))
-
-(defvar archive-subfile-dos nil
- "Negation of `buffer-file-type' which see.")
-(make-variable-buffer-local 'archive-subfile-dos)
-(put 'archive-subfile-dos 'permanent-local t)
-
-(defvar archive-files nil "Vector of file descriptors. Each descriptor is
-a vector of [ext-file-name int-file-name case-fiddled mode ...]")
+(defvar archive-files nil
+ "Vector of file descriptors.
+Each descriptor is a vector of the form
+ [EXT-FILE-NAME INT-FILE-NAME CASE-FIDDLED MODE ...]")
(make-variable-buffer-local 'archive-files)
(defvar archive-lemacs
(intern (concat "archive-" (symbol-name archive-subtype) "-" suffix)))
(defun archive-l-e (str &optional len)
- "Convert little endian string/vector to integer. Alternatively, first
-argument may be a buffer position in the current buffer in which case a
-second arguemnt, length, should be supplied."
+ "Convert little endian string/vector to integer.
+Alternatively, first argument may be a buffer position in the current buffer
+in which case a second argument, length, should be supplied."
(if (stringp str)
(setq len (length str))
(setq str (buffer-substring str (+ str len))))
str))
(defun archive-calc-mode (oldmode newmode &optional error)
- "From the integer OLDMODE and the string NEWMODE calculate a new file
-mode.\n
+ "From the integer OLDMODE and the string NEWMODE calculate a new file mode.
NEWMODE may be an octal number including a leading zero in which case it
will become the new mode.\n
NEWMODE may also be a relative specification like \"og-rwx\" in which case
0))
(defun archive-get-descr (&optional noerror)
- "Return the descriptor vector for file at point. Do not signal an error
-if optional second argument NOERROR is non-nil."
+ "Return the descriptor vector for file at point.
+Does not signal an error if optional second argument NOERROR is non-nil."
(let ((no (archive-get-lineno)))
(if (and (>= (point) archive-file-list-start)
(< no (length archive-files)))
;;;###autoload
(defun archive-mode (&optional force)
- "Major mode for viewing an archive file as a dired-like listing of its
-contents. You can move around using the usual cursor motion commands.
+ "Major mode for viewing an archive file in a dired-like way.
+You can move around using the usual cursor motion commands.
Letters no longer insert themselves.
Type `e' to pull a file out of the archive and into its own buffer;
or click mouse-2 on the file's line in the archive mode buffer.
(make-local-variable 'revert-buffer-function)
(setq revert-buffer-function 'archive-mode-revert)
(auto-save-mode 0)
- (make-local-variable 'local-write-file-hooks)
- (add-hook 'local-write-file-hooks 'archive-write-file)
- ;; Real file contents is binary
+ ;; Remote archives are not written by a hook.
+ (if archive-remote nil
+ (make-local-variable 'write-contents-hooks)
+ (add-hook 'write-contents-hooks 'archive-write-file))
+
(make-local-variable 'require-final-newline)
(setq require-final-newline nil)
(make-local-variable 'enable-local-variables)
(setq enable-local-variables nil)
- (setq buffer-file-type t)
(make-local-variable 'archive-read-only)
- (setq archive-read-only (not (file-writable-p (buffer-file-name))))
+ ;; Archives which are inside other archives and whose
+ ;; names are invalid for this OS, can't be written.
+ (setq archive-read-only
+ (or (not (file-writable-p (buffer-file-name)))
+ (and archive-subfile-mode
+ (string-match file-name-invalid-regexp
+ (aref archive-subfile-mode 0)))))
;; Should we use a local copy when accessing from outside Emacs?
(make-local-variable 'archive-local-name)
- (make-local-variable 'archive-remote)
- (setq archive-remote (string-match archive-remote-regexp
- (buffer-file-name)))
+
+ ;; An archive can contain another archive whose name is invalid
+ ;; on local filesystem. Treat such archives as remote.
+ (or archive-remote
+ (setq archive-remote
+ (or (string-match archive-remote-regexp (buffer-file-name))
+ (string-match file-name-invalid-regexp
+ (buffer-file-name)))))
(setq major-mode 'archive-mode)
(setq mode-name (concat typename "-Archive"))
(make-local-variable 'archive-file-list-start)
(make-local-variable 'archive-file-list-end)
(make-local-variable 'archive-file-name-indent)
- (archive-summarize)
+ (archive-summarize nil)
(setq buffer-read-only t))))
;; Archive mode is suitable only for specially formatted data.
))
(let* ((item1 '(archive-subfile-mode " Archive"))
- (item2 '(archive-subfile-dos " Dos"))
- (items (if (memq system-type '(ms-dos windows-nt))
- (list item1) ; msdog has its own indicator
- (list item1 item2))))
+ (items (list item1)))
(or (member item1 minor-mode-alist)
(setq minor-mode-alist (append items minor-mode-alist))))
;; -------------------------------------------------------------------------
;; as an archive by other software.
(let (case-fold-search)
(cond ((looking-at "[P]K\003\004") 'zip)
- ((looking-at "..-l[hz][0-9]-") 'lzh)
+ ((looking-at "..-l[hz][0-9ds]-") 'lzh)
((looking-at "....................[\334]\247\304\375") 'zoo)
((and (looking-at "\C-z") ; signature too simple, IMHO
(string-match "\\.[aA][rR][cC]$"
'arc)
(t (error "Buffer format not recognized.")))))
;; -------------------------------------------------------------------------
-(defun archive-summarize ()
+(defun archive-summarize (&optional shut-up)
"Parse the contents of the archive file in the current buffer.
Place a dired-like listing on the front;
then narrow to it, so that only that listing
-is visible (and the real data of the buffer is hidden)."
+is visible (and the real data of the buffer is hidden).
+Optional argument SHUT-UP, if non-nil, means don't print messages
+when parsing the archive."
(widen)
(let (buffer-read-only)
- (message "Parsing archive file...")
+ (or shut-up
+ (message "Parsing archive file..."))
(buffer-disable-undo (current-buffer))
(setq archive-files (funcall (archive-name "summarize")))
- (message "Parsing archive file...done.")
+ (or shut-up
+ (message "Parsing archive file...done."))
(setq archive-proper-file-start (point-marker))
(narrow-to-region (point-min) (point))
(set-buffer-modified-p nil)
buffer-read-only)
(widen)
(delete-region (point-min) archive-proper-file-start)
- (archive-summarize)
+ (archive-summarize t)
(set-buffer-modified-p modified)
(goto-char archive-file-list-start)
(archive-next-line no)))
(defun archive-summarize-files (files)
- "Insert a desciption of a list of files annotated with proper mouse face"
+ "Insert a description of a list of files annotated with proper mouse face."
(setq archive-file-list-start (point-marker))
(setq archive-file-name-indent (if files (aref (car files) 1) 0))
;; We don't want to do an insert for each element since that takes too
(setq archive-file-list-end (point-marker)))
(defun archive-alternate-display ()
- "Toggle alternative display. To avoid very long lines some archive mode
-don't show all information. This function changes the set of information
-shown for each files."
+ "Toggle alternative display.
+To avoid very long lines some archive mode don't show all information.
+This function changes the set of information shown for each files."
(interactive)
(setq archive-alternate-display (not archive-alternate-display))
(archive-resummarize))
;; -------------------------------------------------------------------------
;; Section: Local archive copy handling
+(defun archive-unique-fname (fname dir)
+ "Make sure a file FNAME can be created uniquely in directory DIR.
+
+If FNAME can be uniquely created in DIR, it is returned unaltered.
+If FNAME is something our underlying filesystem can't grok, or if another
+file by that name already exists in DIR, a unique new name is generated
+using `make-temp-name', and the generated name is returned."
+ (let ((fullname (expand-file-name fname dir))
+ (alien (string-match file-name-invalid-regexp fname)))
+ (if (or alien (file-exists-p fullname))
+ (make-temp-name
+ (expand-file-name
+ (if (and (eq system-type 'ms-dos) (not (msdos-long-file-names)))
+ "am"
+ "arc-mode.")
+ dir))
+ fullname)))
+
(defun archive-maybe-copy (archive)
- (if archive-remote
- (let ((start (point-max)))
- (setq archive-local-name (expand-file-name
- (file-name-nondirectory archive)
- archive-tmpdir))
- (make-directory archive-tmpdir t)
- (save-restriction
- (widen)
- (write-region start (point-max) archive-local-name nil 'nomessage))
- archive-local-name)
- (if (buffer-modified-p) (save-buffer))
- archive))
+ (let ((coding-system-for-write 'no-conversion))
+ (if archive-remote
+ (let ((start (point-max))
+ ;; Sometimes ARCHIVE is invalid while its actual name, as
+ ;; recorded in its parent archive, is not. For example, an
+ ;; archive bar.zip inside another archive foo.zip gets a name
+ ;; "foo.zip:bar.zip", which is invalid on DOS/Windows.
+ ;; So use the actual name if available.
+ (archive-name
+ (or (and archive-subfile-mode (aref archive-subfile-mode 0))
+ archive)))
+ (make-directory archive-tmpdir t)
+ (setq archive-local-name
+ (archive-unique-fname archive-name archive-tmpdir))
+ (save-restriction
+ (widen)
+ (write-region start (point-max) archive-local-name nil 'nomessage))
+ archive-local-name)
+ (if (buffer-modified-p) (save-buffer))
+ archive)))
(defun archive-maybe-update (unchanged)
(if archive-remote
(let ((name archive-local-name)
(modified (buffer-modified-p))
+ (coding-system-for-read 'no-conversion)
+ (lno (archive-get-lineno))
buffer-read-only)
(if unchanged nil
+ (setq archive-files nil)
(erase-buffer)
(insert-file-contents name)
- (archive-mode t))
+ (archive-mode t)
+ (goto-char archive-file-list-start)
+ (archive-next-line lno))
(archive-delete-local name)
(if (not unchanged)
- (message "Archive file must be saved for changes to take effect"))
+ (message
+ "Buffer `%s' must be saved for changes to take effect"
+ (buffer-name (current-buffer))))
(set-buffer-modified-p (or modified (not unchanged))))))
(defun archive-delete-local (name)
- "Delete (robust) the file NAME and its parents up to and including the
-value of `archive-tmpdir'."
+ "Delete file NAME and its parents up to and including `archive-tmpdir'."
(let ((again t)
(top (directory-file-name (file-name-as-directory archive-tmpdir))))
(condition-case nil
(arcname (file-name-nondirectory archive))
(bufname (concat (file-name-nondirectory iname) " (" arcname ")"))
(extractor (archive-name "extract"))
- (read-only-p (or archive-read-only view-p))
+ ;; Members with file names which aren't valid for the
+ ;; underlying filesystem, are treated as read-only.
+ (read-only-p (or archive-read-only
+ view-p
+ (string-match file-name-invalid-regexp ename)))
(buffer (get-buffer bufname))
(just-created nil))
(if buffer
(make-local-variable 'local-write-file-hooks)
(add-hook 'local-write-file-hooks 'archive-write-file-member)
(setq archive-subfile-mode descr)
- (setq archive-subfile-dos nil
- buffer-file-type t)
- (if (fboundp extractor)
- (funcall extractor archive ename)
- (archive-*-extract archive ename (symbol-value extractor)))
- (if archive-dos-members (archive-check-dos))
- (goto-char (point-min))
- (rename-buffer bufname)
- (setq buffer-read-only read-only-p)
- (setq buffer-undo-list nil)
- (set-buffer-modified-p nil)
- (setq buffer-saved-size (buffer-size))
- (normal-mode)
- ;; Just in case an archive occurs inside another archive.
- (if (eq major-mode 'archive-mode)
- (setq archive-remote t))
- (run-hooks 'archive-extract-hooks))
+ (if (and
+ (null
+ (if (fboundp extractor)
+ (funcall extractor archive ename)
+ (archive-*-extract archive ename (symbol-value extractor))))
+ just-created)
+ (progn
+ (set-buffer-modified-p nil)
+ (kill-buffer buffer))
+ (goto-char (point-min))
+ (rename-buffer bufname)
+ (setq buffer-read-only read-only-p)
+ (setq buffer-undo-list nil)
+ (set-buffer-modified-p nil)
+ (setq buffer-saved-size (buffer-size))
+ (normal-mode)
+ ;; Just in case an archive occurs inside another archive.
+ (if (eq major-mode 'archive-mode)
+ (progn
+ (setq archive-remote t)
+ (if read-only-p (setq archive-read-only t))
+ ;; We will write out the archive ourselves if it is
+ ;; part of another archive.
+ (remove-hook 'write-contents-hooks 'archive-write-file t)))
+ (run-hooks 'archive-extract-hooks)
+ (if archive-read-only
+ (message "Note: altering this archive is not implemented."))))
(archive-maybe-update t))
- (if view-p
- (progn
- (view-buffer buffer)
- (and just-created (setq view-exit-action 'kill-buffer)))
- (if (eq other-window-p 'display)
- (display-buffer buffer)
- (if other-window-p
- (switch-to-buffer-other-window buffer)
- (switch-to-buffer buffer))))))
+ (or (not (buffer-name buffer))
+ (progn
+ (if view-p
+ (view-buffer buffer (and just-created 'kill-buffer))
+ (if (eq other-window-p 'display)
+ (display-buffer buffer)
+ (if other-window-p
+ (switch-to-buffer-other-window buffer)
+ (switch-to-buffer buffer))))))))
(defun archive-*-extract (archive name command)
(let* ((default-directory (file-name-as-directory archive-tmpdir))
(tmpfile (expand-file-name (file-name-nondirectory name)
- default-directory)))
+ default-directory))
+ exit-status success)
(make-directory (directory-file-name default-directory) t)
- (apply 'call-process
- (car command)
- nil
- nil
- nil
- (append (cdr command) (list archive name)))
- (insert-file-contents tmpfile)
- (archive-delete-local tmpfile)))
+ (setq exit-status
+ (apply 'call-process
+ (car command)
+ nil
+ nil
+ nil
+ (append (cdr command) (list archive name))))
+ (cond ((and (numberp exit-status) (= exit-status 0))
+ (if (not (file-exists-p tmpfile))
+ (ding (message "`%s': no such file or directory" tmpfile))
+ (insert-file-contents tmpfile)
+ (setq success t)))
+ ((numberp exit-status)
+ (ding
+ (message "`%s' exited with status %d" (car command) exit-status)))
+ ((stringp exit-status)
+ (ding (message "`%s' aborted: %s" (car command) exit-status)))
+ (t
+ (ding (message "`%s' failed" (car command)))))
+ (archive-delete-local tmpfile)
+ success))
(defun archive-extract-by-stdout (archive name command)
- (let ((binary-process-output t)) ; for Ms-Dos
+ ;; We need the coding system of the output of the extract program,
+ ;; including the EOL encoding, be decoded dynamically, since what
+ ;; the extract program outputs is the contents of some file.
+ (let ((coding-system-for-read (or coding-system-for-read 'undecided))
+ (inherit-process-coding-system t))
(apply 'call-process
(car command)
nil
(archive-extract 'view))
(defun archive-add-new-member (arcbuf name)
- "Add the file in the current buffer to the archive in ARCBUF naming it
-NAME."
+ "Add current buffer to the archive in ARCBUF naming it NAME."
(interactive
(list (get-buffer
(read-buffer "Buffer containing archive: "
;; -------------------------------------------------------------------------
;; Section: IO stuff
-(defun archive-check-dos (&optional force)
- "*If this looks like a buffer with ^M^J as line terminator then remove
-those ^Ms and set archive-subfile-dos."
- (save-restriction
- (widen)
- (save-excursion
- (goto-char (point-min))
- (setq archive-subfile-dos
- (or force (not (search-forward-regexp "[^\r]\n" nil t))))
- (setq buffer-file-type (not archive-subfile-dos))
- (if archive-subfile-dos
- (let ((modified (buffer-modified-p)))
- (buffer-disable-undo (current-buffer))
- (goto-char (point-min))
- (while (search-forward "\r\n" nil t)
- (replace-match "\n"))
- (buffer-enable-undo)
- (set-buffer-modified-p modified))))))
-
(defun archive-write-file-member ()
- (if archive-subfile-dos
- (save-restriction
- (widen)
- (save-excursion
- (goto-char (point-min))
- ;; We don't want our ^M^J <--> ^J changes to show in the undo list
- (let ((undo-list buffer-undo-list))
- (unwind-protect
- (progn
- (setq buffer-undo-list t)
- (while (search-forward "\n" nil t)
- (replace-match "\r\n"))
- (setq archive-subfile-dos nil)
- (setq buffer-file-type t)
- ;; OK, we're now have explicit ^M^Js -- save and re-unixfy
- (archive-write-file-member))
- (progn
- (archive-check-dos t)
- (setq buffer-undo-list undo-list))))
- t))
- (save-excursion
- (save-restriction
- (message "Updating archive...")
- (widen)
- (let ((writer (save-excursion (set-buffer archive-superior-buffer)
- (archive-name "write-file-member")))
- (archive (save-excursion (set-buffer archive-superior-buffer)
- (buffer-file-name))))
- (if (fboundp writer)
- (funcall writer archive archive-subfile-mode)
- (archive-*-write-file-member archive
- archive-subfile-mode
- (symbol-value writer))))
+ (save-excursion
+ (save-restriction
+ (message "Updating archive...")
+ (widen)
+ (let ((writer (save-excursion (set-buffer archive-superior-buffer)
+ (archive-name "write-file-member")))
+ (archive (save-excursion (set-buffer archive-superior-buffer)
+ (archive-maybe-copy (buffer-file-name)))))
+ (if (fboundp writer)
+ (funcall writer archive archive-subfile-mode)
+ (archive-*-write-file-member archive
+ archive-subfile-mode
+ (symbol-value writer)))
(set-buffer-modified-p nil)
- (message "Updating archive...done")
- (set-buffer archive-superior-buffer)
- (revert-buffer)
- t))))
+ (message "Updating archive...done"))
+ (set-buffer archive-superior-buffer)
+ (if (not archive-remote) (revert-buffer) (archive-maybe-update nil))))
+ ;; Restore the value of last-coding-system-used, so that basic-save-buffer
+ ;; won't reset the coding-system of this archive member.
+ (if (local-variable-p 'archive-member-coding-system)
+ (setq last-coding-system-used archive-member-coding-system))
+ t)
(defun archive-*-write-file-member (archive descr command)
(let* ((ename (aref descr 0))
(unwind-protect
(progn
(make-directory (file-name-directory tmpfile) t)
- (write-region (point-min) (point-max) tmpfile nil 'nomessage)
+ ;; If the member is itself an archive, write it without
+ ;; the dired-like listing we created.
+ (if (eq major-mode 'archive-mode)
+ (archive-write-file tmpfile)
+ (write-region (point-min) (point-max) tmpfile nil 'nomessage))
+ ;; basic-save-buffer needs last-coding-system-used to have
+ ;; the value used to write the file, so save it before any
+ ;; further processing clobbers it (we restore it in
+ ;; archive-write-file-member, above).
+ (setq archive-member-coding-system last-coding-system-used)
(if (aref descr 3)
;; Set the file modes, but make sure we can read it.
(set-file-modes tmpfile (logior ?\400 (aref descr 3))))
(error "Updating was unsuccessful (%S)" exitcode))))
(archive-delete-local tmpfile))))
-(defun archive-write-file ()
+(defun archive-write-file (&optional file)
(save-excursion
- (write-region archive-proper-file-start (point-max) buffer-file-name nil t)
- (set-buffer-modified-p nil)
+ (let ((coding-system-for-write 'no-conversion))
+ (write-region archive-proper-file-start (point-max)
+ (or file buffer-file-name) nil t)
+ (set-buffer-modified-p nil))
t))
;; -------------------------------------------------------------------------
;; Section: Marking and unmarking.
(archive-next-line (- p)))
(defun archive-chmod-entry (new-mode)
- "Change the protection bits associated with all marked or this member
-in the archive.\n\
+ "Change the protection bits associated with all marked or this member.
The new protection bits can either be specified as an octal number or
as a relative change like \"g+rw\" as for chmod(2)"
(interactive "sNew mode (octal or relative): ")
(defun archive-mode-revert (&optional no-autosave no-confirm)
(let ((no (archive-get-lineno)))
(setq archive-files nil)
- (let ((revert-buffer-function nil))
+ (let ((revert-buffer-function nil)
+ (coding-system-for-read 'no-conversion))
(revert-buffer t t))
(archive-mode)
(goto-char archive-file-list-start)
(maxlen 8)
files
visual)
- (while (progn (goto-char p) (looking-at "..-l[hz][0-9]-"))
+ (while (progn (goto-char p)
+ (looking-at "\\(.\\|\n\\)\\(.\\|\n\\)-l[hz][0-9ds]-"))
(let* ((hsize (char-after p))
(csize (archive-l-e (+ p 7) 4))
(ucsize (archive-l-e (+ p 11) 4))
(modtime (archive-l-e (+ p 15) 2))
(moddate (archive-l-e (+ p 17) 2))
+ (hdrlvl (char-after (+ p 20)))
(fnlen (char-after (+ p 21)))
(efnname (buffer-substring (+ p 22) (+ p 22 fnlen)))
(fiddle (string= efnname (upcase efnname)))
(ifnname (if fiddle (downcase efnname) efnname))
(p2 (+ p 22 fnlen))
(creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
- (mode (if (= creator ?U) (archive-l-e (+ p2 8) 2) ?\666))
- (modestr (if mode (archive-int-to-mode mode) "??????????"))
- (uid (if (= creator ?U) (archive-l-e (+ p2 10) 2)))
- (gid (if (= creator ?U) (archive-l-e (+ p2 12) 2)))
- (text (if archive-alternate-display
+ mode modestr uid gid text path prname
+ )
+ (if (= hdrlvl 0)
+ (setq mode (if (= creator ?U) (archive-l-e (+ p2 8) 2) ?\666)
+ uid (if (= creator ?U) (archive-l-e (+ p2 10) 2))
+ gid (if (= creator ?U) (archive-l-e (+ p2 12) 2)))
+ (if (= creator ?U)
+ (let* ((p3 (+ p2 3))
+ (hsize (archive-l-e p3 2))
+ (etype (char-after (+ p3 2))))
+ (while (not (= hsize 0))
+ (cond
+ ((= etype 2) (let ((i (+ p3 3)))
+ (while (< i (+ p3 hsize))
+ (setq path (concat path
+ (if (= (char-after i)
+ 255)
+ "/"
+ (char-to-string
+ (char-after i)))))
+ (setq i (1+ i)))))
+ ((= etype 80) (setq mode (archive-l-e (+ p3 3) 2)))
+ ((= etype 81) (progn (setq uid (archive-l-e (+ p3 3) 2))
+ (setq gid (archive-l-e (+ p3 5) 2))))
+ )
+ (setq p3 (+ p3 hsize))
+ (setq hsize (archive-l-e p3 2))
+ (setq etype (char-after (+ p3 2)))))))
+ (setq prname (if path (concat path ifnname) ifnname))
+ (setq modestr (if mode (archive-int-to-mode mode) "??????????"))
+ (setq text (if archive-alternate-display
(format " %8d %5S %5S %s"
ucsize
(or uid "?")
ucsize
(archive-dosdate moddate)
(archive-dostime modtime)
- ifnname))))
+ ifnname)))
(setq maxlen (max maxlen fnlen)
totalsize (+ totalsize ucsize)
visual (cons (vector text
(- (length text) (length ifnname))
(length text))
visual)
- files (cons (vector efnname ifnname fiddle mode (1- p))
+ files (cons (vector prname ifnname fiddle mode (1- p))
files)
p (+ p hsize 2 csize))))
(goto-char (point-min))
(string= (file-name-nondirectory efnname) "")))
(mode (cond ((memq creator '(2 3)) ; Unix + VMS
(archive-l-e (+ p 40) 2))
- ((memq creator '(0 5 6 7 10 11)) ; Dos etc.
+ ((memq creator '(0 5 6 7 10 11 15)) ; Dos etc.
(logior ?\444
(if isdir (logior 16384 ?\111) 0)
(if (zerop
(t nil)))
(modestr (if mode (archive-int-to-mode mode) "??????????"))
(fiddle (and archive-zip-case-fiddle
- (not (not (memq creator '(0 2 4 5 9))))))
+ (not (not (memq creator '(0 2 4 5 9))))
+ (string= (upcase efnname) efnname)))
(ifnname (if fiddle (downcase efnname) efnname))
(text (format " %10s %8d %-11s %-8s %s"
modestr
(goto-char (+ p 40))
(delete-char 2)
(insert (logand newval 255) (lsh newval -8)))
- ((memq creator '(0 5 6 7 10 11)) ; Dos etc.
+ ((memq creator '(0 5 6 7 10 11 15)) ; Dos etc.
(goto-char (+ p 38))
(insert (logior (logand (char-after (point)) 254)
(logand (logxor 1 (lsh newval -7)) 1)))
(modtime (archive-l-e (+ p 16) 2))
(ucsize (archive-l-e (+ p 20) 4))
(namefld (buffer-substring (+ p 38) (+ p 38 13)))
+ (dirtype (char-after (+ p 4)))
+ (lfnlen (if (= dirtype 2) (char-after (+ p 56)) 0))
+ (ldirlen (if (= dirtype 2) (char-after (+ p 57)) 0))
(fnlen (or (string-match "\0" namefld) 13))
- (efnname (substring namefld 0 fnlen))
- (fiddle (string= efnname (upcase efnname)))
+ (efnname (concat
+ (if (> ldirlen 0)
+ (concat (buffer-substring
+ (+ p 58 lfnlen) (+ p 58 lfnlen ldirlen -1))
+ "/")
+ "")
+ (if (> lfnlen 0)
+ (buffer-substring (+ p 58) (+ p 58 lfnlen -1))
+ (substring namefld 0 fnlen))))
+ (fiddle (and (= lfnlen 0) (string= efnname (upcase efnname))))
(ifnname (if fiddle (downcase efnname) efnname))
(text (format " %8d %-11s %-8s %s"
ucsize
(archive-dosdate moddate)
(archive-dostime modtime)
ifnname)))
- (setq maxlen (max maxlen fnlen)
+ (setq maxlen (max maxlen (length ifnname))
totalsize (+ totalsize ucsize)
visual (cons (vector text
(- (length text) (length ifnname))
HCoop / bpt / emacs.git / blobdiff