Changeset 4204 for trunk/lisp/arc-mode.el

Timestamp:

05/01/07 18:04:59 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs_22_BASE.

Files:

• trunk/lisp/arc-mode.el (modified) (5 diffs)

trunk/lisp/arc-mode.el

@@ -701 +701 @@
-                              (or buffer-file-name (buffer-name))))
-           'arc)
+          ;; This pattern modelled on the BSD/GNU+Linux `file' command.
+          ;; Have seen capital "LHA's", and file has lower case "LHa's" too.
+          ;; Note this regexp is also in archive-exe-p.
+          ((looking-at "MZ\\(.\\|\n\\)\\{34\\}LH[aA]'s SFX ") 'lzh-exe)
-          (t (error "Buffer format not recognized")))))
-;; -------------------------------------------------------------------------
@@ -1399 +1403 @@
-;; Section: Lzh Archives
-
-
-1)
+&optional start
+(or start 1)) ;; 1 for .lzh, something further on for .exe
-        (totalsize 0)
-        (maxlen 8)
@@ -1416 +1420 @@
-             (hdrlvl  (char-after (+ p 20))) ;header level
-             thsize             ;total header size (base + extensions)
-
+osid 
-             neh        ;beginning of next extension header (level 1 and 2)
-             mode modestr uid gid text dir prname
@@ -1475 +1479 @@
-        (if (= hdrlvl 0)  ;total header size
-            (setq thsize hsize))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        (setq ifnname (if fiddle (downcase efnname) efnname))
-        (setq prname (if dir (concat dir ifnname) ifnname))
@@ -1607 +1626 @@
-   (lambda (old) (archive-calc-mode old newmode t))
-   files "a unix-style mode" 8))
+
+;; -------------------------------------------------------------------------
+;; Section: Lzh Self-Extracting .exe Archives
+;;
+;; No support for modifying these files.  It looks like the lha for unix
+;; program (as of version 1.14i) can't create or retain the DOS exe part.
+;; If you do an "lha a" on a .exe for instance it renames and writes to a
+;; plain .lzh.
+
+(defun archive-lzh-exe-summarize ()
+  "Summarize the contents of an LZH self-extracting exe, for `archive-mode'."
+
+  ;; Skip the initial executable code part and apply archive-lzh-summarize
+  ;; to the archive part proper.  The "-lh5-" etc regexp here for the start
+  ;; is the same as in archive-find-type.
+  ;;
+  ;; The lha program (version 1.14i) does this in skip_msdos_sfx1_code() by
+  ;; a similar scan.  It looks for "..-l..-" plus for level 0 or 1 a test of
+  ;; the header checksum, or level 2 a test of the "attribute" and size.
+  ;;
+  (re-search-forward "..-l[hz][0-9ds]-" nil)
+  (archive-lzh-summarize (match-beginning 0)))
+
+;; `archive-lzh-extract' runs "lha pq", and that works for .exe as well as
+;; .lzh files
+(defalias 'archive-lzh-exe-extract 'archive-lzh-extract
+  "Extract a member from an LZH self-extracting exe, for `archive-mode'.")
+
-;; -------------------------------------------------------------------------
-;; Section: Zip Archives