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

Allow newlines in SUMMARY by replacing them with blanks

Browse Source 
Addresses Github issue #414 (Android calendar allows them).

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2022-03-13 18:12:26 +01:00 committed by Lukas Fleischer
parent 01ad848628
commit ec38714bbc
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ical.c
View File

@ -1331,12 +1331,9 @@ static char *ical_read_summary(char *line, unsigned *noskipped,
} }
/* An event summary is one line only. */ /* An event summary is one line only. */
if (strchr(summary, '\n')) { for (p = summary; *p; p++)
ical_log(log, item_type, itemline, _("line break in summary.")); if (*p == '\n')
(*noskipped)++; *p = ' ';
mem_free(summary);
summary = NULL;
}
leave: leave:
return summary; return summary;
} }

3
test/ical-009.sh
View File

@ -18,7 +18,7 @@ if [ "$1" = 'actual' ]; then
elif [ "$1" = 'expected' ]; then elif [ "$1" = 'expected' ]; then
cat <<EOD cat <<EOD
Import process report: 0131 lines read Import process report: 0131 lines read
2 apps / 0 events / 1 todo / 21 skipped 3 apps / 0 events / 1 todo / 20 skipped
VEVENT [12]: invalid or malformed event start time. VEVENT [12]: invalid or malformed event start time.
VEVENT [17]: item start date not defined. VEVENT [17]: item start date not defined.
VEVENT [21]: rrule frequency not supported. VEVENT [21]: rrule frequency not supported.
@ -26,7 +26,6 @@ VEVENT [27]: malformed summary line.
VTODO [32]: item priority is invalid (must be between 0 and 9). VTODO [32]: item priority is invalid (must be between 0 and 9).
VEVENT [36]: malformed exceptions line. VEVENT [36]: malformed exceptions line.
VEVENT [43]: exception date, but no recurrence rule. VEVENT [43]: exception date, but no recurrence rule.
VEVENT [49]: line break in summary.
VEVENT [54]: malformed description line. VEVENT [54]: malformed description line.
VEVENT [60]: malformed description. VEVENT [60]: malformed description.
VTODO [72]: malformed summary. VTODO [72]: malformed summary.