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

Add back in the quoting mechanism that was lost when the long argument

Browse Source 
handling was added. This allow for commands like
	maxadmin show service "Binlog Service"
to work on the command line
This commit is contained in:
Mark Riddoch
2014-10-02 11:07:47 +01:00
parent 9186d3fa90
commit 3d7e17d447
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/maxadmin.c
View File

@ -183,11 +183,22 @@ char c;
len += strlen(argv[i]) + 1;
}
cmd = malloc(len);
cmd = malloc(len + (2 * argc)); // Allow for quotes
strcpy(cmd, argv[optind]);
for (i = optind +1; i < argc; i++) {
for (i = optind +1; i < argc; i++)
{
strcat(cmd, " ");
strcat(cmd, argv[i]);
/* Arguments after the seconf are quoted to allow for names
* that contain white space
*/
if (i - optind > 1)
{
strcat(cmd, "\"");
strcat(cmd, argv[i]);
strcat(cmd, "\"");
}
else
strcat(cmd, argv[i]);
}
if (access(cmd, R_OK) == 0)