From bcc820ea743e0448b26a8fee5e8e0a9f85bc3c70 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 18 Aug 2014 11:29:46 +0200 Subject: Handle CRLF line endings in iCal files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RFC 2445 mentions that CRLF line endings may be used in iCal files. Handle them properly when importing. Reported-by: HÃ¥kan Jerning Signed-off-by: Lukas Fleischer --- test/Makefile.am | 2 ++ test/data/ical-004.ical | 12 ++++++++++++ test/ical-004.sh | 28 ++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 test/data/ical-004.ical create mode 100755 test/ical-004.sh (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index d036a1d..18513d3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -45,6 +45,7 @@ TESTS = \ ical-001.sh \ ical-002.sh \ ical-003.sh \ + ical-004.sh \ next-001.sh \ search-001.sh \ bug-002.sh \ @@ -105,4 +106,5 @@ EXTRA_DIST = \ data/ical-001.ical \ data/ical-002.ical \ data/ical-003.ical \ + data/ical-004.ical \ data/todo diff --git a/test/data/ical-004.ical b/test/data/ical-004.ical new file mode 100644 index 0000000..0ee3bcb --- /dev/null +++ b/test/data/ical-004.ical @@ -0,0 +1,12 @@ +BEGIN:VCALENDAR +VERSION:2.0 +BEGIN:VEVENT +DTSTART:19800101T000100 +DURATION:P1DT9H17M0S +SUMMARY:Calibrator's +END:VEVENT +BEGIN:VTODO +PRIORITY:1 +SUMMARY:Nary parabled Louvre's fleetest mered +END:VTODO +END:VCALENDAR diff --git a/test/ical-004.sh b/test/ical-004.sh new file mode 100755 index 0000000..a804a1e --- /dev/null +++ b/test/ical-004.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +. "${TEST_INIT:-./test-init.sh}" + +if [ "$1" = 'actual' ]; then + mkdir .calcurse || exit 1 + cp "$DATA_DIR/conf" .calcurse || exit 1 + "$CALCURSE" -D "$PWD/.calcurse" -i "$DATA_DIR/ical-004.ical" + "$CALCURSE" -D "$PWD/.calcurse" -s01/01/1980 -r2 + "$CALCURSE" -D "$PWD/.calcurse" -t + rm -rf .calcurse || exit 1 +elif [ "$1" = 'expected' ]; then + cat < ..:.. + Calibrator's + +01/02/80: + - ..:.. -> 09:18 + Calibrator's +to do: +9. Nary parabled Louvre's fleetest mered +EOD +else + ./run-test "$0" +fi -- cgit v1.2.3-70-g09d2