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

Merge branch 'maint'

Browse Source
This commit is contained in:
Lukas Fleischer 2011-11-15 21:37:37 +01:00
commit 1ff6f39c86
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/io.c
View File

@ -1885,6 +1885,7 @@ ical_readline (FILE *fdi, char *buf, char *lstore, unsigned *ln)
if (*lstore != SPACE && *lstore != TAB) if (*lstore != SPACE && *lstore != TAB)
break; break;
strncat (buf, lstore + 1, BUFSIZ); strncat (buf, lstore + 1, BUFSIZ);
buf[BUFSIZ - 1] = '\0';
(*ln)++; (*ln)++;
} }
@ -2392,7 +2393,8 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints,
skip_alarm = 0; skip_alarm = 0;
while (ical_readline (fdi, buf, lstore, lineno)) while (ical_readline (fdi, buf, lstore, lineno))
{ {
memcpy (buf_upper, buf, strlen (buf)); strncpy (buf_upper, buf, BUFSIZ);
buf_upper[BUFSIZ - 1] = '\0';
str_toupper (buf_upper); str_toupper (buf_upper);
if (skip_alarm) if (skip_alarm)
@ -2576,7 +2578,8 @@ ical_read_todo (FILE *fdi, FILE *log, unsigned *notodos, unsigned *noskipped,
skip_alarm = 0; skip_alarm = 0;
while (ical_readline (fdi, buf, lstore, lineno)) while (ical_readline (fdi, buf, lstore, lineno))
{ {
memcpy (buf_upper, buf, strlen (buf)); strncpy (buf_upper, buf, BUFSIZ);
buf_upper[BUFSIZ - 1] = '\0';
str_toupper (buf_upper); str_toupper (buf_upper);
if (skip_alarm) if (skip_alarm)
{ {