fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make parsing of date-time more strict

Browse Source 
In parse_datetime() it was possible to enter any number of dates and
times in any order. Allow just date or time or date followed by time.

Time must be looked for before date because of conflicting time and date
formats.

Suggested-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-10-26 20:46:46 +02:00
parent 760c297027
commit 301f240881
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/utils.c
View File

@ -1126,30 +1126,35 @@ int parse_duration(const char *string, unsigned *duration)
int parse_datetime(const char *string, long *ts)
{
char *t = mem_strdup(string);
char *p = strtok(t, " ");
char *p = strchr(t, ' ');
unsigned int hour, minute;
int year, month, day;
struct date new_date;
int ret = 0;
while (p) {
if (parse_date(p, conf.input_datefmt, &year, &month, &day,
ui_calendar_get_slctd_day())) {
new_date.dd = day;
new_date.mm = month;
new_date.yyyy = year;
*ts = date2sec(new_date, 0, 0) + get_item_time(*ts);
ret |= PARSE_DATETIME_HAS_DATE;
} else if (parse_time(p, &hour, &minute) == 1) {
*ts = update_time_in_date(*ts, hour, minute);
ret |= PARSE_DATETIME_HAS_TIME;
} else {
return 0;
if (p) {
*p = '\0';
if (parse_date_interactive(t, &year, &month, &day) &&
parse_time(p + 1, &hour, &minute)) {
ret |= PARSE_DATETIME_HAS_DATE |
PARSE_DATETIME_HAS_TIME;
}
p = strtok(NULL, " ");
} else if (parse_date_interactive(t, &year, &month, &day)) {
ret |= PARSE_DATETIME_HAS_DATE;
} else if (parse_time(t, &hour, &minute)) {
ret |= PARSE_DATETIME_HAS_TIME;
}
if (ret & PARSE_DATETIME_HAS_DATE) {
new_date.dd = day;
new_date.mm = month;
new_date.yyyy = year;
*ts = date2sec(new_date, 0, 0) + get_item_time(*ts);
}
if (ret & PARSE_DATETIME_HAS_TIME)
*ts = update_time_in_date(*ts, hour, minute);
mem_free(t);
return ret;
}