mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-24 05:16:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #3622: extfs/uzip: fix date parsing

Browse Source 
By default, on Unix systems, unzip gets compiled with MDY date order. Debian
based distros compile it with YMD order, for which this patch adds support.

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
This commit is contained in:
Mooffie 2016-03-17 17:34:45 +02:00 committed by Yury V. Zaytsev
parent db074dd954
commit a1d2c81d15
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vfs/extfs/helpers/uzip.in
View File

@ -35,12 +35,13 @@ my $cmd_delete = "$app_zip -d";
my $cmd_extract = "$app_unzip -p"; my $cmd_extract = "$app_unzip -p";
# -rw-r--r-- 2.2 unx 2891 tx 1435 defN 20000330.211927 ./edit.html # -rw-r--r-- 2.2 unx 2891 tx 1435 defN 20000330.211927 ./edit.html
# (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd)(HH)(MM) (fname) # (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd).(HH)(MM)(SS) (fname)
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(.*)$"; 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 # 2891 Defl:N 1435 50% 03-30-00 21:19 50cbaaf8 ./edit.html
# (size) (method) (zippedsize) (zipratio) (mm)(dd)(yy|yyyy)(HH)(MM) (cksum) (fname) # (size) (method) (zippedsize) (zipratio) (mm)-(dd)-(yy|yyyy) (HH):(MM) (cksum) (fname)
my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d?\d)-(\d?\d)-(\d+)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$"; # or: (yyyy)-(mm)-(dd)
my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d+)-(\d?\d)-(\d+)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$";
# #
# Main code # Main code
@ -261,9 +262,15 @@ sub mczipfs_list {
chomp; chomp;
my @match = /$regex_nonzipinfo_line/; my @match = /$regex_nonzipinfo_line/;
next if ($#match != 10); next if ($#match != 10);
# Massage the date.
my ($year, $month, $day) = $match[4] > 12
? ($match[4], $match[5], $match[6]) # 4,5,6 = Y,M,D
: ($match[6], $match[4], $match[5]); # 4,5,6 = M,D,Y
$year += ($year < 70 ? 2000 : 1900) if $year < 100; # Fix 2-digit year.
my @rmatch = ('', '', 'unknown', $match[0], '', $match[2], $match[1], my @rmatch = ('', '', 'unknown', $match[0], '', $match[2], $match[1],
$match[6] > 100 ? $match[6] : $match[6] + ($match[6] < 70 ? 2000 : 1900), $match[4], $match[5], $year, $month, $day, $match[7], $match[8], "00", $match[10]);
$match[7], $match[8], "00", $match[10]);
&checked_print_file(@rmatch); &checked_print_file(@rmatch);
} }
} }