From c0cd0ff9ec2b18a5efdf00b0853d77b9cb9cc261 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 20 Nov 2002 15:54:33 +0000 Subject: [PATCH] * main.c: Eliminate finish_program variable - mc can now exit immediately. --- src/ChangeLog | 5 +++++ src/main.c | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f7872c970..51a3e8cf5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-11-20 Pavel Roskin + + * main.c: Eliminate finish_program variable - mc can now exit + immediately. + 2002-11-17 Pavel Roskin * screen.c (do_select): Mark panel as dirty. diff --git a/src/main.c b/src/main.c index 6dfcad3cd..6bf65b497 100644 --- a/src/main.c +++ b/src/main.c @@ -298,9 +298,6 @@ char *mc_home; char cmd_buf[512]; -/* Used during argument processing */ -int finish_program = 0; - WPanel * get_current_panel (void) { @@ -2148,7 +2145,7 @@ process_args (poptContext ctx, int c, const char *option_arg) switch (c) { case 'V': version (1); - finish_program = 1; + exit (0); break; case 'c': @@ -2160,7 +2157,7 @@ process_args (poptContext ctx, int c, const char *option_arg) case 'f': printf ("%s\n", mc_home); - finish_program = 1; + exit (0); break; #ifdef USE_NETCODE @@ -2190,12 +2187,12 @@ process_args (poptContext ctx, int c, const char *option_arg) case 'H': print_color_usage (); - finish_program = 1; + exit (0); break; case 'h': print_mc_usage (ctx, stdout); - finish_program = 1; + exit (0); } } @@ -2294,9 +2291,6 @@ handle_args (int argc, char *argv[]) exit (1); } - if (finish_program) - exit (0); - tmp = poptGetArg (ctx); /*