mirror of
https://github.com/ipmitool/ipmitool.git
synced 2025-05-10 18:47:22 +00:00
use strtol instead of strtod because the latter has problems interpreting
hex strings on solaris
This commit is contained in:
parent
2c898cfc85
commit
f7590819fa
@ -630,7 +630,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
chan = (unsigned char) strtod(argv[0], NULL);
|
chan = (unsigned char)strtol(argv[0], NULL, 0);
|
||||||
if (chan != 0x6 && chan != 0x7) {
|
if (chan != 0x6 && chan != 0x7) {
|
||||||
printf("valid LAN channels are 6 and 7\n");
|
printf("valid LAN channels are 6 and 7\n");
|
||||||
return;
|
return;
|
||||||
@ -815,7 +815,7 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
!strncmp(argv[0], "print", 5)) {
|
!strncmp(argv[0], "print", 5)) {
|
||||||
unsigned char chan = 7;
|
unsigned char chan = 7;
|
||||||
if (argc > 1)
|
if (argc > 1)
|
||||||
chan = (unsigned char) strtod(argv[1], NULL);
|
chan = (unsigned char)strtol(argv[1], NULL, 0);
|
||||||
ipmi_lan_print(intf, chan);
|
ipmi_lan_print(intf, chan);
|
||||||
}
|
}
|
||||||
else if (!strncmp(argv[0], "set", 3))
|
else if (!strncmp(argv[0], "set", 3))
|
||||||
|
@ -94,8 +94,8 @@ int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
netfn = strtod(argv[0], NULL);
|
netfn = (unsigned char)strtol(argv[0], NULL, 0);
|
||||||
cmd = strtod(argv[1], NULL);
|
cmd = (unsigned char)strtol(argv[1], NULL, 0);
|
||||||
|
|
||||||
memset(data, 0, sizeof(data));
|
memset(data, 0, sizeof(data));
|
||||||
memset(&req, 0, sizeof(req));
|
memset(&req, 0, sizeof(req));
|
||||||
@ -104,7 +104,7 @@ int ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
|
|||||||
req.msg.data = data;
|
req.msg.data = data;
|
||||||
|
|
||||||
for (i=2; i<argc; i++) {
|
for (i=2; i<argc; i++) {
|
||||||
unsigned char val = strtod(argv[i], NULL);
|
unsigned char val = (unsigned char)strtol(argv[i], NULL, 0);
|
||||||
req.msg.data[i-2] = val;
|
req.msg.data[i-2] = val;
|
||||||
req.msg.data_len++;
|
req.msg.data_len++;
|
||||||
}
|
}
|
||||||
@ -323,7 +323,7 @@ int main(int argc, char ** argv)
|
|||||||
}
|
}
|
||||||
else if (!strncmp(argv[optind], "event", 5)) {
|
else if (!strncmp(argv[optind], "event", 5)) {
|
||||||
if (argc-optind-1 > 0) {
|
if (argc-optind-1 > 0) {
|
||||||
unsigned char c = strtod(argv[optind+1], NULL);
|
unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
|
||||||
if (intf->open(intf, hostname, port, username, password) < 0)
|
if (intf->open(intf, hostname, port, username, password) < 0)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
ipmi_send_platform_event(intf, c);
|
ipmi_send_platform_event(intf, c);
|
||||||
@ -362,7 +362,7 @@ int main(int argc, char ** argv)
|
|||||||
}
|
}
|
||||||
else if (!strncmp(argv[optind], "userinfo", 8)) {
|
else if (!strncmp(argv[optind], "userinfo", 8)) {
|
||||||
if (argc-optind-1 > 0) {
|
if (argc-optind-1 > 0) {
|
||||||
unsigned char c = strtod(argv[optind+1], NULL);
|
unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
|
||||||
rc = intf->open(intf, hostname, port, username, password);
|
rc = intf->open(intf, hostname, port, username, password);
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
@ -376,7 +376,7 @@ int main(int argc, char ** argv)
|
|||||||
}
|
}
|
||||||
else if (!strncmp(argv[optind], "chaninfo", 8)) {
|
else if (!strncmp(argv[optind], "chaninfo", 8)) {
|
||||||
if (argc-optind-1 > 0) {
|
if (argc-optind-1 > 0) {
|
||||||
unsigned char c = strtod(argv[optind+1], NULL);
|
unsigned char c = (unsigned char)strtol(argv[optind+1], NULL, 0);
|
||||||
rc = intf->open(intf, hostname, port, username, password);
|
rc = intf->open(intf, hostname, port, username, password);
|
||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user