aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-02 14:19:51 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-02 14:19:51 +0100
commit8131eea3dce5fba0dfb78e6083d1730423fad20b (patch)
treec098d7ba6ef9f4745425a29a330480e6088d6d9a /editors
parent0d8ea64af618dc83c3291b3b598636ed3d0854e4 (diff)
downloadbusybox-w32-8131eea3dce5fba0dfb78e6083d1730423fad20b.tar.gz
busybox-w32-8131eea3dce5fba0dfb78e6083d1730423fad20b.tar.bz2
busybox-w32-8131eea3dce5fba0dfb78e6083d1730423fad20b.zip
*: introduce and use ffulsh_all()
function old new delta buffer_fill_and_print 179 196 +17 fflush_all - 9 +9 spawn 87 92 +5 rtcwake_main 455 453 -2 ... alarm_intr 93 84 -9 readcmd 1072 1062 -10 bb_ask 345 333 -12 more_main 845 832 -13 flush_stdout_stderr 42 23 -19 xfflush_stdout 27 - -27 flush_stderr 30 - -30 ------------------------------------------------------------------------------ (add/remove: 1/2 grow/shrink: 2/50 up/down: 31/-397) Total: -366 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors')
-rw-r--r--editors/awk.c4
-rw-r--r--editors/cmp.c2
-rw-r--r--editors/ed.c4
-rw-r--r--editors/vi.c8
4 files changed, 9 insertions, 9 deletions
diff --git a/editors/awk.c b/editors/awk.c
index bc1d93868..ce6c9b726 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2552,7 +2552,7 @@ static var *evaluate(node *op, var *res)
2552 break; 2552 break;
2553 2553
2554 case F_sy: 2554 case F_sy:
2555 fflush(NULL); 2555 fflush_all();
2556 R.d = (ENABLE_FEATURE_ALLOW_EXEC && L.s && *L.s) 2556 R.d = (ENABLE_FEATURE_ALLOW_EXEC && L.s && *L.s)
2557 ? (system(L.s) >> 8) : 0; 2557 ? (system(L.s) >> 8) : 0;
2558 break; 2558 break;
@@ -2565,7 +2565,7 @@ static var *evaluate(node *op, var *res)
2565 X.rsm = newfile(L.s); 2565 X.rsm = newfile(L.s);
2566 fflush(X.rsm->F); 2566 fflush(X.rsm->F);
2567 } else { 2567 } else {
2568 fflush(NULL); 2568 fflush_all();
2569 } 2569 }
2570 } 2570 }
2571 break; 2571 break;
diff --git a/editors/cmp.c b/editors/cmp.c
index a20bb8836..384e57c22 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -108,7 +108,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
108 outfile = stderr; 108 outfile = stderr;
109 /* There may have been output to stdout (option -l), so 109 /* There may have been output to stdout (option -l), so
110 * make sure we fflush before writing to stderr. */ 110 * make sure we fflush before writing to stderr. */
111 xfflush_stdout(); 111 fflush_all();
112 } 112 }
113 if (!(opt & CMP_OPT_s)) { 113 if (!(opt & CMP_OPT_s)) {
114 if (opt & CMP_OPT_l) { 114 if (opt & CMP_OPT_l) {
diff --git a/editors/ed.c b/editors/ed.c
index dbd802075..8ed4cd42b 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -686,7 +686,7 @@ static int readLines(const char *file, int num)
686 cc = 0; 686 cc = 0;
687 687
688 printf("\"%s\", ", file); 688 printf("\"%s\", ", file);
689 fflush(stdout); 689 fflush_all();
690 690
691 do { 691 do {
692 cp = memchr(bufPtr, '\n', bufUsed); 692 cp = memchr(bufPtr, '\n', bufUsed);
@@ -775,7 +775,7 @@ static int writeLines(const char *file, int num1, int num2)
775 } 775 }
776 776
777 printf("\"%s\", ", file); 777 printf("\"%s\", ", file);
778 fflush(stdout); 778 fflush_all();
779 779
780 lp = findLine(num1); 780 lp = findLine(num1);
781 if (lp == NULL) { 781 if (lp == NULL) {
diff --git a/editors/vi.c b/editors/vi.c
index 82f302dca..1a3997a6b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2136,7 +2136,7 @@ static void rawmode(void)
2136 2136
2137static void cookmode(void) 2137static void cookmode(void)
2138{ 2138{
2139 fflush(stdout); 2139 fflush_all();
2140 tcsetattr_stdin_TCSANOW(&term_orig); 2140 tcsetattr_stdin_TCSANOW(&term_orig);
2141} 2141}
2142 2142
@@ -2201,7 +2201,7 @@ static int readit(void) // read (maybe cursor) key from stdin
2201{ 2201{
2202 int c; 2202 int c;
2203 2203
2204 fflush(stdout); 2204 fflush_all();
2205 c = read_key(STDIN_FILENO, readbuffer); 2205 c = read_key(STDIN_FILENO, readbuffer);
2206 if (c == -1) { // EOF/error 2206 if (c == -1) { // EOF/error
2207 go_bottom_and_clear_to_eol(); 2207 go_bottom_and_clear_to_eol();
@@ -2555,7 +2555,7 @@ static void show_status_line(void)
2555 } 2555 }
2556 place_cursor(crow, ccol, FALSE); // put cursor back in correct place 2556 place_cursor(crow, ccol, FALSE); // put cursor back in correct place
2557 } 2557 }
2558 fflush(stdout); 2558 fflush_all();
2559} 2559}
2560 2560
2561//----- format the status buffer, the bottom line of screen ------ 2561//----- format the status buffer, the bottom line of screen ------
@@ -3963,7 +3963,7 @@ static void crash_test()
3963 if (msg[0]) { 3963 if (msg[0]) {
3964 printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s", 3964 printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
3965 totalcmds, last_input_char, msg, SOs, SOn); 3965 totalcmds, last_input_char, msg, SOs, SOn);
3966 fflush(stdout); 3966 fflush_all();
3967 while (safe_read(STDIN_FILENO, d, 1) > 0) { 3967 while (safe_read(STDIN_FILENO, d, 1) > 0) {
3968 if (d[0] == '\n' || d[0] == '\r') 3968 if (d[0] == '\n' || d[0] == '\r')
3969 break; 3969 break;