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

This commit is contained in:
Zdenek Styblik 2012-01-21 05:32:24 +00:00
parent ebab3919ef
commit ba6f2fe2a2

View File

@ -365,15 +365,15 @@ static void
printiSolEscapeSequences(void) printiSolEscapeSequences(void)
{ {
printf( printf(
"%c?\r\n\ "%c?\n\
Supported escape sequences:\r\n\ Supported escape sequences:\n\
%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\
%cB - send break\r\n\ %cB - send break\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\n", (Note that escapes are only recognized immediately after newline.)\n",
ISOL_ESCAPE_CHARACTER, ISOL_ESCAPE_CHARACTER,
ISOL_ESCAPE_CHARACTER, ISOL_ESCAPE_CHARACTER,
ISOL_ESCAPE_CHARACTER, ISOL_ESCAPE_CHARACTER,
@ -484,21 +484,21 @@ processiSolUserInput(struct ipmi_intf * intf,
*/ */
switch (ch) { switch (ch) {
case '.': case '.':
printf("%c. [terminated ipmitool]\r\n", ISOL_ESCAPE_CHARACTER); printf("%c. [terminated ipmitool]\n", ISOL_ESCAPE_CHARACTER);
retval = 1; retval = 1;
break; break;
case 'Z' - 64: case 'Z' - 64:
printf("%c^Z [suspend ipmitool]\r\n", ISOL_ESCAPE_CHARACTER); printf("%c^Z [suspend ipmitool]\n", ISOL_ESCAPE_CHARACTER);
suspendSelf(1); /* Restore tty back to raw */ suspendSelf(1); /* Restore tty back to raw */
continue; continue;
case 'X' - 64: case 'X' - 64:
printf("%c^X [suspend ipmitool]\r\n", ISOL_ESCAPE_CHARACTER); printf("%c^X [suspend ipmitool]\n", ISOL_ESCAPE_CHARACTER);
suspendSelf(0); /* Don't restore to raw mode */ suspendSelf(0); /* Don't restore to raw mode */
continue; continue;
case 'B': case 'B':
printf("%cb [send break]\r\n", ISOL_ESCAPE_CHARACTER); printf("%cb [send break]\n", ISOL_ESCAPE_CHARACTER);
sendBreak(intf); sendBreak(intf);
continue; continue;
@ -752,7 +752,7 @@ ipmi_isol_activate(struct ipmi_intf * intf)
/* response contain 4 additional bytes : 80 01 32 ff /* response contain 4 additional bytes : 80 01 32 ff
Don't know what to use them for yet... */ Don't know what to use them for yet... */
printf("[SOL Session operational. Use %c? for help]\r\n", printf("[SOL Session operational. Use %c? for help]\n",
ISOL_ESCAPE_CHARACTER); ISOL_ESCAPE_CHARACTER);
/* /*