From ea60d7ccc30a6ec5d35bb474b7994c831706e9ad Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 12 Apr 2012 17:24:55 -0600 Subject: [PATCH] e2fsck: parse config file before command-line opts The patch changes the order that the config file and command line are parsed so that command line has precedence. It also parses the -E option for every occurrence, otherwise the -E option is not cumulative. Signed-off-by: Jim Garlick Signed-off-by: Andreas Dilger --- e2fsck/unix.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/e2fsck/unix.c b/e2fsck/unix.c index c78d71e..1240676 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -824,7 +824,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) #ifdef HAVE_SIGNAL_H struct sigaction sa; #endif - char *extended_opts = 0; char *cp; int res; /* result of sscanf */ #ifdef CONFIG_JBD_DEBUG @@ -862,6 +861,12 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) else usage(NULL); + cp = getenv("E2FSCK_CONFIG"); + if (cp != NULL) + config_fn[0] = cp; + profile_set_syntax_err_cb(syntax_err_report); + profile_init(config_fn, &ctx->profile); + phys_mem_kb = get_memory_size() / 1024; ctx->readahead_kb = ~0ULL; @@ -899,7 +904,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) ctx->options |= E2F_OPT_COMPRESS_DIRS; break; case 'E': - extended_opts = optarg; + parse_extended_opts(ctx, optarg); break; case 'p': case 'a': @@ -1066,8 +1071,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) argv[optind]); fatal_error(ctx, 0); } - if (extended_opts) - parse_extended_opts(ctx, extended_opts); /* Complain about mutually exclusive rebuilding activities */ if (getenv("E2FSCK_FIXES_ONLY")) @@ -1085,11 +1088,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) fatal_error(ctx, 0); } - if ((cp = getenv("E2FSCK_CONFIG")) != NULL) - config_fn[0] = cp; - profile_set_syntax_err_cb(syntax_err_report); - profile_init(config_fn, &ctx->profile); - profile_get_boolean(ctx->profile, "options", "report_time", 0, 0, &c); if (c) -- 1.8.3.1