hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of extra check in debugcli

Browse Source
This commit is contained in:
Mark Riddoch
2013-07-24 18:22:32 +02:00
parent d2b5f3f8b5
commit 7262e8245a
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
modules/routing/debugcmd.c
View File

@ -238,10 +238,11 @@ convert_arg(char *arg, int arg_type)
int
execute_cmd(CLI_SESSION *cli)
{
DCB *dcb = cli->session->client;
int argc, i, j, found = 0;
char *args[MAXARGS];
char *saveptr, *delim = " \t\r\n";
DCB *dcb = cli->session->client;
int argc, i, j, found = 0;
char *args[MAXARGS];
char *saveptr, *delim = " \t\r\n";
unsigned long arg1, arg2, arg3;
/* Tokenize the input string */
args[0] = strtok_r(cli->cmdbuf, delim, &saveptr);
@ -321,22 +322,40 @@ char *saveptr, *delim = " \t\r\n";
cmds[i].options[j].fn(dcb);
break;
case 1:
cmds[i].options[j].fn(dcb, convert_arg(args[2],
cmds[i].options[j].arg_types[0]));
arg1 = convert_arg(args[2],cmds[i].options[j].arg_types[0]);
if (arg1)
cmds[i].options[j].fn(dcb, arg1);
else
dcb_printf(dcb, "Invalid argument: %s\n",
args[2]);
break;
case 2:
cmds[i].options[j].fn(dcb, convert_arg(args[2],
cmds[i].options[j].arg_types[0]),
convert_arg(args[3],
cmds[i].options[j].arg_types[1]));
arg1 = convert_arg(args[2],cmds[i].options[j].arg_types[0]);
arg2 = convert_arg(args[3],cmds[i].options[j].arg_types[1]);
if (arg1 && arg2)
cmds[i].options[j].fn(dcb, arg1, arg2);
else if (arg1 == 0)
dcb_printf(dcb, "Invalid argument: %s\n",
args[2]);
else
dcb_printf(dcb, "Invalid argument: %s\n",
args[3]);
break;
case 3:
cmds[i].options[j].fn(dcb, convert_arg(args[2],
cmds[i].options[j].arg_types[0]),
convert_arg(args[3],
cmds[i].options[j].arg_types[1]),
convert_arg(args[4],
cmds[i].options[j].arg_types[2]));
arg1 = convert_arg(args[2],cmds[i].options[j].arg_types[0]);
arg2 = convert_arg(args[3],cmds[i].options[j].arg_types[1]);
arg3 = convert_arg(args[4],cmds[i].options[j].arg_types[2]);
if (arg1 && arg2 && arg3)
cmds[i].options[j].fn(dcb, arg1, arg2, arg3);
else if (arg1 == 0)
dcb_printf(dcb, "Invalid argument: %s\n",
args[2]);
else if (arg2 == 0)
dcb_printf(dcb, "Invalid argument: %s\n",
args[3]);
else if (arg3 == 0)
dcb_printf(dcb, "Invalid argument: %s\n",
args[4]);
}
found = 1;
}
@ -502,7 +521,7 @@ char *err;
return;
}
if ((err = admin_add_user(user, passwd)) == NULL)
dcb_printf(dcb, "User %s has been succesfully added.\n", user);
dcb_printf(dcb, "User %s has been successfully added.\n", user);
else
dcb_printf(dcb, "Failed to add new user. %s\n", err);
}