diff options
author | Ron Yorston <rmy@pobox.com> | 2021-02-05 11:24:06 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-02-05 11:24:06 +0000 |
commit | 32e19e7ae8b0d76d69871ba234e8f0af31baff4e (patch) | |
tree | 6fdc833a444e0dd6fd359b21a8d463856917a387 /miscutils | |
parent | 4fb71406b884c6ac0a9a4d2acf7a32b544611f70 (diff) | |
parent | cad3fc743aa7c7744e4fcf044371f0fda50fa51f (diff) | |
download | busybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.tar.gz busybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.tar.bz2 busybox-w32-32e19e7ae8b0d76d69871ba234e8f0af31baff4e.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/bc.c | 2 | ||||
-rw-r--r-- | miscutils/conspy.c | 4 | ||||
-rw-r--r-- | miscutils/strings.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index 53eb5c799..02a61ac49 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
@@ -6448,7 +6448,7 @@ static BC_STATUS zdc_program_printStream(void) | |||
6448 | char *str; | 6448 | char *str; |
6449 | idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : n->rdx; | 6449 | idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : n->rdx; |
6450 | str = *xc_program_str(idx); | 6450 | str = *xc_program_str(idx); |
6451 | fputs(str, stdout); | 6451 | fputs_stdout(str); |
6452 | } | 6452 | } |
6453 | 6453 | ||
6454 | RETURN_STATUS(s); | 6454 | RETURN_STATUS(s); |
diff --git a/miscutils/conspy.c b/miscutils/conspy.c index fac11d339..21a498d0f 100644 --- a/miscutils/conspy.c +++ b/miscutils/conspy.c | |||
@@ -107,8 +107,8 @@ enum { | |||
107 | 107 | ||
108 | static void putcsi(const char *s) | 108 | static void putcsi(const char *s) |
109 | { | 109 | { |
110 | fputs(ESC"[", stdout); | 110 | fputs_stdout(ESC"["); |
111 | fputs(s, stdout); | 111 | fputs_stdout(s); |
112 | } | 112 | } |
113 | 113 | ||
114 | static void clrscr(void) | 114 | static void clrscr(void) |
diff --git a/miscutils/strings.c b/miscutils/strings.c index 51412f401..e4a68227e 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -92,7 +92,7 @@ int strings_main(int argc UNUSED_PARAM, char **argv) | |||
92 | if (option_mask32 & (PRINT_OFFSET | PRINT_RADIX)) { | 92 | if (option_mask32 & (PRINT_OFFSET | PRINT_RADIX)) { |
93 | printf(radix_fmt, offset - n); | 93 | printf(radix_fmt, offset - n); |
94 | } | 94 | } |
95 | fputs(string, stdout); | 95 | fputs_stdout(string); |
96 | } | 96 | } |
97 | count++; | 97 | count++; |
98 | } | 98 | } |