From 972d0198a9ddf434b81cf7392f6617a5170edfb3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 25 Apr 2006 10:29:47 +0000 Subject: [PATCH] (get_date): When adding relative date, start with the initial time, not with the result of the first mktime call. --- lib/ChangeLog | 5 +++++ lib/getdate.y | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index b5ebafdd0d..3721380728 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-04-25 Paul Eggert + + * getdate.y (get_date): When adding relative date, start with the + initial time, not with the result of the first mktime call. + 2006-04-17 Paul Eggert * filemode.c: Include "filemode.h" first, to test the interface. diff --git a/lib/getdate.y b/lib/getdate.y index dafc0eae47..cfa299f38a 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -1,7 +1,7 @@ %{ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005 Free Software + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -1437,6 +1437,10 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) tm.tm_year = year; tm.tm_mon = month; tm.tm_mday = day; + tm.tm_hour = tm0.tm_hour; + tm.tm_min = tm0.tm_min; + tm.tm_sec = tm0.tm_sec; + tm.tm_isdst = tm0.tm_isdst; Start = mktime (&tm); if (Start == (time_t) -1) goto fail; -- 2.47.3