(archive-zoo-summarize): Properly handle the case of

a short file name with a non-empty directory part.

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 767093ef51de5ddd13c701f13d5b9a50568912ba..0936e1f40db79d434f7529039782d04da24456e5 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1526,10 +1526,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
             (dirtype (char-after (+ p 4)))
             (lfnlen  (if (= dirtype 2) (char-after (+ p 56)) 0))
             (ldirlen (if (= dirtype 2) (char-after (+ p 57)) 0))
-            (fnlen   (+ ldirlen
-                        (if (> lfnlen 0)
-                            (1- lfnlen)
-                          (or (string-match "\0" namefld) 13))))
+            (fnlen   (or (string-match "\0" namefld) 13))
             (efnname (concat
                       (if (> ldirlen 0)
                           (concat (buffer-substring
@@ -1546,7 +1543,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                               (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))