qi-hardware/wernermisc
1
0
Fork 0
mirror of git://projects.qi-hardware.com/wernermisc.git synced 2024-11-25 10:10:37 +02:00
Code

neocon.c: new option -c to enable ONLCR for console output

Browse Source
This commit is contained in:
Werner Almesberger 2011-11-21 17:26:41 -03:00
parent f3e1f925c4
commit 4040ad3986
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
neocon/neocon.c
View File

@ -73,7 +73,7 @@ static speed_t bps_to_speed(int bps)
} }
static void make_raw(int fd, struct termios *old) static void make_raw(int fd, struct termios *old, int cr)
{ {
struct termios t; struct termios t;
long flags; long flags;
@ -98,6 +98,8 @@ static void make_raw(int fd, struct termios *old)
exit(1); exit(1);
} }
} }
if (cr)
t.c_oflag |= OPOST | ONLCR;
if (tcsetattr(fd, TCSANOW, &t) < 0) { if (tcsetattr(fd, TCSANOW, &t) < 0) {
perror("tcsetattr"); perror("tcsetattr");
exit(1); exit(1);
@ -125,7 +127,7 @@ static int open_next_tty(void)
break; break;
} }
if (fd >= 0) if (fd >= 0)
make_raw(fd, &tty); make_raw(fd, &tty, 0);
return fd; return fd;
} }
@ -278,9 +280,11 @@ static void cleanup(void)
static void usage(const char *name) static void usage(const char *name)
{ {
fprintf(stderr, fprintf(stderr,
"usage: %s [-b bps] [-e escape] [-l logfile [-a] [-T]] [-t delay_ms] tty ...\n\n" "usage: %s [-b bps] [-c] [-e escape] [-l logfile [-a] [-T]] [-t delay_ms] "
"tty ...\n\n"
" -a append to the log file if it already exists\n" " -a append to the log file if it already exists\n"
" -b bps set the TTY to the specified bit rate\n" " -b bps set the TTY to the specified bit rate\n"
" -c add carriage return before newline (on console)\n"
" -e escape set the escape character (default: ~)\n" " -e escape set the escape character (default: ~)\n"
" -l logfile log all output to the specified file\n" " -l logfile log all output to the specified file\n"
" -t delay_ms wait the specified amount of time between input characters\n" " -t delay_ms wait the specified amount of time between input characters\n"
@ -293,14 +297,14 @@ static void usage(const char *name)
int main(int argc, char *const *argv) int main(int argc, char *const *argv)
{ {
char *end; char *end;
int c, bps; int c, bps, cr = 0;
int fd = -1; int fd = -1;
int append = 0; int append = 0;
const char *logfile = NULL; const char *logfile = NULL;
int throttle_us = 0; int throttle_us = 0;
int throttle = 0; int throttle = 0;
while ((c = getopt(argc, argv, "ab:e:l:t:T")) != EOF) while ((c = getopt(argc, argv, "ab:ce:l:t:T")) != EOF)
switch (c) { switch (c) {
case 'a': case 'a':
append = 1; append = 1;
@ -311,6 +315,9 @@ int main(int argc, char *const *argv)
usage(*argv); usage(*argv);
speed = bps_to_speed(bps); speed = bps_to_speed(bps);
break; break;
case 'c':
cr = 1;
break;
case 'e': case 'e':
if (strlen(optarg) != 1) if (strlen(optarg) != 1)
usage(*argv); usage(*argv);
@ -342,7 +349,7 @@ int main(int argc, char *const *argv)
setlinebuf(log); setlinebuf(log);
} }
make_raw(0, &console); make_raw(0, &console, cr);
atexit(cleanup); atexit(cleanup);
while (1) { while (1) {
struct timeval tv; struct timeval tv;