*** empty log message ***

[sympathy.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index e8b315ea4725518bfa79df0eea06eba20cfaa8ba..e8b221acba01c78783b1e7a5bfcdf7546f99eede 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -10,6 +10,18 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.5  2008/02/24 00:42:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.4  2008/02/23 13:05:58  staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.3  2008/02/13 16:57:29  james
+ * *** empty log message ***
+ *
+ * Revision 1.2  2008/02/13 09:12:21  james
+ * *** empty log message ***
+ *
  * Revision 1.1  2008/02/13 01:08:38  james
  * *** empty log message ***
  *
@@ -37,11 +49,14 @@ wrap_write (int fd, void *buf, int len)
 {
   int writ;
 
+  errno = 0;
+
   writ = write (fd, buf, len);
+
   if (!writ)
     return -1;
 
-  if ((writ < 0) && (errno == -EAGAIN))
+  if ((writ < 0) && (errno == EAGAIN))
     writ = 0;
 
   return writ;
@@ -66,13 +81,15 @@ set_blocking (int fd)
   fcntl (fd, F_SETFL, arg);
 }
 
-void raw_termios(struct termios *termios)
-{
 
-  termios->c_iflag = ICRNL | IXON;
-  termios->c_oflag = OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0;
-  termios->c_lflag =
-    ISIG | ICANON | IEXTEN | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE;
+
+void
+default_termios (struct termios *termios)
+{
+  termios->c_iflag = PARMRK | INPCK;
+  termios->c_oflag = NL0 | CR0 | TAB0 | BS0 | VT0 | FF0;
+  termios->c_lflag = 0;
+  termios->c_cflag = CS8 | CREAD | CLOCAL;
 
   termios->c_cc[VINTR] = 003;
   termios->c_cc[VQUIT] = 034;
@@ -89,20 +106,36 @@ void raw_termios(struct termios *termios)
   termios->c_cc[VREPRINT] = 022;
   termios->c_cc[VDISCARD] = 017;
 
+
 }
 
 void
-default_termios (struct termios *termios)
+client_termios (struct termios *termios)
 {
-
   memset (termios, 0, sizeof (termios));
 
-  raw_termios(termios);
-
+  termios->c_iflag = ICRNL | IXON | PARMRK | INPCK;
+  termios->c_oflag = OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0;
+  termios->c_lflag =
+    ISIG | ICANON | IEXTEN | ECHO | ECHOE | ECHOK | ECHOCTL | ECHOKE;
   termios->c_cflag = CS8 | CREAD | CLOCAL;
 
+  termios->c_cc[VINTR] = 003;
+  termios->c_cc[VQUIT] = 034;
+  termios->c_cc[VERASE] = 0177;
+  termios->c_cc[VKILL] = 025;
+  termios->c_cc[VEOF] = 004;
+  termios->c_cc[VEOL] = 0;
+  termios->c_cc[VEOL2] = 0;
+  termios->c_cc[VSTART] = 021;
+  termios->c_cc[VSTOP] = 023;
+  termios->c_cc[VSUSP] = 032;
+  termios->c_cc[VLNEXT] = 026;
+  termios->c_cc[VWERASE] = 027;
+  termios->c_cc[VREPRINT] = 022;
+  termios->c_cc[VDISCARD] = 017;
+
+
   cfsetispeed (termios, B9600);
   cfsetospeed (termios, B9600);
 }
-
-