mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] optionnal '-s' command line argument could clobber '-st' and '-sf'

Browse Source
This commit is contained in:
willy tarreau 2006-04-15 19:25:16 +02:00
parent 91b76215c2
commit 2c51373bfa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
haproxy.c
View File

@ -8122,12 +8122,6 @@ void init(int argc, char **argv) {
arg_mode |= MODE_DAEMON | MODE_QUIET; arg_mode |= MODE_DAEMON | MODE_QUIET;
else if (*flag == 'q') else if (*flag == 'q')
arg_mode |= MODE_QUIET; 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')) { else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {
/* list of pids to finish ('f') or terminate ('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 */ else { /* >=2 args */
argv++; argc--; argv++; argc--;
if (argc == 0) if (argc == 0)