test/inc/test-eom-align: Fix tests; they've never worked.

[nmh] / sbr / terminal.c

diff --git a/sbr/terminal.c b/sbr/terminal.c
index 89d0dafc99f07ceb8de39d263cb84817b607b734..51dd1298b3ee5baf896df5997ffd2747bb3d150d 100644 (file)
--- a/sbr/terminal.c
+++ b/sbr/terminal.c
@@ -1,6 +1,4 @@
-
-/*
- * termsbr.c -- termcap support
+/* terminal.c -- termcap support
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,11 +8,11 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#include <termios.h>
 #include <sys/ioctl.h>
 
 #include <curses.h>
 #include <term.h>
+#include <termios.h>
 
 #ifdef WINSIZE_IN_PTEM
 # include <sys/stream.h>
@@ -25,7 +23,7 @@ static int initLI = 0;
 static int initCO = 0;
 
 static int LI = 40;                /* number of lines                        */
-static int CO = 80;                /* number of colums                       */
+static int CO = 80;                /* number of columns                      */
 static char *ti_clear = NULL;      /* terminfo string to clear screen        */
 static char *ti_standend = NULL;   /* terminfo string to end standout mode   */
 static char *ti_standbegin = NULL; /* terminfo string to begin standout mode */
@@ -54,9 +52,8 @@ initialize_terminfo(void)
     if (rc != 0 || errret != 1) {
        termstatus = -1;
        return;
-    } else {
-       termstatus = 1;
     }
+    termstatus = 1;
 
     if (!initCO && (CO = tigetnum ("cols")) <= 0)
        CO = 80;
@@ -120,7 +117,7 @@ nmh_clear_screen (void)
     if (ti_clear)
        tputs (ti_clear, LI, outc);
     else {
-       printf ("\f");
+       putchar('\f');
     }
 
     fflush (stdout);
@@ -175,7 +172,7 @@ get_term_stringcap(char *capability)
 
     tputs(parm, 1, termbytes);
 
-    termcbufp = '\0';
+    *termcbufp = '\0';
 
     return termcbuf;
 }
@@ -206,7 +203,7 @@ get_term_stringparm(char *capability, long arg1, long arg2)
 
     tputs(parm, 1, termbytes);
 
-    termcbufp = '\0';
+    *termcbufp = '\0';
 
     return termcbuf;
 }