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

Remove hardcoded CR('\r') from 'lib/ipmi_tsol.c'.

Browse Source
This commit is contained in:
Zdenek Styblik 2012-01-21 05:26:23 +00:00
parent 619233e14b
commit e0ed4351d0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipmitool/lib/ipmi_tsol.c
View File

@ -184,12 +184,12 @@ static void
print_escape_seq(struct ipmi_intf *intf) print_escape_seq(struct ipmi_intf *intf)
{ {
lprintf(LOG_NOTICE, lprintf(LOG_NOTICE,
" %c. - terminate connection\r\n" " %c. - terminate connection\n"
" %c^Z - suspend ipmitool\r\n" " %c^Z - suspend ipmitool\n"
" %c^X - suspend ipmitool, but don't restore tty on restart\r\n" " %c^X - suspend ipmitool, but don't restore tty on restart\n"
" %c? - this message\r\n" " %c? - this message\n"
" %c%c - send the escape character by typing it twice\r\n" " %c%c - send the escape character by typing it twice\n"
" (Note that escapes are only recognized immediately after newline.)\r", " (Note that escapes are only recognized immediately after newline.)",
intf->session->sol_escape_char, intf->session->sol_escape_char,
intf->session->sol_escape_char, intf->session->sol_escape_char,
intf->session->sol_escape_char, intf->session->sol_escape_char,
@ -288,24 +288,24 @@ do_inbuf_actions(struct ipmi_intf *intf, char *in_buff, int len)
switch (in_buff[i]) { switch (in_buff[i]) {
case '.': case '.':
printf("%c. [terminated ipmitool]\r\n", printf("%c. [terminated ipmitool]\n",
intf->session->sol_escape_char); intf->session->sol_escape_char);
return -1; return -1;
case 'Z' - 64: case 'Z' - 64:
printf("%c^Z [suspend ipmitool]\r\n", printf("%c^Z [suspend ipmitool]\n",
intf->session->sol_escape_char); intf->session->sol_escape_char);
suspend_self(1); /* Restore tty back to raw */ suspend_self(1); /* Restore tty back to raw */
break; break;
case 'X' - 64: case 'X' - 64:
printf("%c^X [suspend ipmitool]\r\n", printf("%c^X [suspend ipmitool]\n",
intf->session->sol_escape_char); intf->session->sol_escape_char);
suspend_self(0); /* Don't restore to raw mode */ suspend_self(0); /* Don't restore to raw mode */
break; break;
case '?': case '?':
printf("%c? [ipmitool help]\r\n", printf("%c? [ipmitool help]\n",
intf->session->sol_escape_char); intf->session->sol_escape_char);
print_escape_seq(intf); print_escape_seq(intf);
break; break;
@ -469,7 +469,7 @@ ipmi_tsol_main(struct ipmi_intf * intf, int argc, char ** argv)
} }
} }
printf("[Starting %sSOL with receiving address %s:%d]\r\n", printf("[Starting %sSOL with receiving address %s:%d]\n",
read_only ? "Read-only " : "", recvip, port); read_only ? "Read-only " : "", recvip, port);
set_terminal_size(rows, cols); set_terminal_size(rows, cols);
@ -485,7 +485,7 @@ ipmi_tsol_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1; return -1;
} }
printf("[SOL Session operational. Use %c? for help]\r\n", printf("[SOL Session operational. Use %c? for help]\n",
intf->session->sol_escape_char); intf->session->sol_escape_char);
gettimeofday(&_start_keepalive, 0); gettimeofday(&_start_keepalive, 0);