mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-09 11:28:25 +00:00
Really fix the "core set debug" and "core set verbose" CLI commands.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
24
main/cli.c
24
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) {
|
||||
|
||||
Reference in New Issue
Block a user