*** empty log message ***

[sympathy.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index bd4450cfa92738e7fc0c0e30e67124179aa647a6..1044bb25d14c6415b4a686e2d87e38ad9914c5b0 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -6,10 +6,17 @@
  *
  */
 
-static char rcsid[] = "$Id$";
+static char rcsid[] =
+  "$Id$";
 
 /*
  * $Log$
+ * 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 ***
+ *
  * Revision 1.7  2008/02/15 23:52:12  james
  * *** empty log message ***
  *
@@ -163,12 +170,25 @@ serial_open (char *path, int lock_mode)
   if (!l)
     return NULL;
 
-  default_termios (&termios);
 
   fd = open (path, O_RDWR | O_NOCTTY | O_NONBLOCK);
 
   set_nonblocking (fd);
 
+
+  if (tcgetattr (fd, &termios))
+    {
+      close (fd);
+      return NULL;
+    }
+  default_termios (&termios);
+
+  if (tcsetattr (fd, TCSANOW, &termios))
+    {
+      close (fd);
+      return NULL;
+    }
+
   t = (Serial *) malloc (sizeof (Serial));
 
   t->lock = l;