X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=blobdiff_plain;f=src%2Fptty.c;h=5a462e49ac960dc3787e834a3593a047f14a3070;hp=3be35f22b34b4d2aa46e0272357b62c81c51197f;hb=e398b84ba34f0290e21830e36ff40719e2ec7125;hpb=caf94d0d1e0761964085d873603dfd77faa7c4fd

diff --git a/src/ptty.c b/src/ptty.c
index 3be35f2..5a462e4 100644
--- a/src/ptty.c
+++ b/src/ptty.c
@@ -1,15 +1,39 @@
-/*
+/* 
  * ptty.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: ptty.c,v 1.23 2008/03/12 01:30:23 james Exp $";
 
-/*
- * $Log$
+/* 
+ * $Log: ptty.c,v $
+ * Revision 1.23  2008/03/12 01:30:23  james
+ * *** empty log message ***
+ *
+ * Revision 1.22  2008/03/12 01:26:56  james
+ * *** empty log message ***
+ *
+ * Revision 1.21  2008/03/10 11:49:33  james
+ * *** empty log message ***
+ *
+ * Revision 1.20  2008/03/07 13:16:02  james
+ * *** empty log message ***
+ *
+ * Revision 1.19  2008/03/07 12:37:04  james
+ * *** empty log message ***
+ *
+ * Revision 1.18  2008/03/03 06:04:42  james
+ * *** empty log message ***
+ *
+ * Revision 1.17  2008/03/02 10:37:56  james
+ * *** empty log message ***
+ *
+ * Revision 1.16  2008/02/28 16:57:52  james
+ * *** empty log message ***
+ *
  * Revision 1.15  2008/02/27 09:42:53  james
  * *** empty log message ***
  *
@@ -75,8 +99,7 @@ static char rcsid[] = "$Id$";
 #include "project.h"
 
 
-typedef struct
-{
+typedef struct {
   TTY_SIGNATURE;
   int fd;
   pid_t child;
@@ -103,19 +126,18 @@ ptty_read (TTY * _t, void *buf, int len)
   PTTY *t = (PTTY *) _t;
   int red, done = 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 -1;
+    if (!red)
+      return done;
 
-      buf += red;
-      len -= red;
-      done += red;
-    }
+    buf += red;
+    len -= red;
+    done += red;
+  }
   while (len);
 
 
@@ -129,19 +151,18 @@ ptty_write (TTY * _t, void *buf, int len)
   int writ, done = 0;
   PTTY *t = (PTTY *) _t;
 
-  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);
 
 
@@ -161,26 +182,29 @@ ptty_open (char *path, char *argv[], CRT_Pos * size)
 
 
   client_termios (&ctermios);
-  winsize.ws_row = size ? size->y : VT102_ROWS;
+  winsize.ws_row = size ? size->y : VT102_ROWS_24;
   winsize.ws_col = size ? size->x : VT102_COLS_80;
 
   child = forkpty (&fd, name, &ctermios, &winsize);
 
-  switch (child)
-    {
-    case -1:                   /*boo hiss */
-      return NULL;
-    case 0:                    /*waaah */
-      setenv ("TERM", "xterm", 1);
-      if (!path)
-        path = "/bin/sh";
+  switch (child) {
+  case -1:                     /* boo hiss */
+    return NULL;
+  case 0:                      /* waaah */
+    setenv ("TERM", "xterm", 1);
+    if (!path)
+      path = "/bin/sh";
 
-      if (!argv)
-        argv = default_argv;
+    if (!argv)
+      argv = default_argv;
 
+    if (path[0] == '/')
       execv (path, argv);
-      _exit (-1);
-    }
+    else
+      execvp (path, argv);
+
+    _exit (-1);
+  }
 
   set_nonblocking (fd);
 
@@ -194,7 +218,7 @@ ptty_open (char *path, char *argv[], CRT_Pos * size)
   }
 #endif
 
-  t = (PTTY *) malloc (sizeof (PTTY));
+  t = (PTTY *) xmalloc (sizeof (PTTY));
 
   strncpy (t->name, name, sizeof (t->name));
   t->name[sizeof (t->name) - 1] = 0;