X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=22f8f98fdad09fc672ded27dba2eea1e732b7b60;hb=15925386d387b6ed9c1f174d4b08c767acad8117;hp=e385bf73b841b3e24986c4eb3d35ad7682d04f35;hpb=e1dd6790e4f58506e637bf9541f63504acc2972f;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index e385bf73b..22f8f98fd 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -23,6 +23,7 @@ #include #include +#include #include "util.h" @@ -30,7 +31,7 @@ char *strv_find(char **l, const char *name) _pure_; char *strv_find_prefix(char **l, const char *name) _pure_; char *strv_find_startswith(char **l, const char *name) _pure_; -void strv_free(char **l); +char **strv_free(char **l); DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free); #define _cleanup_strv_free_ _cleanup_(strv_freep) @@ -72,7 +73,7 @@ static inline bool strv_isempty(char * const *l) { char **strv_split(const char *s, const char *separator); char **strv_split_newlines(const char *s); -int strv_split_quoted(char ***t, const char *s, bool relax); +int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags); char *strv_join(char **l, const char *separator); char *strv_join_quoted(char **l); @@ -144,3 +145,11 @@ void strv_print(char **l); })) char **strv_reverse(char **l); + +bool strv_fnmatch(char* const* patterns, const char *s, int flags); + +static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, int flags) { + assert(s); + return strv_isempty(patterns) || + strv_fnmatch(patterns, s, flags); +}