mirror of https://codeberg.org/cage/tinmop/
- prevented signalling error when an invalid byte sequence is met, when converting octects to string.
This commit is contained in:
parent
970d222c4d
commit
39b0b6ae83
|
@ -52,13 +52,13 @@
|
||||||
0
|
0
|
||||||
(file-length stream))))
|
(file-length stream))))
|
||||||
|
|
||||||
(defun slurp-file (filename &key (convert-to-string t))
|
(defun slurp-file (filename &key (convert-to-string t) (errorp nil))
|
||||||
"A simple way to slurp a file."
|
"A simple way to slurp a file."
|
||||||
(with-open-file (stream filename :direction :input :element-type '(unsigned-byte 8))
|
(with-open-file (stream filename :direction :input :element-type '(unsigned-byte 8))
|
||||||
(let ((seq (make-array (file-length stream) :element-type '(unsigned-byte 8))))
|
(let ((seq (make-array (file-length stream) :element-type '(unsigned-byte 8))))
|
||||||
(read-sequence seq stream)
|
(read-sequence seq stream)
|
||||||
(if convert-to-string
|
(if convert-to-string
|
||||||
(babel:octets-to-string seq)
|
(babel:octets-to-string seq :errorp errorp)
|
||||||
seq))))
|
seq))))
|
||||||
|
|
||||||
(defun dump-sequence-to-file (seq file)
|
(defun dump-sequence-to-file (seq file)
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
object)
|
object)
|
||||||
|
|
||||||
(defmethod to-s ((object vector))
|
(defmethod to-s ((object vector))
|
||||||
(coerce object 'string))
|
(babel:octets-to-string object :errorp nil))
|
||||||
|
|
||||||
(defmethod to-s ((object character))
|
(defmethod to-s ((object character))
|
||||||
(string object))
|
(string object))
|
||||||
|
|
Loading…
Reference in New Issue