diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2020-10-13 15:03:20 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-15 02:17:29 +0000 |
| commit | ee0b21b31c48c2d9bb65a020643271d435edb0d9 (patch) | |
| tree | 1a017d8f38028e8a8365e43eb3eed5e545706804 /futility | |
| parent | 86f6ce865157a35c3c4e1aab3f75b45aac2c9720 (diff) | |
| download | vboot-ee0b21b31c48c2d9bb65a020643271d435edb0d9.tar.gz | |
futility: update: support multi-line quirks
To support loading quirks from external files, we want to skip tab (\t)
and new line characters (\n, \r).
BRANCH=none
BUG=b:169284414
TEST=make runtests
Change-Id: If314d6cf36907837ce9c36b73337976ee0c6fad1
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2467305
Reviewed-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Commit-Queue: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/updater.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/futility/updater.c b/futility/updater.c index 8048a5b7..3e3dce2d 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -188,14 +188,18 @@ static int setup_config_quirks(const char *quirks, struct updater_config *cfg) int r = 0; char *buf = strdup(quirks); char *token; + const char *delimiters = ", \n\r\t"; - token = strtok(buf, ", "); - for (; token; token = strtok(NULL, ", ")) { + token = strtok(buf, delimiters); + for (; token; token = strtok(NULL, delimiters)) { const char *name = token; char *equ = strchr(token, '='); int i, value = 1; struct quirk_entry *entry = cfg->quirks; + if (!*name) + continue; + if (equ) { *equ = '\0'; value = strtol(equ + 1, NULL, 0); |