From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 6 Apr 2010 21:37:20 +0000 (+0200)
Subject: util: when parsing strings lookup tables accept integer strings, too
X-Git-Tag: v1~640
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d3725859f3d80972d7da3a73b92e58a06ac7d69a;hp=2d368c149b90a7b284035f8883eb0c3e64a2caab

util: when parsing strings lookup tables accept integer strings, too
---

diff --git a/util.h b/util.h
index 273ece89f..af39accc9 100644
--- a/util.h
+++ b/util.h
@@ -163,10 +163,14 @@ bool ignore_file(const char *filename);
         }                                                               \
         type name##_from_string(const char *s) {                        \
                 type i;                                                 \
+                unsigned u;                                             \
                 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__