From 75250977137c26f706fc1514aca7982107859b1c Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 10 Sep 2008 18:24:39 +0200 Subject: [PATCH] extras: use libudev code --- extras/ata_id/Makefile.am | 5 +- extras/cdrom_id/Makefile.am | 5 +- extras/edd_id/Makefile.am | 5 +- extras/edd_id/edd_id.c | 2 +- extras/fstab_import/Makefile.am | 5 +- extras/fstab_import/fstab_import.c | 4 +- extras/scsi_id/Makefile.am | 5 +- extras/usb_id/Makefile.am | 1 - extras/volume_id/Makefile.am | 5 +- extras/volume_id/vol_id.c | 2 +- udev/lib/libudev-private.h | 1 + udev/lib/libudev-util.c | 177 +++++++++++++++++++++++++++++ udev/udev.h | 1 - udev/udev_utils_string.c | 2 +- 14 files changed, 189 insertions(+), 31 deletions(-) diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am index bc3b7001a..ce4a32330 100644 --- a/extras/ata_id/Makefile.am +++ b/extras/ata_id/Makefile.am @@ -12,10 +12,7 @@ ata_id_SOURCES = \ ata_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX ata_id_LDADD = \ diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am index 595d71096..d4db32b78 100644 --- a/extras/cdrom_id/Makefile.am +++ b/extras/cdrom_id/Makefile.am @@ -15,10 +15,7 @@ cdrom_id_SOURCES = \ cdrom_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX cdrom_id_LDADD = \ diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am index e494c1e67..3bdbbd85b 100644 --- a/extras/edd_id/Makefile.am +++ b/extras/edd_id/Makefile.am @@ -15,10 +15,7 @@ edd_id_SOURCES = \ edd_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX edd_id_LDADD = \ diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c index b53700e75..4ba60393a 100644 --- a/extras/edd_id/edd_id.c +++ b/extras/edd_id/edd_id.c @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) if (disk_id == sysfs_id) { if (match[0] == '\0') { /* store id */ - strlcpy(match, dent->d_name, sizeof(match)); + util_strlcpy(match, dent->d_name, sizeof(match)); } else { /* error, same signature for another device */ info(udev, "'%s' does not have a unique signature\n", node); diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am index 7b99471fa..2ed383d95 100644 --- a/extras/fstab_import/Makefile.am +++ b/extras/fstab_import/Makefile.am @@ -15,10 +15,7 @@ fstab_import_SOURCES = \ fstab_import.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX fstab_import_LDADD = \ diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c index 0f4685ae2..245a72fff 100644 --- a/extras/fstab_import/fstab_import.c +++ b/extras/fstab_import/fstab_import.c @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) if (label[0] == '"' || label[0] == '\'') { char *pos; - strlcpy(str, &label[1], sizeof(str)); + util_strlcpy(str, &label[1], sizeof(str)); pos = strrchr(str, label[0]); if (pos == NULL) continue; @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) if (uuid[0] == '"' || uuid[0] == '\'') { char *pos; - strlcpy(str, &uuid[1], sizeof(str)); + util_strlcpy(str, &uuid[1], sizeof(str)); pos = strrchr(str, uuid[0]); if (pos == NULL) continue; diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am index 62e14e5ad..b6bebb69a 100644 --- a/extras/scsi_id/Makefile.am +++ b/extras/scsi_id/Makefile.am @@ -15,10 +15,7 @@ scsi_id_SOURCES = \ bsg.h \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c if USE_SELINUX scsi_id_LDADD = \ diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am index 07692df3a..ba74baad4 100644 --- a/extras/usb_id/Makefile.am +++ b/extras/usb_id/Makefile.am @@ -24,4 +24,3 @@ endif distclean-local: rm -f Makefile.in - diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am index 75f3e984d..3e11d5c34 100644 --- a/extras/volume_id/Makefile.am +++ b/extras/volume_id/Makefile.am @@ -14,10 +14,7 @@ vol_id_SOURCES = \ vol_id.c \ ../../udev/lib/libudev.h \ ../../udev/lib/libudev.c \ - ../../udev/lib/libudev-util.c \ - ../../udev/udev_sysdeps.c \ - ../../udev/udev_utils.c \ - ../../udev/udev_utils_string.c + ../../udev/lib/libudev-util.c vol_id_LDADD = \ lib/libvolume_id.la diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 4b101be92..79ed09980 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -275,7 +275,7 @@ int main(int argc, char *argv[]) } set_str(label_safe, label, sizeof(label_safe)); - replace_chars(label_safe, ALLOWED_CHARS_INPUT); + util_replace_chars(label_safe, ALLOWED_CHARS_INPUT); volume_id_encode_string(label, label_enc, sizeof(label_enc)); volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc)); diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h index 32837e368..1f4abc07b 100644 --- a/udev/lib/libudev-private.h +++ b/udev/lib/libudev-private.h @@ -123,4 +123,5 @@ extern size_t util_path_decode(char *s); extern void util_remove_trailing_chars(char *path, char c); extern size_t util_strlcpy(char *dst, const char *src, size_t size); extern size_t util_strlcat(char *dst, const char *src, size_t size); +extern int util_replace_chars(char *str, const char *white); #endif diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c index ae0adf4b8..7aea8c67f 100644 --- a/udev/lib/libudev-util.c +++ b/udev/lib/libudev-util.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include "libudev.h" @@ -255,3 +256,179 @@ size_t util_strlcat(char *dst, const char *src, size_t size) *q = '\0'; return bytes; } + +/* 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]; + + if (c < 0x80) + return 1; + if ((c & 0xe0) == 0xc0) + return 2; + if ((c & 0xf0) == 0xe0) + return 3; + if ((c & 0xf8) == 0xf0) + return 4; + if ((c & 0xfc) == 0xf8) + return 5; + if ((c & 0xfe) == 0xfc) + return 6; + return 0; +} + +/* decode one unicode char */ +static int utf8_encoded_to_unichar(const char *str) +{ + int unichar; + int len; + int i; + + len = utf8_encoded_expected_len(str); + switch (len) { + case 1: + return (int)str[0]; + case 2: + unichar = str[0] & 0x1f; + break; + case 3: + unichar = (int)str[0] & 0x0f; + break; + case 4: + unichar = (int)str[0] & 0x07; + break; + case 5: + unichar = (int)str[0] & 0x03; + break; + case 6: + unichar = (int)str[0] & 0x01; + break; + default: + return -1; + } + + for (i = 1; i < len; i++) { + if (((int)str[i] & 0xc0) != 0x80) + return -1; + unichar <<= 6; + unichar |= (int)str[i] & 0x3f; + } + + return unichar; +} + +/* expected size used to encode one unicode char */ +static int utf8_unichar_to_encoded_len(int unichar) +{ + if (unichar < 0x80) + return 1; + if (unichar < 0x800) + return 2; + if (unichar < 0x10000) + return 3; + if (unichar < 0x200000) + return 4; + if (unichar < 0x4000000) + return 5; + return 6; +} + +/* check if unicode char has a valid numeric range */ +static int utf8_unichar_valid_range(int unichar) +{ + if (unichar > 0x10ffff) + return 0; + if ((unichar & 0xfffff800) == 0xd800) + return 0; + if ((unichar > 0xfdcf) && (unichar < 0xfdf0)) + return 0; + if ((unichar & 0xffff) == 0xffff) + return 0; + return 1; +} + +/* validate one encoded unicode char and return its length */ +static int utf8_encoded_valid_unichar(const char *str) +{ + int len; + int unichar; + int i; + + len = utf8_encoded_expected_len(str); + if (len == 0) + return -1; + + /* ascii is valid */ + if (len == 1) + return 1; + + /* check if expected encoded chars are available */ + for (i = 0; i < len; i++) + if ((str[i] & 0x80) != 0x80) + return -1; + + unichar = utf8_encoded_to_unichar(str); + + /* check if encoded length matches encoded value */ + if (utf8_unichar_to_encoded_len(unichar) != len) + return -1; + + /* check if value has valid range */ + if (!utf8_unichar_valid_range(unichar)) + return -1; + + return len; +} + +/* allow chars in whitelist, plain ascii, hex-escaping and valid utf8 */ +int util_replace_chars(char *str, const char *white) +{ + size_t i = 0; + int replaced = 0; + + while (str[i] != '\0') { + int len; + + /* accept whitelist */ + if (white != NULL && strchr(white, str[i]) != NULL) { + i++; + continue; + } + + /* accept plain ascii char */ + if ((str[i] >= '0' && str[i] <= '9') || + (str[i] >= 'A' && str[i] <= 'Z') || + (str[i] >= 'a' && str[i] <= 'z')) { + i++; + continue; + } + + /* accept hex encoding */ + if (str[i] == '\\' && str[i+1] == 'x') { + i += 2; + continue; + } + + /* accept valid utf8 */ + len = utf8_encoded_valid_unichar(&str[i]); + if (len > 1) { + i += len; + continue; + } + + /* if space is allowed, replace whitespace with ordinary space */ + if (isspace(str[i]) && strchr(white, ' ') != NULL) { + str[i] = ' '; + i++; + replaced++; + continue; + } + + /* everything else is replaced with '_' */ + str[i] = '_'; + i++; + replaced++; + } + + return replaced; +} diff --git a/udev/udev.h b/udev/udev.h index 24646ece5..7f5bd10a7 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -176,7 +176,6 @@ extern int string_is_true(const char *str); extern void remove_trailing_chars(char *path, char c); extern size_t path_encode(char *s, size_t len); extern size_t path_decode(char *s); -extern int utf8_encoded_valid_unichar(const char *str); extern int replace_chars(char *str, const char *white); /* udev_utils_file.c */ diff --git a/udev/udev_utils_string.c b/udev/udev_utils_string.c index 0dea6686d..540fb5caa 100644 --- a/udev/udev_utils_string.c +++ b/udev/udev_utils_string.c @@ -185,7 +185,7 @@ static int utf8_unichar_valid_range(int unichar) } /* validate one encoded unicode char and return its length */ -int utf8_encoded_valid_unichar(const char *str) +static int utf8_encoded_valid_unichar(const char *str) { int len; int unichar; -- 2.30.2