From 2c51373bfa8f773e290c4aa3a9915335d3a33ef5 Mon Sep 17 00:00:00 2001 From: willy tarreau Date: Sat, 15 Apr 2006 19:25:16 +0200 Subject: [PATCH] [MINOR] optionnal '-s' command line argument could clobber '-st' and '-sf' --- haproxy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/haproxy.c b/haproxy.c index 2f9c89c7d..cdff36e3d 100644 --- a/haproxy.c +++ b/haproxy.c @@ -8122,12 +8122,6 @@ void init(int argc, char **argv) { arg_mode |= MODE_DAEMON | MODE_QUIET; else if (*flag == 'q') arg_mode |= MODE_QUIET; -#if STATTIME > 0 - else if (*flag == 's') - arg_mode |= MODE_STATS; - else if (*flag == 'l') - arg_mode |= MODE_LOG; -#endif else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) { /* list of pids to finish ('f') or terminate ('t') */ @@ -8148,6 +8142,12 @@ void init(int argc, char **argv) { } } } +#if STATTIME > 0 + else if (*flag == 's') + arg_mode |= MODE_STATS; + else if (*flag == 'l') + arg_mode |= MODE_LOG; +#endif else { /* >=2 args */ argv++; argc--; if (argc == 0)