From fe40b4ace11bc8a35603a6076afc74ea1fdc0769 Mon Sep 17 00:00:00 2001 From: Mathijs van de Nes Date: Mon, 13 Jul 2015 17:27:35 +0200 Subject: [PATCH] Disable date/time normalization The method may panic on Windows. Passing invalid dates is more preferable than correcting the date. --- Cargo.toml | 2 +- src/util.rs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index db708214..275412b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zip" -version = "0.1.9" +version = "0.1.10" authors = ["Mathijs van de Nes "] license = "MIT" repository = "https://github.com/mvdnes/zip-rs.git" diff --git a/src/util.rs b/src/util.rs index d4faceb1..5de61cac 100644 --- a/src/util.rs +++ b/src/util.rs @@ -24,7 +24,9 @@ pub fn msdos_datetime_to_tm(time: u16, date: u16) -> Tm // Re-parse the possibly incorrect timestamp to get a correct one. // This ensures every value will be in range - time::at_utc(tm.to_timespec()) + // TODO: Find an alternative way to do this since it may panic on Windows. + //time::at_utc(tm.to_timespec()) + tm } pub fn tm_to_msdos_time(time: Tm) -> u16 @@ -59,7 +61,8 @@ mod dos_tm_test { // The 0 date is actually not a correct msdos date, but we // will parse it and adjust accordingly. let tm = msdos_datetime_to_tm(0, 0); - check_date(tm, 30, 11, 1979); + //check_date(tm, 30, 11, 1979); // TODO: this is actually the preferred result, but not possible to obtain on Windows + check_date(tm, 0, 0, 1980); check_time(tm, 0, 0, 0); // This is the actual smallest date possible