shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

device-nodes: minor simplifications

Browse Source
This commit is contained in:
Lennart Poettering 2015-04-10 14:43:37 +02:00
parent 2ff7b0a542
commit f0bc504794
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/shared/device-nodes.c
View File

@ -25,12 +25,14 @@
#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;
}
@ -45,27 +47,34 @@ int encode_devnode_name(const char *str, char *str_enc, size_t len) {
seqlen = utf8_encoded_valid_unichar(&str[i]);
if (seqlen > 1) {
if (len-j < (size_t)seqlen)
goto err;
return -EINVAL;
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;
return -EINVAL;
sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
j += 4;
} else {
if (len-j < 1)
goto err;
return -EINVAL;
str_enc[j] = str[i];
j++;
}
}
if (len-j < 1)
goto err;
return -EINVAL;
str_enc[j] = '\0';
return 0;
err:
return -EINVAL;
}