ftpd: allow multiple -S options to increase verbosity too, like -v

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 090ed54ebf06f2ddbee2c41ad9c42877a868817e..a8687fbdaa7ae652e84e1391ec8906b5bf2a22b4 100644 (file)
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1095,17 +1095,19 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
        unsigned abs_timeout;
+       unsigned verbose_S;
        smallint opts;
 
        INIT_G();
 
        abs_timeout = 1 * 60 * 60;
+       verbose_S = 0;
        G.timeout = 2 * 60;
-       opt_complementary = "t+:T+:vv";
+       opt_complementary = "t+:T+:vv:SS";
 #if BB_MMU
-       opts = getopt32(argv,   "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose);
+       opts = getopt32(argv,   "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
 #else
-       opts = getopt32(argv, "l1vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose);
+       opts = getopt32(argv, "l1vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
        if (opts & (OPT_l|OPT_1)) {
                /* Our secret backdoor to ls */
 /* TODO: pass -n too? */
@@ -1116,6 +1118,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
                return ls_main(argc, argv);
        }
 #endif
+       if (G.verbose < verbose_S)
+               G.verbose = verbose_S;
        if (abs_timeout | G.timeout) {
                if (abs_timeout == 0)
                        abs_timeout = INT_MAX;