More stuff.

[oweals/busybox.git] / util-linux / more.c

diff --git a/util-linux/more.c b/util-linux/more.c
index 6ac553e6baec2acf03510afe3c591fa0455fe9ca..bc3850510205b8d454eeb31e28668e5fde843b8b 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -1,7 +1,11 @@
 /*
  * Mini more implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 by Lineo, inc.
+ * Blended by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * based on the original more implementation and code from the Debian 
+ * boot-floppies team.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,62 +23,127 @@
  *
  */
 
+
+/* Turning this off makes things a bit smaller (and less pretty) */
+#define BB_MORE_TERM
+
+
+
 #include "internal.h"
 #include <stdio.h>
+#include <fcntl.h>
 #include <signal.h>
 
-const char more_usage[] = "[file ...]";
 
-//#define ERASE_STUFF
+static const char more_usage[] = "[file ...]";
+
+
+/* ED: sparc termios is broken: revert back to old termio handling. */
+#ifdef BB_MORE_TERM
+
+
+#if defined (__sparc__)
+#      define USE_OLD_TERMIO
+#      include <termio.h>
+#      include <sys/ioctl.h>
+#      define termios termio
+#      define stty(fd,argp) ioctl(fd,TCSETAF,argp)
+#else
+#      include <termios.h>
+#      define stty(fd,argp) tcsetattr(fd,TCSANOW,argp)
+#endif
+
+    FILE *cin;
+    struct termios initial_settings, new_settings;
+
+    void gotsig(int sig) { 
+           stty(fileno(cin), &initial_settings);
+           exit( TRUE);
+    }
+#endif
 
 extern int more_main(int argc, char **argv)
 {
-    int c, lines=0;
-    int next_page=0, rows = 24;
-#ifdef ERASE_STUFF
-    int cols=79;
-#endif
+    int c, lines=0, input=0;
+    int next_page=0;
     struct stat st;    
-    FILE *file = stdin;
+    FILE *file;
 
     if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) {
-       fprintf(stderr, "Usage: %s %s", *argv, more_usage);
-       return(FALSE);
+       usage (more_usage);
     }
     argc--;
     argv++;
 
-    while (argc-- > 0) {
+    while (argc >= 0) {
+       if (argc==0) {
+           file = stdin;
+       }
+       else
            file = fopen(*argv, "r");
+
        if (file == NULL) {
-           perror("Can't open file");
-           return(FALSE);
+           perror(*argv);
+           exit(FALSE);
        }
        fstat(fileno(file), &st);
-       fprintf(stderr, "hi\n");
 
+#ifdef BB_MORE_TERM
+       cin = fopen("/dev/tty", "r");
+       if (!cin)
+           cin = fopen("/dev/console", "r");
+#ifdef USE_OLD_TERMIO
+       ioctl(fileno(cin),TCGETA,&initial_settings);
+#else
+       tcgetattr(fileno(cin),&initial_settings);
+#endif
+       new_settings = initial_settings;
+       new_settings.c_lflag &= ~ICANON;
+       new_settings.c_lflag &= ~ECHO;
+       stty(fileno(cin), &new_settings);
+       
+       (void) signal(SIGINT, gotsig);
+
+#endif
        while ((c = getc(file)) != EOF) {
            if ( next_page ) {
                int len=0;
                next_page = 0;
                lines=0;
-               len = fprintf(stdout, "--More-- (%d%% of %ld bytes)", 
+               len = fprintf(stdout, "--More-- ");
+               if (file != stdin) {
+                   len += fprintf(stdout, "(%d%% of %ld bytes)", 
                        (int) (100*( (double) ftell(file) / (double) st.st_size )),
                        st.st_size);
+               }
+               len += fprintf(stdout, "%s",
+#ifdef BB_MORE_TERM
+                       ""
+#else
+                       "\n"
+#endif
+                       );
+
                fflush(stdout);
-               getc( stdin);
-#ifdef ERASE_STUFF
-               /* Try to erase the "More" message */
+               input = getc( cin);
+
+#ifdef BB_MORE_TERM
+               /* Erase the "More" message */
                while(len-- > 0)
                    putc('\b', stdout);
-               while(len++ < cols)
+               while(len++ < 79)
                    putc(' ', stdout);
                while(len-- > 0)
                    putc('\b', stdout);
                fflush(stdout);
 #endif
+
            }
-           if ( c == '\n' && ++lines == (rows + 1) )
+           if (input=='q')
+               goto end;
+           if (input==' ' &&  c == '\n' )
+               next_page = 1;
+           if ( c == '\n' && ++lines == 24 )
                next_page = 1;
            putc(c, stdout);
        }
@@ -84,7 +153,10 @@ extern int more_main(int argc, char **argv)
        argc--;
        argv++;
     }
-    return(TRUE);
+end:
+#ifdef BB_MORE_TERM
+    gotsig(0);
+#endif 
+    exit(TRUE);
 }
 
-