jadedctrl/ chicken-vcarded
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Activity

Better checks for EOF

This commit is contained in:
Jaidyn Ann 2024-02-13 17:59:20 -06:00
parent 1bf429571f
commit 076fe6f24b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcarded.scm
View File

@ -253,7 +253,7 @@
(and first-element? (and first-element?
(string-contains line "BEGIN") (string-contains line "BEGIN")
(string-contains line "VCARD"))) (string-contains line "VCARD")))
(parse-vcard-line (read-folded-line))] (parse-vcard-line line)]
;; If we’re still making sure the file is vCard, and the first non-blank ;; If we’re still making sure the file is vCard, and the first non-blank
;; line *isn’t* a BEGIN:VCARD line, then the file probably isn’t a vCard. ;; line *isn’t* a BEGIN:VCARD line, then the file probably isn’t a vCard.
[#t [#t
@ -268,10 +268,12 @@
;; Reader-thunk. Read a “logical” folded-line, where a line beginning with a ;; Reader-thunk. Read a “logical” folded-line, where a line beginning with a
;; space is a continuation of the previous line — like with vcards. ;; space is a continuation of the previous line — like with vcards.
(define (read-folded-line #!optional limit) (define (read-folded-line #!optional limit)
(if (not (eof-object? (peek-char)))
(let [(line (read-line (current-input-port) limit))] (let [(line (read-line (current-input-port) limit))]
(if (or (eq? (peek-char) #\space) (if (or (eq? (peek-char) #\space)
(eq? (peek-char) #\tab)) (eq? (peek-char) #\tab))
(string-concatenate (string-concatenate
(list line (list line
(string-drop (read-folded-line) 1))) (string-drop (read-folded-line) 1)))
line)))) line))
"")))