The patch changes the order that the config file and command line are
parsed so that command line has precedence. It also adds a check to
make sure only one -E option is passed on the command line as -E option
parsing is not cumulative.
Signed-off-by: Jim Garlick <garlick@xxxxxxxx>
Signed-off-by: Andreas Dilger <adilger@xxxxxxx>
The patch changes the order that the config file and command line are
parsed so that command line has precedence. It also adds a check to
make sure only one -E option is passed on the command line as -E option
parsing is not cumulative.
Signed-off-by: Jim Garlick <garlick@xxxxxxxx>
Signed-off-by: Andreas Dilger <adilger@xxxxxxxxxxxxx>
Index: e2fsprogs-1.40.11/e2fsck/unix.c
===================================================================
--- e2fsprogs-1.40.11.orig/e2fsck/unix.c
+++ e2fsprogs-1.40.11/e2fsck/unix.c
@@ -589,7 +589,6 @@ static errcode_t PRS(int argc, char *arg
#ifdef HAVE_SIGNAL_H
struct sigaction sa;
#endif
- char *extended_opts = 0;
char *cp;
int res; /* result of sscanf */
#ifdef CONFIG_JBD_DEBUG
@@ -620,6 +619,12 @@ static errcode_t PRS(int argc, char *arg
ctx->program_name = *argv;
else
ctx->program_name = "e2fsck";
+
+ if ((cp = getenv("E2FSCK_CONFIG")) != 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':
@@ -650,7 +655,7 @@ static errcode_t PRS(int argc, char *arg
ctx->options |= E2F_OPT_COMPRESS_DIRS;
break;
case 'E':
- extended_opts = optarg;
+ parse_extended_opts(ctx, optarg);
break;
case 'p':
case 'a':
@@ -777,13 +782,6 @@ static errcode_t PRS(int argc, char *arg
fatal_error(ctx, 0);
}
ctx->filesystem_name = string_copy(ctx, ctx->filesystem_name, 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);
if (flush) {
fd = open(ctx->filesystem_name, O_RDONLY, 0);
