make ^D scroll 1/2 screenful by default.

[unix-history] / usr / src / old / more / more.c

diff --git a/usr/src/old/more/more.c b/usr/src/old/more/more.c
index 0aa5e04..984677b 100644 (file)
--- a/usr/src/old/more/more.c
+++ b/usr/src/old/more/more.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)more.c      4.15 (Berkeley) 83/07/07";
+static char *sccsid = "@(#)more.c      4.17 (Berkeley) 84/01/06";

 #endif
 
 /*
 #endif
 
 /*


@@ -111,6 +111,9 @@ char *argv[];
     nfiles = argc;
     fnames = argv;
     initterm ();
     nfiles = argc;
     fnames = argv;
     initterm ();

+    nscroll = Lpp/2 - 1;
+    if (nscroll <= 0)
+       nscroll = 1;

     if(s = getenv("MORE")) argscan(s);
     while (--nfiles > 0) {
        if ((ch = (*++fnames)[0]) == '-') {
     if(s = getenv("MORE")) argscan(s);
     while (--nfiles > 0) {
        if ((ch = (*++fnames)[0]) == '-') {


@@ -1597,8 +1600,11 @@ register FILE *f;
 
 onsusp ()
 {
 
 onsusp ()
 {

+    /* ignore SIGTTOU so we don't get stopped if csh grabs the tty */
+    signal(SIGTTOU, SIG_IGN);

     reset_tty ();
     fflush (stdout);
     reset_tty ();
     fflush (stdout);

+    signal(SIGTTOU, SIG_DFL);

     /* Send the TSTP signal to suspend our process group */
     signal(SIGTSTP, SIG_DFL);
     sigsetmask(0);
     /* Send the TSTP signal to suspend our process group */
     signal(SIGTSTP, SIG_DFL);
     sigsetmask(0);