diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-04 17:59:39 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-04 17:59:39 +0000 |
| commit | 136de399d015525605e1e0114d56077c8c31dfd3 (patch) | |
| tree | 57798f4a9cbd0dc7c303434c3cfe62daf19beddd /main | |
| parent | d6aeab63add9c65a2ef076e0672e8cfb0c766975 (diff) | |
Really fix the "core set debug" and "core set verbose" CLI commands.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47195 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 4 | ||||
| -rw-r--r-- | main/cli.c | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 22ee7e9ab..4ca646a55 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2142,9 +2142,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 e8f4d3b16..64ee53bea 100644 --- a/main/cli.c +++ b/main/cli.c @@ -205,22 +205,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; } @@ -270,32 +270,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) { |