X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=util.h;h=14f1a7a177d9b7a677b942d46c6ccccf6bf29cab;hb=db12775d59ab709f8afc361eaa30c9d54a0a8d7c;hp=273ece89f1be7729a2963d12080805e682757018;hpb=2d368c149b90a7b284035f8883eb0c3e64a2caab;p=elogind.git

diff --git a/util.h b/util.h
index 273ece89f..14f1a7a17 100644
--- a/util.h
+++ b/util.h
@@ -129,6 +129,8 @@ char **strv_path_make_absolute_cwd(char **l);
 int reset_all_signal_handlers(void);
 
 char *strstrip(char *s);
+char *delete_chars(char *s, const char *bad);
+
 char *file_in_same_dir(const char *path, const char *filename);
 int mkdir_parents(const char *path, mode_t mode);
 
@@ -155,6 +157,8 @@ char *bus_path_unescape(const char *s);
 
 bool ignore_file(const char *filename);
 
+bool chars_intersect(const char *a, const char *b);
+
 #define DEFINE_STRING_TABLE_LOOKUP(name,type)                           \
         const char *name##_to_string(type i) {                          \
                 if (i < 0 || i >= (type) ELEMENTSOF(name##_table))      \
@@ -163,10 +167,14 @@ bool ignore_file(const char *filename);
         }                                                               \
         type name##_from_string(const char *s) {                        \
                 type i;                                                 \
+                unsigned u = 0;                                         \
                 assert(s);                                              \
                 for (i = 0; i < (type)ELEMENTSOF(name##_table); i++)    \
                         if (streq(name##_table[i], s))                  \
                                 return i;                               \
+                if (safe_atou(s, &u) >= 0 &&                            \
+                    u < ELEMENTSOF(name##_table))                       \
+                        return (type) u;                                \
                 return (type) -1;                                       \
         }                                                               \
         struct __useless_struct_to_allow_trailing_semicolon__