Browse Source

* extfs/uzip.in: Widened the regular expression for infozip to
also detect non-Unix file listings.

Patch provided by Jindrich Makovicka <makovick * kmlinux.fjfi.cvut.cz>

Roland Illig 20 years ago
parent
commit
9a020da9c6
2 changed files with 8 additions and 1 deletions
  1. 7 0
      vfs/ChangeLog
  2. 1 1
      vfs/extfs/uzip.in

+ 7 - 0
vfs/ChangeLog

@@ -1,3 +1,10 @@
+2005-02-09  Roland Illig  <roland.illig@gmx.de>
+
+	* extfs/uzip.in: Widened the regular expression for infozip to
+	also detect non-Unix file listings.
+
+	Patch provided by Jindrich Makovicka <makovick * kmlinux.fjfi.cvut.cz>
+
 2005-02-08  Roland Illig  <roland.illig@gmx.de>
 
 	* cpio.c: Added some FIXMEs about data representation.

+ 1 - 1
vfs/extfs/uzip.in

@@ -36,7 +36,7 @@ my $cmd_extract = "$app_unzip -p";
 
 # -rw-r--r--  2.2 unx     2891 tx     1435 defN 20000330.211927 ./edit.html
 # (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd)(HH)(MM) (fname)
-my $regex_zipinfo_line = qr"^(\S{10})\s+(\d+\.\d+)\s+(\S+)\s+(\d+)\s+(\S\S)\s+(\d+)\s+(\S{4})\s+(\d{4})(\d\d)(\d\d)\.(\d\d)(\d\d)(\d\d)\s(.*)$";
+my $regex_zipinfo_line = qr"^(\S{7,10})\s+(\d+\.\d+)\s+(\S+)\s+(\d+)\s+(\S\S)\s+(\d+)\s+(\S{4})\s+(\d{4})(\d\d)(\d\d)\.(\d\d)(\d\d)(\d\d)\s(.*)$";
 
 #     2891  Defl:N     1435  50%  03-30-00 21:19  50cbaaf8  ./edit.html
 # (size) (method) (zippedsize) (zipratio) (mm)(dd)(yy)(HH)(MM) (cksum) (fname)