Fix stupid bugs. update was segfaulting. mknod minor # was always 0
[oweals/busybox.git] / more.c
diff --git a/more.c b/more.c
index f8938743680d82e29952c23d097e981da7c80d9b..30d2757cd240eab68b1991e4894e0b92947075c2 100644 (file)
--- a/more.c
+++ b/more.c
@@ -1,7 +1,13 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini more implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ *
+ * Latest version blended together by Erik Andersen <andersen@lineo.com>,
+ * based on the original more implementation by Bruce, 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
  *
  */
 
+#include "internal.h"
+#include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/ioctl.h>
 
-/* Turning this off makes things a bit smaller (and less pretty) */
-#define BB_MORE_TERM
+static const char more_usage[] = "more [file ...]\n";
 
+/* ED: sparc termios is broken: revert back to old termio handling. */
+#ifdef BB_FEATURE_USE_TERMIOS
 
+#if #cpu(sparc)
+#      include <termio.h>
+#      define termios termio
+#      define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+#      define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#else
+#      include <termios.h>
+#      define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+#      define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#endif
 
-#include "internal.h"
-#include <stdio.h>
-#include <signal.h>
+FILE *cin;
+
+struct termios initial_settings, new_settings;
 
+void gotsig(int sig)
+{
+       setTermSettings(fileno(cin), &initial_settings);
+       fprintf(stdout, "\n");
+       exit(TRUE);
+}
+#endif
 
-const char more_usage[] = "[file ...]";
 
 
-#ifdef BB_MORE_TERM
-    #include <termios.h>
-    #include <signal.h>
-    #include <sys/ioctl.h>
+#define TERMINAL_WIDTH 79              /* not 80 in case terminal has linefold bug */
+#define TERMINAL_HEIGHT        24
 
-    FILE *cin;
-    struct termios initial_settings, new_settings;
 
-    void gotsig(int sig) { 
-           tcsetattr(fileno(cin), TCSANOW, &initial_settings);
-           exit( TRUE);
-    }
+#if defined BB_FEATURE_AUTOWIDTH
+#ifdef BB_FEATURE_USE_TERMIOS
+static int terminal_width = 0;
 #endif
+static int terminal_height = 0;
+#else
+#define terminal_width TERMINAL_WIDTH
+#define terminal_height        TERMINAL_HEIGHT
+#endif
+
+
 
 extern int more_main(int argc, char **argv)
 {
-    int c, lines=0, input;
-    int next_page=0, rows = 24;
-#ifdef BB_MORE_TERM
-    int cols;
-    struct winsize win;
+       int c, lines = 0, input = 0;
+       int next_page = 0;
+       struct stat st;
+       FILE *file;
+
+#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
+       struct winsize win = { 0, 0 };
 #endif
-    struct stat st;    
-    FILE *file = stdin;
-
-    if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) {
-       fprintf(stderr, "Usage: %s %s", *argv, more_usage);
-       exit(FALSE);
-    }
-    argc--;
-    argv++;
-
-    while (argc-- > 0) {
-           file = fopen(*argv, "r");
-       if (file == NULL) {
-           perror("Can't open file");
-           exit(FALSE);
-       }
-       fstat(fileno(file), &st);
-       fprintf(stderr, "hi\n");
 
-#ifdef BB_MORE_TERM
-       cin = fopen("/dev/tty", "r");
-       tcgetattr(fileno(cin),&initial_settings);
-       new_settings = initial_settings;
-       new_settings.c_lflag &= ~ICANON;
-       new_settings.c_lflag &= ~ECHO;
-       tcsetattr(fileno(cin), TCSANOW, &new_settings);
-       
-       (void) signal(SIGINT, gotsig);
+       argc--;
+       argv++;
 
-       ioctl(STDOUT_FILENO, TIOCGWINSZ, &win);
-       if (win.ws_row > 4)     rows = win.ws_row - 2;
-       if (win.ws_col > 0)     cols = win.ws_col - 1;
+       if (argc > 0
+               && (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0)) {
+               usage(more_usage);
+       }
+       do {
+               if (argc == 0) {
+                       file = stdin;
+               } else
+                       file = fopen(*argv, "r");
+
+               if (file == NULL) {
+                       perror(*argv);
+                       exit(FALSE);
+               }
+               fstat(fileno(file), &st);
+
+#ifdef BB_FEATURE_USE_TERMIOS
+               cin = fopen("/dev/tty", "r");
+               if (!cin)
+                       cin = fopen("/dev/console", "r");
+               getTermSettings(fileno(cin), &initial_settings);
+               new_settings = initial_settings;
+               new_settings.c_cc[VMIN] = 1;
+               new_settings.c_cc[VTIME] = 0;
+               new_settings.c_lflag &= ~ICANON;
+               new_settings.c_lflag &= ~ECHO;
+               setTermSettings(fileno(cin), &new_settings);
+
+#ifdef BB_FEATURE_AUTOWIDTH
+               ioctl(fileno(stdout), TIOCGWINSZ, &win);
+               if (win.ws_row > 4)
+                       terminal_height = win.ws_row - 2;
+               if (win.ws_col > 0)
+                       terminal_width = win.ws_col - 1;
+#endif
 
+               (void) signal(SIGINT, gotsig);
+               (void) signal(SIGQUIT, gotsig);
+               (void) signal(SIGTERM, 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)%s", 
-                       (int) (100*( (double) ftell(file) / (double) st.st_size )),
-                       st.st_size,
-#ifdef BB_MORE_TERM
-                       ""
+               while ((c = getc(file)) != EOF) {
+                       if (next_page) {
+                               int len = 0;
+
+                               next_page = 0;
+                               lines = 0;
+                               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_FEATURE_USE_TERMIOS
+                                                          ""
 #else
-                       "\n"
+                                                          "\n"
 #endif
-                       );
+                                       );
 
-               fflush(stdout);
-               input = getc( stdin);
-
-#ifdef BB_MORE_TERM
-               /* Erase the "More" message */
-               while(len-- > 0)
-                   putc('\b', stdout);
-               while(len++ < cols)
-                   putc(' ', stdout);
-               while(len-- > 0)
-                   putc('\b', stdout);
-               fflush(stdout);
+                               fflush(stdout);
+#ifdef BB_FEATURE_USE_TERMIOS
+                               input = getc(cin);
+#else
+                               input = getc(stdin);
 #endif
 
-           }
-           if (input=='q')
-               goto end;
-           if (input==' ' &&  c == '\n' )
-               next_page = 1;
-           if ( c == '\n' && ++lines == (rows + 1) )
-               next_page = 1;
-           putc(c, stdout);
-       }
-       fclose(file);
-       fflush(stdout);
+#ifdef BB_FEATURE_USE_TERMIOS
+                               /* Erase the "More" message */
+                               while (--len >= 0)
+                                       putc('\b', stdout);
+                               while (++len <= terminal_width)
+                                       putc(' ', stdout);
+                               while (--len >= 0)
+                                       putc('\b', stdout);
+                               fflush(stdout);
+#endif
 
-       argc--;
-       argv++;
-    }
-end:
-#ifdef BB_MORE_TERM
-    gotsig(0);
-#endif 
-    exit(TRUE);
-}
+                       }
+                       if (c == '\n') {
+                               switch (input) {
+                               case 'q':
+                                       goto end;
+                               case '\n':
+                                       /* increment by just one line if we are at 
+                                        * the end of this line*/
+                                       next_page = 1;
+                                       break;
+                               }
+                               if (++lines == terminal_height)
+                                       next_page = 1;
+                       }
+                       putc(c, stdout);
+               }
+               fclose(file);
+               fflush(stdout);
 
+               argv++;
+       } while (--argc > 0);
+  end:
+#ifdef BB_FEATURE_USE_TERMIOS
+       gotsig(0);
+#endif
+       exit(TRUE);
+}