X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=more.c;h=298e1cfb19813657a43afaa6bb0a82f0d2ce9e83;hb=5165fbed639916e0fde15a827241b21981be7934;hp=91c28156386d14c49aa99b836440c451c0ecfab3;hpb=f626dcbc8418819f532d9af7858adad2a4dd2606;p=oweals%2Fbusybox.git

diff --git a/more.c b/more.c
index 91c281563..298e1cfb1 100644
--- a/more.c
+++ b/more.c
@@ -25,21 +25,16 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_help
 #include "messages.c"
 
-static const char more_usage[] = "more [FILE ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nMore is a filter for viewing FILE one screenful at a time.\n"
-#endif
-	;
-
 /* ED: sparc termios is broken: revert back to old termio handling. */
 #ifdef BB_FEATURE_USE_TERMIOS
 #	if #cpu(sparc)
@@ -53,15 +48,15 @@ static const char more_usage[] = "more [FILE ...]\n"
 #		define getTermSettings(fd,argp) tcgetattr(fd, argp);
 #	endif
 
-FILE *cin;
+static FILE *cin;
 
-struct termios initial_settings, new_settings;
+static struct termios initial_settings, new_settings;
 
-void gotsig(int sig)
+static void gotsig(int sig)
 {
 	setTermSettings(fileno(cin), &initial_settings);
-	fprintf(stdout, "\n");
-	exit(TRUE);
+	putchar('\n');
+	exit(EXIT_FAILURE);
 }
 #endif /* BB_FEATURE_USE_TERMIOS */
 
@@ -84,20 +79,12 @@ extern int more_main(int argc, char **argv)
 	argc--;
 	argv++;
 
-	if (argc > 0
-		&& (strcmp(*argv, dash_dash_help) == 0 || strcmp(*argv, "-h") == 0)) {
-		usage(more_usage);
-	}
 	do {
 		if (argc == 0) {
 			file = stdin;
 		} else
-			file = fopen(*argv, "r");
+			file = xfopen(*argv, "r");
 
-		if (file == NULL) {
-			perror(*argv);
-			exit(FALSE);
-		}
 		fstat(fileno(file), &st);
 
 #ifdef BB_FEATURE_USE_TERMIOS
@@ -131,15 +118,19 @@ extern int more_main(int argc, char **argv)
 
 				please_display_more_prompt = 0;
 				lines = 0;
-				len = fprintf(stdout, "--More-- ");
+				len = printf("--More-- ");
 				if (file != stdin) {
-					len += fprintf(stdout, "(%d%% of %ld bytes)",
+#if _FILE_OFFSET_BITS == 64
+					len += printf("(%d%% of %lld bytes)",
+#else
+					len += printf("(%d%% of %ld bytes)",
+#endif
 								   (int) (100 *
 										  ((double) ftell(file) /
 										   (double) st.st_size)),
 								   st.st_size);
 				}
-				len += fprintf(stdout, "%s",
+				len += printf("%s",
 #ifdef BB_FEATURE_USE_TERMIOS
 							   ""
 #else