← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ipmitool/vivid-updates

« back to all changes in this revision

Viewing changes to lib/ipmi_sol.c

  • Committer: Package Import Robot
  • Author(s): Luk Claes
  • Date: 2013-05-07 18:12:12 UTC
  • mfrom: (5.1.11 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130507181212-fitwelheknk3tqnq
Tags: 1.8.12-1
http://bugs.debian.org/692292
Merge new upstream from Ubuntu (Closes: #692292).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ipmi_sol.c
1226
1226
printSolEscapeSequences(struct ipmi_intf * intf)
1227
1227
{
1228
1228
        printf(
1229
 
                   "%c?\r\n\
1230
 
        Supported escape sequences:\r\n\
1231
 
        %c.  - terminate connection\r\n\
1232
 
        %c^Z - suspend ipmitool\r\n\
1233
 
        %c^X - suspend ipmitool, but don't restore tty on restart\r\n\
1234
 
        %cB  - send break\r\n\
1235
 
        %c?  - this message\r\n\
1236
 
        %c%c  - send the escape character by typing it twice\r\n\
1237
 
        (Note that escapes are only recognized immediately after newline.)\r\n",
 
1229
                   "%c?\n\
 
1230
        Supported escape sequences:\n\
 
1231
        %c.  - terminate connection\n\
 
1232
        %c^Z - suspend ipmitool\n\
 
1233
        %c^X - suspend ipmitool, but don't restore tty on restart\n\
 
1234
        %cB  - send break\n\
 
1235
        %c?  - this message\n\
 
1236
        %c%c  - send the escape character by typing it twice\n\
 
1237
        (Note that escapes are only recognized immediately after newline.)\n",
1238
1238
                   intf->session->sol_escape_char,
1239
1239
                   intf->session->sol_escape_char,
1240
1240
                   intf->session->sol_escape_char,
1373
1373
                         */
1374
1374
                        switch (ch) {
1375
1375
                        case '.':
1376
 
                                printf("%c. [terminated ipmitool]\r\n",
 
1376
                                printf("%c. [terminated ipmitool]\n",
1377
1377
                                       intf->session->sol_escape_char);
1378
1378
                                retval = 1;
1379
1379
                                break;
1380
1380
 
1381
1381
                        case 'Z' - 64:
1382
 
                                printf("%c^Z [suspend ipmitool]\r\n",
 
1382
                                printf("%c^Z [suspend ipmitool]\n",
1383
1383
                                       intf->session->sol_escape_char);
1384
1384
                                suspendSelf(1); /* Restore tty back to raw */
1385
1385
                                continue;
1386
1386
 
1387
1387
                        case 'X' - 64:
1388
 
                                printf("%c^Z [suspend ipmitool]\r\n",
 
1388
                                printf("%c^Z [suspend ipmitool]\n",
1389
1389
                                       intf->session->sol_escape_char);
1390
1390
                                suspendSelf(0); /* Don't restore to raw mode */
1391
1391
                                continue;
1392
1392
 
1393
1393
                        case 'B':
1394
 
                                printf("%cB [send break]\r\n",
 
1394
                                printf("%cB [send break]\n",
1395
1395
                                       intf->session->sol_escape_char);
1396
1396
                                sendBreak(intf);
1397
1397
                                continue;
1829
1829
                }
1830
1830
        }
1831
1831
 
1832
 
        printf("[SOL Session operational.  Use %c? for help]\r\n",
 
1832
        printf("[SOL Session operational.  Use %c? for help]\n",
1833
1833
               intf->session->sol_escape_char);
1834
1834
 
1835
1835
        if(looptest == 1)