chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: do not print invalid utf-8 in error messages
[elogind.git]
/
src
/
shared
/
utf8.c
diff --git
a/src/shared/utf8.c
b/src/shared/utf8.c
index a8e28accd3b20e41aad631bda2d08a371cd5ee4a..0b524d8a9041eae0348382cdf47159f7c2f8d0b3 100644
(file)
--- a/
src/shared/utf8.c
+++ b/
src/shared/utf8.c
@@
-98,7
+98,7
@@
static int utf8_encoded_expected_len(const char *str) {
}
/* decode one unicode char */
}
/* decode one unicode char */
-
static
int utf8_encoded_to_unichar(const char *str) {
+int utf8_encoded_to_unichar(const char *str) {
int unichar;
int len;
int i;
int unichar;
int len;
int i;
@@
-141,14
+141,15
@@
bool utf8_is_printable(const char* str, size_t length) {
assert(str);
assert(str);
- for (p = (const uint8_t*) str; length;
p++
) {
+ for (p = (const uint8_t*) str; length;) {
int encoded_len = utf8_encoded_valid_unichar((const char *)p);
int encoded_len = utf8_encoded_valid_unichar((const char *)p);
- int
32_t
val = utf8_encoded_to_unichar((const char*)p);
+ int val = utf8_encoded_to_unichar((const char*)p);
if (encoded_len < 0 || val < 0 || is_unicode_control(val))
return false;
length -= encoded_len;
if (encoded_len < 0 || val < 0 || is_unicode_control(val))
return false;
length -= encoded_len;
+ p += encoded_len;
}
return true;
}
return true;
@@
-160,7
+161,9
@@
const char *utf8_is_valid(const char *str) {
assert(str);
for (p = (const uint8_t*) str; *p; ) {
assert(str);
for (p = (const uint8_t*) str; *p; ) {
- int len = utf8_encoded_valid_unichar((const char *)p);
+ int len;
+
+ len = utf8_encoded_valid_unichar((const char *)p);
if (len < 0)
return NULL;
if (len < 0)
return NULL;
@@
-171,37
+174,42
@@
const char *utf8_is_valid(const char *str) {
return str;
}
return str;
}
-char *
ascii_is_
valid(const char *str) {
- c
onst char *p
;
+char *
utf8_escape_in
valid(const char *str) {
+ c
har *p, *s
;
assert(str);
assert(str);
- for (p = str; *p; p++)
-
if ((unsigned char) *p >= 128
)
-
return NULL;
+ p = s = malloc(strlen(str) * 4 + 1);
+
if (!p
)
+ return NULL;
- return (char*) str;
-}
+ while (*str) {
+ int len;
-char *ascii_filter(const char *str) {
- const char *s;
- char *r, *d;
- size_t l;
+ len = utf8_encoded_valid_unichar(str);
+ if (len > 0) {
+ s = mempcpy(s, str, len);
+ str += len;
+ } else {
+ s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
+ str += 1;
+ }
+ }
+ *s = '\0';
- assert(str);
+ return p;
+}
- l = strlen(str);
- r = malloc(l + 1);
- if (!r)
- return NULL;
+char *ascii_is_valid(const char *str) {
+ const char *p;
- for (s = str, d = r; *s; s++)
- if ((unsigned char) *s < 128)
- *(d++) = *s;
+ assert(str);
- *d = 0;
+ for (p = str; *p; p++)
+ if ((unsigned char) *p >= 128)
+ return NULL;
- return r;
+ return
(char*) st
r;
}
char *utf16_to_utf8(const void *s, size_t length) {
}
char *utf16_to_utf8(const void *s, size_t length) {