1 files changed, 37 insertions, 32 deletions

diff --git a/src/serial.c b/src/serial.c
index 731bae7..5c880a2 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /* 
  * $Log$
+ * Revision 1.19  2012/06/22 10:22:25  james
+ * *** empty log message ***
+ *
  * Revision 1.18  2011/02/06 16:51:22  james
  * *** empty log message ***
  *
@@ -99,7 +102,8 @@ static char rcsid[] = "$Id$";
 #include <sys/stat.h>
 
 
-typedef struct {
+typedef struct
+{
   TTY_SIGNATURE;
   Serial_lock *lock;
   int fd;
@@ -131,18 +135,19 @@ 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 done ? done:-1;
-    if (!red)
-      return done;
+      red = wrap_read (t->fd, buf, len);
+      if (red < 0)
+        return done ? done : -1;
+      if (!red)
+        return done;
 
-    buf += red;
-    len -= red;
-    done += red;
-  }
+      buf += red;
+      len -= red;
+      done += red;
+    }
   while (len);
 
 
@@ -160,18 +165,19 @@ 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);
 
 
@@ -182,9 +188,6 @@ TTY *
 serial_open (char *path, int lock_mode)
 {
   Serial *t;
-  pid_t child;
-  char name[1024];
-  struct winsize winsize = { 0 };
   struct termios termios;
   int fd;
   Serial_lock *l;
@@ -199,16 +202,18 @@ 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 *) xmalloc (sizeof (Serial));