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

Merge branch 'hartmut-getopt_long' of https://github.com/hholzgra/MaxScale into release-1.0beta-refresh

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-23 01:09:24 +01:00
parent 869de924d9 1c07f10d50
commit cd73c33d65
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
client/maxadmin.c
View File

@ -108,15 +108,10 @@ char *hostname = "localhost";
char *port = "6603"; char *port = "6603";
char *user = "admin"; char *user = "admin";
char *passwd = NULL; char *passwd = NULL;
int so, cmdlen; int so;
char *cmd;
int option_index = 0; int option_index = 0;
char c; char c;
cmd = malloc(1);
*cmd = 0;
cmdlen = 1;
while ((c = getopt_long(argc, argv, "h:p:P:u:v?", while ((c = getopt_long(argc, argv, "h:p:P:u:v?",
long_options, &option_index)) long_options, &option_index))
>= 0) >= 0)
@ -180,14 +175,28 @@ char c;
exit(1); exit(1);
} }
if (cmdlen > 1) if (optind < argc) {
{ int i, len = 0;
cmd[cmdlen - 2] = '\0'; /* Remove trailing space */ char *cmd;
if (access(cmd, R_OK) == 0)
DoSource(so, cmd); for (i = optind; i < argc; i++) {
else len += strlen(argv[i]) + 1;
sendCommand(so, cmd); }
exit(0);
cmd = malloc(len);
strcpy(cmd, argv[optind]);
for (i = optind +1; i < argc; i++) {
strcat(cmd, " ");
strcat(cmd, argv[i]);
}
if (access(cmd, R_OK) == 0)
DoSource(so, cmd);
else
sendCommand(so, cmd);
free(cmd);
exit(0);
} }
(void) setlocale(LC_CTYPE, ""); (void) setlocale(LC_CTYPE, "");