From 7eede3b7a8139a9a9aad2b31047d26959f5ac4bb Mon Sep 17 00:00:00 2001 From: AndreyDobrovolskyOdessa Date: Sat, 20 Mar 2021 11:55:32 +0200 Subject: Avoid duplicate flags initialization in main() Closes: #18 [via git-merge-pr] --- redo.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/redo.c b/redo.c index 139142a..2a82dc9 100644 --- a/redo.c +++ b/redo.c @@ -923,11 +923,6 @@ main(int argc, char *argv[]) if (level < 0) level = 0; - fflag = envfd("REDO_FORCE"); - kflag = envfd("REDO_KEEP_GOING"); - xflag = envfd("REDO_TRACE"); - sflag = envfd("REDO_STDOUT"); - if ((program = strrchr(argv[0], '/'))) program++; else @@ -936,19 +931,15 @@ main(int argc, char *argv[]) while ((opt = getopt(argc, argv, "+kxfsj:C:")) != -1) { switch (opt) { case 'k': - kflag = 1; setenvfd("REDO_KEEP_GOING", 1); break; case 'x': - xflag = 1; setenvfd("REDO_TRACE", 1); break; case 'f': - fflag = 1; setenvfd("REDO_FORCE", 1); break; case 's': - sflag = 1; setenvfd("REDO_STDOUT", 1); break; case 'j': @@ -968,6 +959,11 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + fflag = envfd("REDO_FORCE"); + kflag = envfd("REDO_KEEP_GOING"); + xflag = envfd("REDO_TRACE"); + sflag = envfd("REDO_STDOUT"); + dir_fd = keepdir(); if (strcmp(program, "redo") == 0) { -- cgit 1.4.1