X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futf8.c;h=c559c13678d62b7cd275f05721febe73b5205924;hb=1f2b7175cf84bdbef6ee6917224658ba2adf43bf;hp=0b524d8a9041eae0348382cdf47159f7c2f8d0b3;hpb=550a40eceb7d1917152fc9317bf2696708d52bc2;p=elogind.git diff --git a/src/shared/utf8.c b/src/shared/utf8.c index 0b524d8a9..c559c1367 100644 --- a/src/shared/utf8.c +++ b/src/shared/utf8.c @@ -136,7 +136,7 @@ int utf8_encoded_to_unichar(const char *str) { return unichar; } -bool utf8_is_printable(const char* str, size_t length) { +bool utf8_is_printable_newline(const char* str, size_t length, bool newline) { const uint8_t *p; assert(str); @@ -145,7 +145,8 @@ bool utf8_is_printable(const char* str, size_t length) { int encoded_len = utf8_encoded_valid_unichar((const char *)p); int val = utf8_encoded_to_unichar((const char*)p); - if (encoded_len < 0 || val < 0 || is_unicode_control(val)) + if (encoded_len < 0 || val < 0 || is_unicode_control(val) || + (!newline && val == '\n')) return false; length -= encoded_len;