X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fserial.c;h=4399cf42ab5f2f87c4e6f538eca76e419d7e5357;hb=refs%2Fheads%2Fmaster;hp=378457365296fa7bfe2f0cae2662269ffe92a96c;hpb=4145f7369d761b32a10309a2623d98e64de7f444;p=sympathy.git

diff --git a/src/serial.c b/src/serial.c
index 3784573..4399cf4 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -1,15 +1,45 @@
-/*
+/* 
  * serial.c:
  *
- * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+ * Copyright (c) 2008 James McKenzie <sympathy@madingley.org>,
  * All rights reserved.
  *
  */
 
-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 ***
+ *
+ * Revision 1.11  2008/02/26 23:23:17  james
+ * *** empty log message ***
+ *
+ * Revision 1.10  2008/02/24 00:47:14  james
+ * *** empty log message ***
+ *
+ * Revision 1.9  2008/02/24 00:42:53  james
+ * *** empty log message ***
+ *
  * Revision 1.8  2008/02/23 13:05:58  staffcvs
  * *** empty log message ***
  *
@@ -69,8 +99,7 @@ static char rcsid[] = "$Id$";
 #include <sys/stat.h>
 
 
-typedef struct
-{
+typedef struct {
   TTY_SIGNATURE;
   Serial_lock *lock;
   int fd;
@@ -102,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);
 
 
@@ -132,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);
 
 
@@ -172,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;
 
@@ -198,8 +223,8 @@ serial_open (char *path, int lock_mode)
   t->fd = fd;
   t->rfd = t->fd;
   t->wfd = t->fd;
-  t->size.x = VT102_COLS;
-  t->size.y = VT102_ROWS;
+  t->size.x = VT102_COLS_80;
+  t->size.y = VT102_ROWS_24;
   t->blocked = serial_lock_check (t->lock);
   t->hanging_up = 0;