picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: fix has cc check and add test

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-07-11 09:21:15 -04:00
parent ccb03ac39d
commit 1cb1767a29
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/util.c
View file

@ -5419,7 +5419,7 @@ bool string_has_cc(const char *p, const char *ok) {
for (t = p; *t; t++) {
if (ok && strchr(ok, *t))
return false;
continue;
if (*t > 0 && *t < ' ')
return true;

15
src/test/test-util.c
View file

@ -731,6 +731,20 @@ static void test_filename_is_safe(void) {
assert_se(filename_is_safe("o.o"));
}
static void test_string_has_cc(void) {
assert_se(string_has_cc("abc\1", NULL));
assert_se(string_has_cc("abc\x7f", NULL));
assert_se(string_has_cc("abc\x7f", NULL));
assert_se(string_has_cc("abc\t\x7f", "\t"));
assert_se(string_has_cc("abc\t\x7f", "\t"));
assert_se(string_has_cc("\x7f", "\t"));
assert_se(string_has_cc("\x7f", "\t\a"));
assert_se(!string_has_cc("abc\t\t", "\t"));
assert_se(!string_has_cc("abc\t\t\a", "\t\a"));
assert_se(!string_has_cc("a\ab\tc", "\t\a"));
}
static void test_ascii_strlower(void) {
char a[] = "AabBcC Jk Ii Od LKJJJ kkd LK";
assert_se(streq(ascii_strlower(a), "aabbcc jk ii od lkjjj kkd lk"));
@ -937,6 +951,7 @@ int main(int argc, char *argv[]) {
test_log2i();
test_foreach_string();
test_filename_is_safe();
test_string_has_cc();
test_ascii_strlower();
test_files_same();
test_is_valid_documentation_url();