Merge branch 'cvsimport'

[sympathy.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index e269c83b8e44073c641127d5b007f5fc2ce96fe1..dac5ff27af6248d797fce7ebdd446fda534e6ca8 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * serial.c:
  *
  * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
@@ -6,10 +6,28 @@
  *
  */
 
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$Id: serial.c,v 1.18 2011/02/06 16:51:22 james Exp $";
 
-/*
- * $Log$
+/* 
+ * $Log: serial.c,v $
+ * Revision 1.18  2011/02/06 16:51:22  james
+ * *** empty log message ***
+ *
+ * Revision 1.17  2008/03/10 11:49:33  james
+ * *** empty log message ***
+ *
+ * Revision 1.16  2008/03/07 13:16:02  james
+ * *** empty log message ***
+ *
+ * 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 ***
+ *
+ * Revision 1.13  2008/03/02 10:37:56  james
+ * *** empty log message ***
+ *
  * Revision 1.12  2008/02/28 16:57:52  james
  * *** empty log message ***
  *
@@ -81,8 +99,7 @@ static char rcsid[] = "$Id$";
 #include <sys/stat.h>
 
 
-typedef struct
-{
+typedef struct {
   TTY_SIGNATURE;
   Serial_lock *lock;
   int fd;
@@ -114,19 +131,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 done ? done:-1;
+    if (!red)
+      return done;
 
-      buf += red;
-      len -= red;
-      done += red;
-    }
+    buf += red;
+    len -= red;
+    done += red;
+  }
   while (len);
 
 
@@ -144,19 +160,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);
 
 
@@ -184,20 +199,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 *) malloc (sizeof (Serial));
+  t = (Serial *) xmalloc (sizeof (Serial));
 
   t->lock = l;