aboutsummaryrefslogtreecommitdiffstats
path: root/src/ptty.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ptty.c')
-rw-r--r--src/ptty.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/ptty.c b/src/ptty.c
index cd3dbae..5f4651d 100644
--- a/src/ptty.c
+++ b/src/ptty.c
@@ -1,4 +1,4 @@
-/*
+/*
* ptty.c:
*
* Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
@@ -8,8 +8,11 @@
static char rcsid[] = "$Id$";
-/*
+/*
* $Log$
+ * 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 ***
*
@@ -112,19 +115,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);
@@ -138,19 +140,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);
@@ -175,21 +176,20 @@ ptty_open (char *path, char *argv[], CRT_Pos * size)
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";
-
- if (!argv)
- argv = default_argv;
-
- execv (path, argv);
- _exit (-1);
- }
+ 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;
+
+ execv (path, argv);
+ _exit (-1);
+ }
set_nonblocking (fd);