emacs: lisp/arc-mode.el comparison

comparison lisp/arc-mode.el @ 70388:000b130bfb7d

(archive-l-e): New optional argument `float' means generate a float value. (archive-arc-summarize, archive-lzh-summarize) (archive-zip-summarize, archive-zoo-summarize): Invoke archive-l-e with 3rd argument non-nil when file's size is being computed. Format the file sizes with %8.0f instead of %8d.

author	Eli Zaretskii <eliz@gnu.org>
date	Fri, 05 May 2006 10:54:55 +0000
parents	619b0c2000a6
children	2400f78c17e8

comparison

equal deleted inserted replaced

-:a995a8745b40
+:000b130bfb7d
 ;; Section: Support functions.
 (defsubst archive-name (suffix)
 (intern (concat "archive-" (symbol-name archive-subtype) "-" suffix)))
-(defun archive-l-e (str &optional len)
+(defun archive-l-e (str &optional len float)
 "Convert little endian string/vector STR to integer.
 Alternatively, STR may be a buffer position in the current buffer
-in which case a second argument, length LEN, should be supplied."
+in which case a second argument, length LEN, should be supplied.
+FLOAT, if non-nil, means generate and return a float instead of an integer
+\(use this for numbers that can overflow the Emacs integer)."
 (if (stringp str)
 (setq len (length str))
 (setq str (buffer-substring str (+ str len))))
 (let ((result 0)
 (i 0))
 (while (< i len)
 (setq i (1+ i)
-result (+ (ash result 8) (aref str (- len i)))))
+result (+ (if float (* result 256.0) (ash result 8))
+		      (aref str (- len i)))))
 result))
 (defun archive-int-to-mode (mode)
 "Turn an integer like 0700 (i.e., 448) into a mode string like -rwx------."
 ;; FIXME: merge with tar-grind-file-mode.
 		(= (char-after p) ?\C-z)
 		(> (char-after (1+ p)) 0))
 (let* ((namefld (buffer-substring (+ p 2) (+ p 2 13)))
 	     (fnlen   (or (string-match "\0" namefld) 13))
 	     (efnname (substring namefld 0 fnlen))
-(csize   (archive-l-e (+ p 15) 4))
+	     ;; Convert to float to avoid overflow for very large files.
+(csize   (archive-l-e (+ p 15) 4 'float))
 (moddate (archive-l-e (+ p 19) 2))
 (modtime (archive-l-e (+ p 21) 2))
-(ucsize  (archive-l-e (+ p 25) 4))
+(ucsize  (archive-l-e (+ p 25) 4 'float))
 	     (fiddle  (string= efnname (upcase efnname)))
 (ifnname (if fiddle (downcase efnname) efnname))
-(text    (format "  %8d  %-11s  %-8s  %s"
+(text    (format "  %8.0f  %-11s  %-8s  %s"
 ucsize
 (archive-dosdate moddate)
 (archive-dostime modtime)
 ifnname)))
 (setq maxlen (max maxlen fnlen)
 			"\n")))
 (insert "M   Length  Date         Time      File\n"
 	      dash)
 (archive-summarize-files (nreverse visual))
 (insert dash
-	      (format "  %8d                         %d file%s"
+	      (format "  %8.0f                         %d file%s"
 		      totalsize
 		      (length files)
 		      (if (= 1 (length files)) "" "s"))
 	      "\n"))
 (apply 'vector (nreverse files))))
 files
 	visual)
 (while (progn (goto-char p)		;beginning of a base header.
 		  (looking-at "\\(.\\|\n\\)\\(.\\|\n\\)-l[hz][0-9ds]-"))
 (let* ((hsize   (char-after p))	;size of the base header (level 0 and 1)
-	     (csize   (archive-l-e (+ p 7) 4)) ;size of a compressed file to follow (level 0 and 2),
+	     ;; Convert to float to avoid overflow for very large files.
+	     (csize   (archive-l-e (+ p 7) 4 'float)) ;size of a compressed file to follow (level 0 and 2),
 					;size of extended headers + the compressed file to follow (level 1).
-(ucsize  (archive-l-e (+ p 11) 4))	;size of an uncompressed file.
+(ucsize  (archive-l-e (+ p 11) 4 'float))	;size of an uncompressed file.
 	     (time1   (archive-l-e (+ p 15) 2))	;date/time (MSDOS format in level 0, 1 headers
 	     (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
 			(archive-dosdate time2))) ;level 0 and 1 header in DOS format
 	(setq modtime (if (= hdrlvl 2)
 			  (archive-unixtime time1 time2)
 			(archive-dostime time1)))
 	(setq text    (if archive-alternate-display
-			  (format "  %8d  %5S  %5S  %s"
+			  (format "  %8.0f  %5S  %5S  %s"
 				  ucsize
 				  (or uid "?")
 				  (or gid "?")
 				  ifnname)
-			(format "  %10s  %8d  %-11s  %-8s  %s"
+			(format "  %10s  %8.0f  %-11s  %-8s  %s"
 				modestr
 				ucsize
 				moddate
 				modtime
 				prname)))
 			"\n"))
 	  (header (if archive-alternate-display
 		       "M   Length    Uid    Gid  File\n"
 		    "M   Filemode    Length  Date         Time      File\n"))
 	  (sumline (if archive-alternate-display
-		       "  %8d                %d file%s"
+		       "  %8.0f                %d file%s"
-		     "              %8d                         %d file%s")))
+		     "              %8.0f                         %d file%s")))
 (insert header dash)
 (archive-summarize-files (nreverse visual))
 (insert dash
 	      (format sumline
 		      totalsize
 (while (string= "PK\001\002" (buffer-substring p (+ p 4)))
 (let* ((creator (char-after (+ p 5)))
 	     ;; (method  (archive-l-e (+ p 10) 2))
 (modtime (archive-l-e (+ p 12) 2))
 (moddate (archive-l-e (+ p 14) 2))
-(ucsize  (archive-l-e (+ p 24) 4))
+	     ;; Convert to float to avoid overflow for very large files.
+(ucsize  (archive-l-e (+ p 24) 4 'float))
 (fnlen   (archive-l-e (+ p 28) 2))
 (exlen   (archive-l-e (+ p 30) 2))
 (fclen   (archive-l-e (+ p 32) 2))
 (lheader (archive-l-e (+ p 42) 4))
 (efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen))))
 	     (fiddle  (and archive-zip-case-fiddle
 			   (not (not (memq creator '(0 2 4 5 9))))
 			   (string= (upcase efnname) efnname)))
 (ifnname (if fiddle (downcase efnname) efnname))
 	     (width (string-width ifnname))
-(text    (format "  %10s  %8d  %-11s  %-8s  %s"
+(text    (format "  %10s  %8.0f  %-11s  %-8s  %s"
 			      modestr
 ucsize
 (archive-dosdate moddate)
 (archive-dostime modtime)
 ifnname)))
 			"\n")))
 (insert "M Filemode      Length  Date         Time      File\n"
 	      dash)
 (archive-summarize-files (nreverse visual))
 (insert dash
-	      (format "              %8d                         %d file%s"
+	      (format "              %8.0f                         %d file%s"
 		      totalsize
 		      (length files)
 		      (if (= 1 (length files)) "" "s"))
 	      "\n"))
 (apply 'vector (nreverse files))))
 (while (and (string= "\334\247\304\375" (buffer-substring p (+ p 4)))
 		(> (archive-l-e (+ p 6) 4) 0))
 (let* ((next    (1+ (archive-l-e (+ p 6) 4)))
 (moddate (archive-l-e (+ p 14) 2))
 (modtime (archive-l-e (+ p 16) 2))
-(ucsize  (archive-l-e (+ p 20) 4))
+	     ;; Convert to float to avoid overflow for very large files.
+(ucsize  (archive-l-e (+ p 20) 4 'float))
 	     (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))
 			    (decode-coding-string str file-name-coding-system)
 			  (string-as-multibyte str))))
 	     (fiddle  (and (= lfnlen 0) (string= efnname (upcase efnname))))
 (ifnname (if fiddle (downcase efnname) efnname))
 	     (width (string-width ifnname))
-(text    (format "  %8d  %-11s  %-8s  %s"
+(text    (format "  %8.0f  %-11s  %-8s  %s"
 ucsize
 (archive-dosdate moddate)
 (archive-dostime modtime)
 ifnname)))
 (setq maxlen (max maxlen width)
 			"\n")))
 (insert "M   Length  Date         Time      File\n"
 	      dash)
 (archive-summarize-files (nreverse visual))
 (insert dash
-	      (format "  %8d                         %d file%s"
+	      (format "  %8.0f                         %d file%s"
 		      totalsize
 		      (length files)
 		      (if (= 1 (length files)) "" "s"))
 	      "\n"))
 (apply 'vector (nreverse files))))

Mercurial > emacs

comparison lisp/arc-mode.el @ 70388:000b130bfb7d