From 92a1d6255ef22f6905717e7c9acfe0d6dbdb0c95 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 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 10036e7..7930513 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -743,7 +743,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 @@ -776,6 +775,13 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) else ctx->program_name = "e2fsck"; + 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); + + while ((c = getopt (argc, argv, "panyrcC:B:dE:fvtFVM:b:I:j:P:l:L:N:SsDk")) != EOF) switch (c) { case 'C': @@ -806,7 +812,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': @@ -943,13 +949,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); - - 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); -- 1.8.3.1