diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:36:29 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-29 22:36:29 +0000 |
commit | fcfda97ed2478ac34b65ba502ad183583c446476 (patch) | |
tree | 14fbbf17c6fd97c221d60fc1618ebfd3528412dc /main/cli.c | |
parent | df4f71e2d6d629bfcae42e785b4e934db6207837 (diff) |
Merged revisions 44053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44053 | qwell | 2006-09-29 15:35:09 -0700 (Fri, 29 Sep 2006) | 3 lines
Fix a bug with the removal of 'atleast' argument to 'core verbose' and 'core debug'.
Add that argument back in.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44054 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
-rw-r--r-- | main/cli.c | 63 |
1 files changed, 52 insertions, 11 deletions
diff --git a/main/cli.c b/main/cli.c index fb11648eb..51807d969 100644 --- a/main/cli.c +++ b/main/cli.c @@ -175,12 +175,28 @@ static int handle_reload(int fd, int argc, char *argv[]) static int handle_verbose(int fd, int argc, char *argv[]) { int oldval = option_verbose; + int newlevel; + int atleast = 0; - if (argc == 3) - option_verbose = atoi(argv[2]); - else + if ((argc < 3) || (argc > 4)) return RESULT_SHOWUSAGE; + if (!strcasecmp(argv[2], "atleast")) + atleast = 1; + + if (!atleast) { + if (argc > 3) + return RESULT_SHOWUSAGE; + + option_verbose = atoi(argv[2]); + } else { + if (argc < 4) + return RESULT_SHOWUSAGE; + + newlevel = atoi(argv[3]); + if (newlevel > option_verbose) + option_verbose = newlevel; + } if (oldval > 0 && option_verbose == 0) ast_cli(fd, "Verbosity is now OFF\n"); else if (option_verbose > 0) { @@ -197,21 +213,46 @@ static int handle_debug(int fd, int argc, char *argv[]) { int oldval = option_debug; int newlevel; + int atleast = 0; char *filename = '\0'; - if ((argc < 3) || (argc > 4)) + if ((argc < 3) || (argc > 5)) return RESULT_SHOWUSAGE; - if (sscanf(argv[2], "%d", &newlevel) != 1) - return RESULT_SHOWUSAGE; + if (!strcasecmp(argv[2], "atleast")) + atleast = 1; - option_debug = newlevel; + if (!atleast) { + if (argc > 4) + return RESULT_SHOWUSAGE; - if (argc == 4) { - filename = argv[3]; - ast_copy_string(debug_filename, filename, sizeof(debug_filename)); + if (sscanf(argv[2], "%d", &newlevel) != 1) + return RESULT_SHOWUSAGE; + + if (argc == 3) { + debug_filename[0] = '\0'; + } else { + filename = argv[3]; + ast_copy_string(debug_filename, filename, sizeof(debug_filename)); + } + + option_debug = newlevel; } else { - debug_filename[0] = '\0'; + if (argc < 4) + return RESULT_SHOWUSAGE; + + if (sscanf(argv[3], "%d", &newlevel) != 1) + return RESULT_SHOWUSAGE; + + if (argc == 4) { + debug_filename[0] = '\0'; + } else { + filename = argv[4]; + ast_copy_string(debug_filename, filename, sizeof(debug_filename)); + } + + if (newlevel > option_debug) + option_debug = newlevel; } if (oldval > 0 && option_debug == 0) |