From: Ken Hornstein Date: Thu, 2 Jan 2014 18:54:07 +0000 (-0500) Subject: Drop support for different behavior on hardcopy terminals. It's 2014, X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/a1b240a346fc825a4ae88e1374d342430e1e5b3f?ds=sidebyside;hp=8163f29d121fad5574764903c8e2a04bddeb0c8d 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 3797fecc..d56ef30c 100644 --- 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 sc_hardcopy(void); 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 fa33fac2..4b29cace 100644 --- 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 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 */ @@ -86,8 +85,6 @@ read_termcap(void) speedcode = cfgetospeed(&tio); - HC = tgetflag ("hc"); - if (!initCO && (CO = tgetnum ("co")) <= 0) CO = 80; if (!initLI && (LI = tgetnum ("li")) <= 0) @@ -185,14 +182,3 @@ SOprintf (char *fmt, ...) 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 0788d1ef..b6b7a627 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -478,7 +478,7 @@ mhl (int argc, char **argv) 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);