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

Add a couple of shorthands to parse_date()

Browse Source 
We now understand the shorthands "today", "yesterday", "tomorrow" and
"now" which might come in useful sometimes.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-02-07 11:37:15 +01:00
parent 283a86c217
commit 4350494d3b
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/utils.c
View File

@ -36,6 +36,7 @@
#include <time.h> #include <time.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <unistd.h> #include <unistd.h>
@ -646,6 +647,16 @@ char *new_tempfile(const char *prefix)
return fullname; return fullname;
} }
static void ymd_from_time_t(int *year, int *month, int *day, time_t t)
{
struct tm tm;
localtime_r(&t, &tm);
*day = tm.tm_mday;
*month = tm.tm_mon + 1;
*year = tm.tm_year + 1900;
}
/* /*
* Check if a date is valid. * Check if a date is valid.
*/ */
@ -679,6 +690,20 @@ parse_date(const char *date_string, enum datefmt datefmt, int *year,
if (!date_string) if (!date_string)
return 0; return 0;
if (!strcasecmp(date_string, "today")) {
ymd_from_time_t(year, month, day, get_today());
return 1;
} else if (!strcasecmp(date_string, "yesterday")) {
ymd_from_time_t(year, month, day, get_today() - DAYINSEC);
return 1;
} else if (!strcasecmp(date_string, "tomorrow")) {
ymd_from_time_t(year, month, day, get_today() + DAYINSEC);
return 1;
} else if (!strcasecmp(date_string, "now")) {
ymd_from_time_t(year, month, day, now());
return 1;
}
/* parse string into in[], read up to three integers */ /* parse string into in[], read up to three integers */
for (p = date_string; *p; p++) { for (p = date_string; *p; p++) {
if (*p == sep) { if (*p == sep) {