diff options
Diffstat (limited to 'src/serial.c')
| -rw-r--r-- | src/serial.c | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/src/serial.c b/src/serial.c index 25748ac..bc3558a 100644 --- a/src/serial.c +++ b/src/serial.c @@ -1,4 +1,4 @@ -/* +/* * serial.c: * * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>, @@ -8,8 +8,11 @@ static char rcsid[] = "$Id$"; -/* +/* * $Log$ + * Revision 1.15 2008/03/07 12:37:04 james + * *** empty log message *** + * * Revision 1.14 2008/03/03 06:04:42 james * *** empty log message *** * @@ -120,19 +123,18 @@ serial_read (TTY * _t, void *buf, int len) if (t->blocked) return 0; - do - { + do { - red = wrap_read (t->fd, buf, len); - if (red < 0) - return -1; - if (!red) - return done; + red = wrap_read (t->fd, buf, len); + if (red < 0) + return -1; + if (!red) + return done; - buf += red; - len -= red; - done += red; - } + buf += red; + len -= red; + done += red; + } while (len); @@ -150,19 +152,18 @@ serial_write (TTY * _t, void *buf, int len) if (t->blocked) return 0; - do - { + do { - writ = wrap_write (t->fd, buf, len); - if (writ < 0) - return -1; - if (!writ) - sleep (1); + writ = wrap_write (t->fd, buf, len); + if (writ < 0) + return -1; + if (!writ) + sleep (1); - buf += writ; - len -= writ; - done += writ; - } + buf += writ; + len -= writ; + done += writ; + } while (len); @@ -190,18 +191,16 @@ serial_open (char *path, int lock_mode) set_nonblocking (fd); - if (tcgetattr (fd, &termios)) - { - close (fd); - return NULL; - } + if (tcgetattr (fd, &termios)) { + close (fd); + return NULL; + } default_termios (&termios); - if (tcsetattr (fd, TCSANOW, &termios)) - { - close (fd); - return NULL; - } + if (tcsetattr (fd, TCSANOW, &termios)) { + close (fd); + return NULL; + } t = (Serial *) malloc (sizeof (Serial)); |