1 files changed, 32 insertions, 35 deletions

diff --git a/src/terminal.c b/src/terminal.c
index a3be09b..ca317b7 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * 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 ***
  *
@@ -70,8 +73,7 @@ static char rcsid[] =
 #include "project.h"
 
 
-typedef struct TERMINAL_struct
-{
+typedef struct TERMINAL_struct {
   TTY_SIGNATURE;
   struct termios orig_termios;
   struct TERMINAL_struct *next;
@@ -113,7 +115,7 @@ terminal_close (TTY * _t)
   t->xmit (_t, "\017", 1);      //Select G0
   t->xmit (_t, "\033[r", 3);    //No margins
   t->xmit (_t, "\033[0m", 4);   //Default attributes
-  i = sprintf (buf, "\033[%d;%dH", t->displayed_length ?(t->displayed_length+1): (CRT_ROWS +1), 1); //Cursor to bottom
+  i = sprintf (buf, "\033[%d;%dH", t->displayed_length ? (t->displayed_length + 1) : (CRT_ROWS + 1), 1); //Cursor to bottom
   t->xmit (_t, buf, i);
   t->xmit (_t, "\033[J", 3);    //erase rest of screen
 
@@ -154,16 +156,13 @@ terminal_getsize (TTY * _t)
   if (!t)
     return;
 
-  if (ioctl (t->wfd, TIOCGWINSZ, &sz))
-    {
-      t->size.x = CRT_COLS;
-      t->size.y = CRT_ROWS;
-    }
-  else
-    {
-      t->size.x = sz.ws_col;
-      t->size.y = sz.ws_row;
-    }
+  if (ioctl (t->wfd, TIOCGWINSZ, &sz)) {
+    t->size.x = CRT_COLS;
+    t->size.y = CRT_ROWS;
+  } else {
+    t->size.x = sz.ws_col;
+    t->size.y = sz.ws_row;
+  }
 }
 
 
@@ -193,19 +192,18 @@ terminal_read (TTY * _t, void *buf, int len)
   terminal_dispatch ();
   set_nonblocking (t->rfd);
 
-  do
-    {
+  do {
 
-      red = wrap_read (t->rfd, buf, len);
-      if (red < 0)
-        return -1;
-      if (!red)
-        return done;
+    red = wrap_read (t->rfd, 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);
 
 
@@ -223,20 +221,19 @@ terminal_write (TTY * _t, void *buf, int len)
 
   set_blocking (t->wfd);
 
-  do
-    {
+  do {
 
-      writ = wrap_write (t->wfd, buf, len);
-      if (writ < 0)
-        return -1;
+    writ = wrap_write (t->wfd, buf, len);
+    if (writ < 0)
+      return -1;
 
-      if (!writ)
-        usleep (1000);
+    if (!writ)
+      usleep (1000);
 
-      buf += writ;
-      len -= writ;
-      done += writ;
-    }
+    buf += writ;
+    len -= writ;
+    done += writ;
+  }
   while (len);