deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 02:57:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix handling of quotes in shell

Browse Source
This commit is contained in:
Duncan Laurie 2005-05-15 04:50:34 +00:00
parent 2d0c486541
commit a567ac9426
1 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ipmitool/src/ipmishell.c
View File

@ -96,7 +96,7 @@ static int rl_event_keepalive(void)
int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv) int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
{ {
char *pbuf, **ap, *__argv[20]; char *ptr, *pbuf, **ap, *__argv[20];
int __argc, rc=0; int __argc, rc=0;
rl_readline_name = "ipmitool"; rl_readline_name = "ipmitool";
@ -136,6 +136,28 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
/* for the all-important up arrow :) */ /* for the all-important up arrow :) */
add_history(pbuf); add_history(pbuf);
/* change "" and '' with spaces in the middle to ~ */
ptr = pbuf;
while (*ptr != '\0') {
if (*ptr == '"') {
ptr++;
while (*ptr != '"') {
if (isspace(*ptr))
*ptr = '~';
ptr++;
}
}
if (*ptr == '\'') {
ptr++;
while (*ptr != '\'') {
if (isspace(*ptr))
*ptr = '~';
ptr++;
}
}
ptr++;
}
__argc = 0; __argc = 0;
ap = __argv; ap = __argv;
@ -143,6 +165,27 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
*ap != NULL; *ap != NULL;
*ap = strtok(NULL, " \t")) { *ap = strtok(NULL, " \t")) {
__argc++; __argc++;
ptr = *ap;
if (*ptr == '\'') {
memmove(ptr, ptr+1, strlen(ptr));
while (*ptr != '\'') {
if (*ptr == '~')
*ptr = ' ';
ptr++;
}
*ptr = '\0';
}
if (*ptr == '"') {
memmove(ptr, ptr+1, strlen(ptr));
while (*ptr != '"') {
if (*ptr == '~')
*ptr = ' ';
ptr++;
}
*ptr = '\0';
}
if (**ap != '\0') { if (**ap != '\0') {
if (++ap >= &__argv[20]) if (++ap >= &__argv[20])
break; break;
@ -230,7 +273,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
else if (strncmp(argv[0], "authtype", 8) == 0) { else if (strncmp(argv[0], "authtype", 8) == 0) {
int authtype; int authtype;
authtype = str2val(argv[1], ipmi_authtype_session_vals); authtype = str2val(argv[1], ipmi_authtype_session_vals);
if (authtype < 0) { if (authtype == 0xFF) {
lprintf(LOG_ERR, "Invalid authtype: %s", argv[1]); lprintf(LOG_ERR, "Invalid authtype: %s", argv[1]);
} else { } else {
ipmi_intf_session_set_authtype(intf, authtype); ipmi_intf_session_set_authtype(intf, authtype);
@ -241,7 +284,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
else if (strncmp(argv[0], "privlvl", 7) == 0) { else if (strncmp(argv[0], "privlvl", 7) == 0) {
int privlvl; int privlvl;
privlvl = str2val(argv[1], ipmi_privlvl_vals); privlvl = str2val(argv[1], ipmi_privlvl_vals);
if (privlvl < 0) { if (privlvl == 0xFF) {
lprintf(LOG_ERR, "Invalid privilege level: %s", argv[1]); lprintf(LOG_ERR, "Invalid privilege level: %s", argv[1]);
} else { } else {
ipmi_intf_session_set_privlvl(intf, privlvl); ipmi_intf_session_set_privlvl(intf, privlvl);
@ -299,8 +342,7 @@ int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv)
else else
ptr = buf + strlen(buf); ptr = buf + strlen(buf);
/* change "" and '' with spaces in the middle to ~ /* change "" and '' with spaces in the middle to ~ */
* this is really ugly but I'm in a hurry */
ptr = buf; ptr = buf;
while (*ptr != '\0') { while (*ptr != '\0') {
if (*ptr == '"') { if (*ptr == '"') {