From bdbfe3bfd60b514733b77cfd7debe66e1b3a60f8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 16 Apr 2007 19:40:14 +0000 Subject: (archive-lzh-summarize): Only apply the "downcase if all upcase" rule to OS-ID 0 "generic". Always downcase for OS-ID M "MSDOS". --- lisp/arc-mode.el | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'lisp/arc-mode.el') diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 1b0f3a3d584..8630d3e8b06 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -1415,7 +1415,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (time2 (archive-l-e (+ p 17) 2)) ;and UNIX format in level 2 header.) (hdrlvl (char-after (+ p 20))) ;header level thsize ;total header size (base + extensions) - fnlen efnname fiddle ifnname width p2 + fnlen efnname osid fiddle ifnname width p2 neh ;beginning of next extension header (level 1 and 2) mode modestr uid gid text dir prname gname uname modtime moddate) @@ -1474,7 +1474,22 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (setq thsize (- neh p)))) (if (= hdrlvl 0) ;total header size (setq thsize hsize)) - (setq fiddle (if efnname (string= efnname (upcase efnname)))) + ;; OS ID field not present in level 0 header, use code 0 "generic" + ;; in that case as per lha program header.c get_header() + (setq osid (cond ((= hdrlvl 0) 0) + ((= hdrlvl 1) (char-after (+ p 22 fnlen 2))) + ((= hdrlvl 2) (char-after (+ p 23))))) + ;; Filename fiddling must follow the lha program, otherwise the name + ;; passed to "lha pq" etc won't match (which for an extract silently + ;; results in no output). As of version 1.14i it goes from the OS ID, + ;; - For 'M' MSDOS: msdos_to_unix_filename() downcases always, and + ;; converts "\" to "/". + ;; - For 0 generic: generic_to_unix_filename() downcases if there's + ;; no lower case already present, and converts "\" to "/". + ;; - For 'm' MacOS: macos_to_unix_filename() changes "/" to ":" and + ;; ":" to "/" + (setq fiddle (cond ((= ?M osid) t) + ((= 0 osid) (string= efnname (upcase efnname))))) (setq ifnname (if fiddle (downcase efnname) efnname)) (setq prname (if dir (concat dir ifnname) ifnname)) (setq width (if prname (string-width prname) 0)) -- cgit v1.2.1 From fcb006c4ee97e3413a794c543367b771f0237495 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 19 Apr 2007 23:53:02 +0000 Subject: (archive-find-type): lzh-exe for lzh self-extracting exe. (archive-lzh-summarize): Add optional start arg for where to start looking at the archive. (archive-lzh-exe-summarize, archive-lzh-exe-extract): New functions. --- lisp/arc-mode.el | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'lisp/arc-mode.el') diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 8630d3e8b06..1a22ac628e6 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -700,6 +700,10 @@ archive. (string-match "\\.[aA][rR][cC]$" (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"))))) ;; ------------------------------------------------------------------------- (defun archive-summarize (&optional shut-up) @@ -1398,8 +1402,8 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." ;; ------------------------------------------------------------------------- ;; Section: Lzh Archives -(defun archive-lzh-summarize () - (let ((p 1) +(defun archive-lzh-summarize (&optional start) + (let ((p (or start 1)) ;; 1 for .lzh, something further on for .exe (totalsize 0) (maxlen 8) files @@ -1621,6 +1625,34 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." ;; This should work even though newmode will be dynamically accessed. (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 -- cgit v1.2.1