From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 21 Mar 2008 13:10:09 +0000 (-0400)
Subject: debugfs, tune2fs: Handle daylight savings time when parsing a time string
X-Git-Tag: v1.40.9~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2ff0f31c1987a480ffc4dacb7adf93f0aecf7f6;p=thirdparty%2Fe2fsprogs.git

debugfs, tune2fs: Handle daylight savings time when parsing a time string

We need to set tm_isdst to -1 so that mktime will automatically
determine whether or not daylight savings time (DST) is in effect.
Previously tm_isdst was set to 0, which caused mktime to interpret the
time as if it was always not using DST.

Addresses-Debian-Bug: #471882

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/debugfs/util.c b/debugfs/util.c
index 06339601e..ebce9d610 100644
--- a/debugfs/util.c
+++ b/debugfs/util.c
@@ -231,6 +231,7 @@ extern time_t string_to_time(const char *arg)
 	    ts.tm_min > 59 || ts.tm_sec > 61)
 		ts.tm_mday = 0;
 #endif
+	ts.tm_isdst = -1;
 	ret = mktime(&ts);
 	if (ts.tm_mday == 0 || ret == ((time_t) -1)) {
 		/* Try it as an integer... */
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 4f66d42b0..4e731f5cc 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -540,6 +540,7 @@ static time_t parse_time(char *str)
 			str);
 		usage();
 	}
+	ts.tm_isdst = -1;
 	return (mktime(&ts));
 }