X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_string.c;h=5aebfed52394fb3f532e2e5f1f7b17422c683b5d;hp=bb5677d46ebbcc5395d904b5918a815b40be53fc;hb=4809b49e4100e35b0dfb5d93cf501e020366de0b;hpb=764ce7f2ab526c084f005186e0dcbabe59070247 diff --git a/udev_utils_string.c b/udev_utils_string.c index bb5677d46..5aebfed52 100644 --- a/udev_utils_string.c +++ b/udev_utils_string.c @@ -30,11 +30,7 @@ #include #include -#include "udev_libc_wrapper.h" #include "udev.h" -#include "logging.h" -#include "udev_utils.h" -#include "list.h" /* compare string with pattern (like fnmatch(), supports * ? [0-9] [!A-Z]) */ int strcmp_pattern(const char *p, const char *s) @@ -100,7 +96,7 @@ int string_is_true(const char *str) return 0; } -void remove_trailing_char(char *path, char c) +void remove_trailing_chars(char *path, char c) { size_t len; @@ -245,7 +241,7 @@ int replace_untrusted_chars(char *str) if ((str[i] >= '0' && str[i] <= '9') || (str[i] >= 'A' && str[i] <= 'Z') || (str[i] >= 'a' && str[i] <= 'z') || - strchr(" #$%+-./:=?@_", str[i])) { + strchr(" #$%+-./:=?@_,", str[i])) { i++; continue; }