Drop support for different behavior on hardcopy terminals. It's 2014,

I'm assuming this is not a valid concern anymore.

diff --git a/h/prototypes.h b/h/prototypes.h
index 3797fecce3d5ce19b5fcf1b263bf332ad352f0dc..d56ef30cee7c437af45318c874a2ccac335dd8f8 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -288,7 +288,6 @@ int mhlsbr(int, char **, FILE *(*)(char *));
 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
        int, char *, char *, char *, int);
 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
        int, char *, char *, char *, int);

-int sc_hardcopy(void);

 int sc_length(void);
 int sc_width(void);
 int build_form (char *, char *, int *, char *, char *, char *, char *,
 int sc_length(void);
 int sc_width(void);
 int build_form (char *, char *, int *, char *, char *, char *, char *,

diff --git a/sbr/terminal.c b/sbr/terminal.c
index fa33fac2a5c95db3ab2f35c304e11cb42b350614..4b29cace8d8db15f89229a87b8385a3475897c5e 100644 (file)
--- a/sbr/terminal.c
+++ b/sbr/terminal.c
@@ -44,7 +44,6 @@ static long speedcode;
 static int initLI = 0;
 static int initCO = 0;
 
 static int initLI = 0;
 static int initCO = 0;
 

-static int HC = 0;       /* are we on a hardcopy terminal?        */

 static int LI = 40;      /* number of lines                       */
 static int CO = 80;      /* number of colums                      */
 static char *CL = NULL;  /* termcap string to clear screen        */
 static int LI = 40;      /* number of lines                       */
 static int CO = 80;      /* number of colums                      */
 static char *CL = NULL;  /* termcap string to clear screen        */


@@ -86,8 +85,6 @@ read_termcap(void)
 
     speedcode = cfgetospeed(&tio);
 
 
     speedcode = cfgetospeed(&tio);
 

-    HC = tgetflag ("hc");
-

     if (!initCO && (CO = tgetnum ("co")) <= 0)
        CO = 80;
     if (!initLI && (LI = tgetnum ("li")) <= 0)
     if (!initCO && (CO = tgetnum ("co")) <= 0)
        CO = 80;
     if (!initLI && (LI = tgetnum ("li")) <= 0)


@@ -185,14 +182,3 @@ SOprintf (char *fmt, ...)
     return OK;
 }
 
     return OK;
 }
 

-/*
- * Is this a hardcopy terminal?
- */
-
-int
-sc_hardcopy(void)
-{
-    read_termcap();
-    return HC;
-}
-

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 0788d1ef77600feb0fcf5dbfa6acb95838c2fde1..b6b7a627f9f8dc5a8a160d3f894ad166dd22b199 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -478,7 +478,7 @@ mhl (int argc, char **argv)
        folder = getenv ("mhfolder");
 
     if (isatty (fileno (stdout))) {
        folder = getenv ("mhfolder");
 
     if (isatty (fileno (stdout))) {

-       if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
+       if (!nomore && moreproc && *moreproc != '\0') {

            if (mhl_action) {
                SIGNAL (SIGINT, SIG_IGN);
                SIGNAL2 (SIGQUIT, quitser);
            if (mhl_action) {
                SIGNAL (SIGINT, SIG_IGN);
                SIGNAL2 (SIGQUIT, quitser);