commit 2c51373bfa8f773e290c4aa3a9915335d3a33ef5
author willy tarreau <willy@wtap.(none)> Sat Apr 15 19:25:16 2006 +0200
committer willy tarreau <willy@wtap.(none)> Sat Apr 15 19:25:16 2006 +0200
tree e8ae2a478cad85452e2143b777775472df5bf921
parent 91b76215c28f7760252b47d3daa01a72793d615f

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

haproxy.c

diff --git a/haproxy.c b/haproxy.c
index 2f9c89c..cdff36e 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -8122,12 +8122,6 @@
 		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 @@
 		    }
 		}
 	    }
+#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)