--- main.c.orig	Thu Mar 25 11:26:53 1999
+++ main.c	Tue Sep 26 17:27:58 2000
@@ -100,12 +100,8 @@
 extern void term_echo();
 
 int last_line_length;
-#if defined(HAVE_SYS_TERMIO_H) && !defined(BSD_ECHO) || defined(HAVE_TERMIO_H)
-#if defined(HAVE_SYS_TERMIO_H)
-#include <sys/termio.h>
-#else
-#include <termio.h>
-#endif
+#if 1
+#include <termios.h>
 tcflag_t c_lflag;
 cc_t c_cc[NCCS];
 #else
@@ -580,7 +576,7 @@
     if(ses->logfile) {
       if (!OLD_LOG) {
       count=0;
-      for(n=0;n<=didget;n++) 
+      for(n=0;n<didget;n++)
          if (buffer[n]!='\r') { 
             temp[count]=buffer[n]; 
             count++;
@@ -750,7 +746,7 @@
       sprintf(strng,"%c8%s\n\r%c7%c[%d;%df", E, cptr, E, E, input_row, input_col);
     else
       sprintf(strng,"%s\n\r", cptr);
-    write(1,strng, strlen(strng)+1);
+    write(1,strng, strlen(strng));
     display_col=1;
     if (redraw && term_echoing && !is_split)
       write(1, k_input, strlen(k_input));
@@ -806,7 +802,7 @@
       cptr++;
       sprintf(strng,"%s\n\r", cptr);
     }
-    write(1,strng, strlen(strng)+1);
+    write(1,strng, strlen(strng));
     display_col=1;
   } 
   text_came=TRUE;  
@@ -876,7 +872,7 @@
   input_col=1;  
   sprintf(fn, "%c[2J%c[1;%dr%c[%d;1f", E, E, display_row, E, split_line);
   write(1,fn, strlen(fn));
-  write(1,"-------------------------------------------------------------------------------", 80);
+  write(1,"--------------------------------------------------------------------------------", 80);
   sprintf(fn, "%c[%d;1f%c7", E, split_line-1, E);
   write(1,fn,strlen(fn));
   sprintf(fn, "%c[%d;1f", E, input_row);