From 5bb3a9e3deb7c3a69bca977eb6f438d2e972e70c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Apr 2015 23:39:29 +0200 Subject: [PATCH 1/1] Support tabs as seaprators when parsing fs config Signed-off-by: Jo-Philipp Wich --- canned_fs_config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/canned_fs_config.c b/canned_fs_config.c index 6bd1b22..6898ea2 100644 --- a/canned_fs_config.c +++ b/canned_fs_config.c @@ -52,15 +52,15 @@ int load_canned_fs_config(const char* fn) { canned_data = (Path*) realloc(canned_data, canned_alloc * sizeof(Path)); } Path* p = canned_data + canned_used; - p->path = strdup(strtok(line, " ")); - p->uid = atoi(strtok(NULL, " ")); - p->gid = atoi(strtok(NULL, " ")); - p->mode = strtol(strtok(NULL, " "), NULL, 8); // mode is in octal + p->path = strdup(strtok(line, " \t")); + p->uid = atoi(strtok(NULL, " \t")); + p->gid = atoi(strtok(NULL, " \t")); + p->mode = strtol(strtok(NULL, " \t"), NULL, 8); // mode is in octal p->capabilities = 0; char* token = NULL; do { - token = strtok(NULL, " "); + token = strtok(NULL, " \t"); if (token && strncmp(token, "capabilities=", 13) == 0) { p->capabilities = strtoll(token+13, NULL, 0); break; -- 2.11.0