[PATCH v2 03/18] fsck: Provide a function to parse fsck message IDs
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:03:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
This function will be used in the next commits to allow the user to ask fsck to handle specific problems differently, e.g. demoting certain errors to warnings. It has to handle partial strings because we would like to be able to parse, say, 'missing-email,missing-tagger-entry' command lines. To make the parsing robust, we generate strings from the enum keys, and using these keys, we will map lower-case, dash-separated strings values to the corresponding enum values. Signed-off-by: Johannes Schindelin <redacted> --- fsck.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index 30f7a48..2d91e28 100644
--- a/fsck.c
+++ b/fsck.c@@ -63,15 +63,38 @@ enum fsck_msg_id { }; #undef MSG_ID -#define MSG_ID(id, severity) { FSCK_##severity }, +#define STR(x) #x +#define MSG_ID(id, severity) { STR(id), FSCK_##severity }, static struct { + const char *id_string; int severity; } msg_id_info[FSCK_MSG_MAX + 1] = { FOREACH_MSG_ID(MSG_ID) - { -1 } + { NULL, -1 } }; #undef MSG_ID +static int parse_msg_id(const char *text, int len) +{ + int i, j; + + for (i = 0; i < FSCK_MSG_MAX; i++) { + const char *key = msg_id_info[i].id_string; + /* id_string is upper-case, with underscores */ + for (j = 0; j < len; j++) { + char c = *(key++); + if (c == '_') + c = '-'; + if (text[j] != tolower(c)) + break; + } + if (j == len && !*key) + return i; + } + + die("Unhandled message id: %.*s", len, text); +} + static int fsck_msg_severity(enum fsck_msg_id msg_id, struct fsck_options *options) {
--
2.0.0.rc3.9669.g840d1f9