emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more: fix for case when _FILE_OFFSET_BITS is not #defined.

Browse Source 
samll size improvement.
This commit is contained in:
Denis Vlasenko 2006-12-10 01:57:29 +00:00
parent 57d83ff5f9
commit b15b7f7a4a
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
util-linux/more.c
View File

@ -17,11 +17,11 @@
#include "busybox.h" #include "busybox.h"
#ifdef CONFIG_FEATURE_USE_TERMIOS #if ENABLE_FEATURE_USE_TERMIOS
static int cin_fileno; static int cin_fileno;
#include <termios.h> #include <termios.h>
#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) #define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
#define getTermSettings(fd,argp) tcgetattr(fd, argp); #define getTermSettings(fd, argp) tcgetattr(fd, argp);
static struct termios initial_settings, new_settings; static struct termios initial_settings, new_settings;
@ -35,7 +35,7 @@ static void gotsig(int sig)
putchar('\n'); putchar('\n');
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif /* CONFIG_FEATURE_USE_TERMIOS */ #endif /* FEATURE_USE_TERMIOS */
int more_main(int argc, char **argv) int more_main(int argc, char **argv)
@ -52,14 +52,14 @@ int more_main(int argc, char **argv)
argc--; argc--;
argv++; argv++;
cin = stdin;
/* not use inputing from terminal if usage: more > outfile */ /* use input from terminal unless we do "more >outfile" */
if(isatty(STDOUT_FILENO)) { if (isatty(STDOUT_FILENO)) {
cin = fopen(CURRENT_TTY, "r"); cin = fopen(CURRENT_TTY, "r");
if (!cin) if (!cin)
cin = xfopen(CONSOLE_DEV, "r"); cin = xfopen(CONSOLE_DEV, "r");
please_display_more_prompt = 2; please_display_more_prompt = 2;
#ifdef CONFIG_FEATURE_USE_TERMIOS #if ENABLE_FEATURE_USE_TERMIOS
cin_fileno = fileno(cin); cin_fileno = fileno(cin);
getTermSettings(cin_fileno, &initial_settings); getTermSettings(cin_fileno, &initial_settings);
new_settings = initial_settings; new_settings = initial_settings;
@ -69,21 +69,19 @@ int more_main(int argc, char **argv)
new_settings.c_cc[VTIME] = 0; new_settings.c_cc[VTIME] = 0;
setTermSettings(cin_fileno, &new_settings); setTermSettings(cin_fileno, &new_settings);
atexit(set_tty_to_initial_mode); atexit(set_tty_to_initial_mode);
(void) signal(SIGINT, gotsig); signal(SIGINT, gotsig);
(void) signal(SIGQUIT, gotsig); signal(SIGQUIT, gotsig);
(void) signal(SIGTERM, gotsig); signal(SIGTERM, gotsig);
#endif #endif
} else {
cin = stdin;
} }
do { do {
if (argc == 0) { file = stdin;
file = stdin; if (argc != 0) {
} else
file = fopen_or_warn(*argv, "r"); file = fopen_or_warn(*argv, "r");
if(file==0) if (!file)
goto loop; goto loop;
}
st.st_size = 0; st.st_size = 0;
fstat(fileno(file), &st); fstat(fileno(file), &st);
@ -96,7 +94,7 @@ int more_main(int argc, char **argv)
if (terminal_width > 0) if (terminal_width > 0)
terminal_width -= 1; terminal_width -= 1;
len=0; len = 0;
lines = 0; lines = 0;
page_height = terminal_height; page_height = terminal_height;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
@ -104,17 +102,10 @@ int more_main(int argc, char **argv)
if ((please_display_more_prompt & 3) == 3) { if ((please_display_more_prompt & 3) == 3) {
len = printf("--More-- "); len = printf("--More-- ");
if (file != stdin && st.st_size > 0) { if (file != stdin && st.st_size > 0) {
#if _FILE_OFFSET_BITS == 64 len += printf("(%d%% of %"OFF_FMT"d bytes)",
len += printf("(%d%% of %lld bytes)", (int) (ftello(file)*100 / st.st_size),
(int) (100 * ((double) ftell(file) / st.st_size);
(double) st.st_size)), (long long)st.st_size);
#else
len += printf("(%d%% of %ld bytes)",
(int) (100 * ((double) ftell(file) /
(double) st.st_size)), (long)st.st_size);
#endif
} }
fflush(stdout); fflush(stdout);
/* /*
@ -122,15 +113,12 @@ int more_main(int argc, char **argv)
* to get input from the user. * to get input from the user.
*/ */
input = getc(cin); input = getc(cin);
#ifndef CONFIG_FEATURE_USE_TERMIOS #if !ENABLE_FEATURE_USE_TERMIOS
printf("\033[A"); /* up cursor */ printf("\033[A"); /* up cursor */
#endif #endif
/* Erase the "More" message */ /* Erase the "More" message */
putc('\r', stdout); printf("\r%*s\r", len, "");
while (--len >= 0) len = 0;
putc(' ', stdout);
putc('\r', stdout);
len=0;
lines = 0; lines = 0;
page_height = terminal_height; page_height = terminal_height;
please_display_more_prompt &= ~1; please_display_more_prompt &= ~1;
@ -162,15 +150,15 @@ int more_main(int argc, char **argv)
rem = len - (quot * terminal_width); rem = len - (quot * terminal_width);
if (quot) { if (quot) {
if (rem) if (rem)
page_height-=quot; page_height -= quot;
else else
page_height-=(quot-1); page_height -= (quot - 1);
} }
} }
if (++lines >= page_height) { if (++lines >= page_height) {
please_display_more_prompt |= 1; please_display_more_prompt |= 1;
} }
len=0; len = 0;
} }
/* /*
* If we just read a newline from the file being 'mored' and any * If we just read a newline from the file being 'mored' and any
@ -181,9 +169,9 @@ int more_main(int argc, char **argv)
} }
fclose(file); fclose(file);
fflush(stdout); fflush(stdout);
loop: loop:
argv++; argv++;
} while (--argc > 0); } while (--argc > 0);
end: end:
return 0; return 0;
} }