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

Merge branch 'maint'

Browse Source 
Conflicts:
	src/day.c
	src/recur.c
This commit is contained in:
Lukas Fleischer
2012-11-23 18:46:38 +01:00
parent 7733d52f32 0ea23c24bf
commit 1f0f05ecc1
12 changed files with 244 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/args.c
View File

@@ -270,11 +270,11 @@ static void arg_print_date(long date)
{
char date_str[BUFSIZ];
time_t t;
struct tm *lt;
struct tm lt;
t = date;
lt = localtime(&t);
strftime(date_str, BUFSIZ, conf.output_datefmt, lt);
localtime_r(&t, &lt);
strftime(date_str, BUFSIZ, conf.output_datefmt, &lt);
fputs(date_str, stdout);
fputs(":\n", stdout);
}
@@ -366,7 +366,7 @@ date_arg(const char *ddate, int add_line, const char *fmt_apt,
* to format the output correctly.
*/
timer = time(NULL);
t = *localtime(&timer);
localtime_r(&timer, &t);
display_app(&t, numdays, add_line, fmt_apt, fmt_rapt, fmt_ev, fmt_rev,
regex);
} else { /* a date was entered */
@@ -412,7 +412,7 @@ date_arg_extended(const char *startday, const char *range, int add_line,
numdays = atoi(range);
}
timer = time(NULL);
t = *localtime(&timer);
localtime_r(&timer, &t);
if (startday != NULL) {
if (parse_date(startday, conf.input_datefmt, (int *)&t.tm_year,
(int *)&t.tm_mon, (int *)&t.tm_mday, NULL)) {