From 855ce449eba82c417c005d17aa680aba2048ed8d Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 9 Jan 2014 14:02:56 -0500 Subject: device-nodes: move device node specific code to own file In the process, rename udev_encode_string which is poorly named for what it does. It deals specifically with encoding names that udev creates and has its own rules: utf8 is valid but some ascii is not (e.g. path separators), and everything else is simply escaped. Rename it to encode_devnode_name. Adopted for eudev: Anthony G. Basile Signed-off-by: Anthony G. Basile --- src/libudev/Makefile.am | 2 + src/libudev/device-nodes.c | 74 +++++++++++++++++++++++++++ src/libudev/device-nodes.h | 23 +++++++++ src/libudev/libudev-util.c | 5 +- src/libudev/utf8.c | 122 +++++++++++++++++++++++++-------------------- src/libudev/utf8.h | 9 +++- 6 files changed, 178 insertions(+), 57 deletions(-) create mode 100644 src/libudev/device-nodes.c create mode 100644 src/libudev/device-nodes.h (limited to 'src/libudev') diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am index 568c4884b4..5211550857 100644 --- a/src/libudev/Makefile.am +++ b/src/libudev/Makefile.am @@ -35,6 +35,7 @@ libudev_la_SOURCES =\ libudev-hwdb.c \ cgroup-util.c \ conf-files.c \ + device-nodes.c \ exit-status.c \ hashmap.c \ log.c \ @@ -52,6 +53,7 @@ noinst_HEADERS = \ cgroup-util.h \ conf-files.h \ def.h \ + device-nodes.h \ exit-status.h \ hashmap.h \ ioprio.h \ diff --git a/src/libudev/device-nodes.c b/src/libudev/device-nodes.c new file mode 100644 index 0000000000..c548f1ffff --- /dev/null +++ b/src/libudev/device-nodes.c @@ -0,0 +1,74 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of eudev, forked from systemd. + + Copyright 2012 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include +#include +#include +#include + +#include "device-nodes.h" +#include "utf8.h" + +int whitelisted_char_for_devnode(char c, const char *white) { + if ((c >= '0' && c <= '9') || + (c >= 'A' && c <= 'Z') || + (c >= 'a' && c <= 'z') || + strchr("#+-.:=@_", c) != NULL || + (white != NULL && strchr(white, c) != NULL)) + return 1; + return 0; +} + +int encode_devnode_name(const char *str, char *str_enc, size_t len) { + size_t i, j; + + if (str == NULL || str_enc == NULL) + return -1; + + for (i = 0, j = 0; str[i] != '\0'; i++) { + int seqlen; + + seqlen = utf8_encoded_valid_unichar(&str[i]); + if (seqlen > 1) { + if (len-j < (size_t)seqlen) + goto err; + memcpy(&str_enc[j], &str[i], seqlen); + j += seqlen; + i += (seqlen-1); + } else if (str[i] == '\\' || !whitelisted_char_for_devnode(str[i], NULL)) { + if (len-j < 4) + goto err; + sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]); + j += 4; + } else { + if (len-j < 1) + goto err; + str_enc[j] = str[i]; + j++; + } + } + if (len-j < 1) + goto err; + str_enc[j] = '\0'; + return 0; +err: + return -1; +} diff --git a/src/libudev/device-nodes.h b/src/libudev/device-nodes.h new file mode 100644 index 0000000000..57ed97d326 --- /dev/null +++ b/src/libudev/device-nodes.h @@ -0,0 +1,23 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of eudev, forked from systemd. + + Copyright 2012 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +int encode_devnode_name(const char *str, char *str_enc, size_t len); +int whitelisted_char_for_devnode(char c, const char *additional); diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index b4452f60d4..4d59980a70 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -35,6 +35,7 @@ #include #include +#include "device-nodes.h" #include "libudev.h" #include "libudev-private.h" #include "utf8.h" @@ -352,7 +353,7 @@ int util_replace_chars(char *str, const char *white) while (str[i] != '\0') { int len; - if (is_utf8_encoding_whitelisted(str[i], white)) { + if (whitelisted_char_for_devnode(str[i], white)) { i++; continue; } @@ -400,7 +401,7 @@ int util_replace_chars(char *str, const char *white) **/ _public_ int udev_util_encode_string(const char *str, char *str_enc, size_t len) { - return udev_encode_string(str, str_enc, len); + return encode_devnode_name(str, str_enc, len); } /* diff --git a/src/libudev/utf8.c b/src/libudev/utf8.c index c9e84b804c..1044fb6489 100644 --- a/src/libudev/utf8.c +++ b/src/libudev/utf8.c @@ -63,6 +63,19 @@ static inline bool is_unicode_valid(uint32_t ch) { return true; } + +static bool is_unicode_control(uint32_t ch) { + + /* + 0 to ' '-1 is the C0 range. + DEL=0x7F, and DEL+1 to 0x9F is C1 range. + '\t' is in C0 range, but more or less harmless and commonly used. + */ + + return (ch < ' ' && ch != '\t' && ch != '\n') || + (0x7F <= ch && ch <= 0x9F); +} + /* count of characters used to encode one unicode char */ static int utf8_encoded_expected_len(const char *str) { unsigned char c = (unsigned char)str[0]; @@ -121,24 +134,73 @@ int utf8_encoded_to_unichar(const char *str) { return unichar; } -const char *utf8_is_valid(const char *str) { +bool utf8_is_printable(const char* str, size_t length) { const uint8_t *p; assert(str); - for (p = (const uint8_t*) str; *p; ) { - int len; + for (p = (const uint8_t*) str; length;) { + int encoded_len = utf8_encoded_valid_unichar((const char *)p); + int val = utf8_encoded_to_unichar((const char*)p); - len = utf8_encoded_valid_unichar((const char *)p); + if (encoded_len < 0 || val < 0 || is_unicode_control(val)) + return false; + + length -= encoded_len; + p += encoded_len; + } + + return true; +} - if (len < 0) +char *ascii_is_valid(const char *str) { + const char *p; + + assert(str); + + for (p = str; *p; p++) + if ((unsigned char) *p >= 128) return NULL; - p += len; + return (char*) str; +} + +char *utf16_to_utf8(const void *s, size_t length) { + char *r; + const uint8_t *f; + uint8_t *t; + + r = new(char, (length*3+1)/2 + 1); + if (!r) + return NULL; + + t = (uint8_t*) r; + + for (f = s; f < (const uint8_t*) s + length; f += 2) { + uint16_t c; + + c = (f[1] << 8) | f[0]; + + if (c == 0) { + *t = 0; + return r; + } else if (c < 0x80) { + *(t++) = (uint8_t) c; + } else if (c < 0x800) { + *(t++) = (uint8_t) (0xc0 | (c >> 6)); + *(t++) = (uint8_t) (0x80 | (c & 0x3f)); + } else { + *(t++) = (uint8_t) (0xe0 | (c >> 12)); + *(t++) = (uint8_t) (0x80 | ((c >> 6) & 0x3f)); + *(t++) = (uint8_t) (0x80 | (c & 0x3f)); + } } - return str; + *t = 0; + + return r; } + /* expected size used to encode one unicode char */ static int utf8_unichar_to_encoded_len(int unichar) { if (unichar < 0x80) @@ -185,49 +247,3 @@ int utf8_encoded_valid_unichar(const char *str) { return len; } - -int is_utf8_encoding_whitelisted(char c, const char *white) { - if ((c >= '0' && c <= '9') || - (c >= 'A' && c <= 'Z') || - (c >= 'a' && c <= 'z') || - strchr("#+-.:=@_", c) != NULL || - (white != NULL && strchr(white, c) != NULL)) - return 1; - return 0; -} - -int udev_encode_string(const char *str, char *str_enc, size_t len) { - size_t i, j; - - if (str == NULL || str_enc == NULL) - return -1; - - for (i = 0, j = 0; str[i] != '\0'; i++) { - int seqlen; - - seqlen = utf8_encoded_valid_unichar(&str[i]); - if (seqlen > 1) { - if (len-j < (size_t)seqlen) - goto err; - memcpy(&str_enc[j], &str[i], seqlen); - j += seqlen; - i += (seqlen-1); - } else if (str[i] == '\\' || !is_utf8_encoding_whitelisted(str[i], NULL)) { - if (len-j < 4) - goto err; - sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]); - j += 4; - } else { - if (len-j < 1) - goto err; - str_enc[j] = str[i]; - j++; - } - } - if (len-j < 1) - goto err; - str_enc[j] = '\0'; - return 0; -err: - return -1; -} diff --git a/src/libudev/utf8.h b/src/libudev/utf8.h index 380036da18..9d09153c1c 100644 --- a/src/libudev/utf8.h +++ b/src/libudev/utf8.h @@ -21,6 +21,11 @@ #include "macro.h" +char *ascii_is_valid(const char *s) _pure_; + +bool utf8_is_printable(const char* str, size_t length) _pure_; + +char *utf16_to_utf8(const void *s, size_t length); + int utf8_encoded_valid_unichar(const char *str); -int is_utf8_encoding_whitelisted(char c, const char *white); -int udev_encode_string(const char *str, char *str_enc, size_t len); +int utf8_encoded_to_unichar(const char *str); -- cgit v1.2.3-54-g00ecf