Merged revisions 47195 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47195 | russell | 2006-11-04 12:59:39 -0500 (Sat, 04 Nov 2006) | 2 lines

Really fix the "core set debug" and "core set verbose" CLI commands.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47197 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/asterisk.c b/main/asterisk.c
index 5b46006cca5a029ac25c50d5e08f589d65b42135..5d3e572105398516afa828c935a97af7bb550a44 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2063,9 +2063,9 @@ static void ast_remotecontrol(char * data)
                pid = atoi(cpid);
        else
                pid = -1;
-       snprintf(tmp, sizeof(tmp), "core verbose atleast %d", option_verbose);
+       snprintf(tmp, sizeof(tmp), "core set verbose atleast %d", option_verbose);
        fdprint(ast_consock, tmp);
-       snprintf(tmp, sizeof(tmp), "core debug atleast %d", option_debug);
+       snprintf(tmp, sizeof(tmp), "core set debug atleast %d", option_debug);
        fdprint(ast_consock, tmp);
        if (ast_opt_mute) {
                snprintf(tmp, sizeof(tmp), "log and verbose output currently muted ('logger unmute' to unmute)");

diff --git a/main/cli.c b/main/cli.c
index c548c497a0f74a50bf113a47a2ec4f3f836f0408..76a9a3077fc8410d48a68cb061823fdbd285ec24 100644 (file)
--- a/main/cli.c
+++ b/main/cli.c
@@ -178,22 +178,22 @@ static int handle_verbose(int fd, int argc, char *argv[])
        int newlevel;
        int atleast = 0;
 
-       if ((argc < 3) || (argc > 4))
+       if ((argc < 4) || (argc > 5))
                return RESULT_SHOWUSAGE;
 
        if (!strcasecmp(argv[3], "atleast"))
                atleast = 1;
 
        if (!atleast) {
-               if (argc > 3)
+               if (argc > 4)
                        return RESULT_SHOWUSAGE;
 
-               option_verbose = atoi(argv[2]);
+               option_verbose = atoi(argv[3]);
        } else {
-               if (argc < 4)
+               if (argc < 5)
                        return RESULT_SHOWUSAGE;
 
-               newlevel = atoi(argv[3]);
+               newlevel = atoi(argv[4]);
                if (newlevel > option_verbose)
                        option_verbose = newlevel;
         }
@@ -216,32 +216,32 @@ static int handle_debug(int fd, int argc, char *argv[])
        int atleast = 0;
        char *filename = '\0';
 
-       if ((argc < 3) || (argc > 5))
+       if ((argc < 4) || (argc > 6))
                return RESULT_SHOWUSAGE;
 
        if (!strcasecmp(argv[3], "atleast"))
                atleast = 1;
 
        if (!atleast) {
-               if (argc > 4)
+               if (argc > 5)
                        return RESULT_SHOWUSAGE;
 
-               if (sscanf(argv[2], "%d", &newlevel) != 1)
+               if (sscanf(argv[3], "%d", &newlevel) != 1)
                        return RESULT_SHOWUSAGE;
 
-               if (argc == 3) {
+               if (argc == 4) {
                        debug_filename[0] = '\0';
                } else {
-                       filename = argv[3];
+                       filename = argv[4];
                        ast_copy_string(debug_filename, filename, sizeof(debug_filename));
                }
 
                option_debug = newlevel;
        } else {
-               if (argc < 4)
+               if (argc < 5 || argc > 6)
                        return RESULT_SHOWUSAGE;
 
-               if (sscanf(argv[3], "%d", &newlevel) != 1)
+               if (sscanf(argv[4], "%d", &newlevel) != 1)
                        return RESULT_SHOWUSAGE;
 
                if (argc == 4) {