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 /libbb/lineedit.c | |
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 'libbb/lineedit.c')
-rw-r--r-- | libbb/lineedit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index f3cbc512c..27c1f3a74 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -312,7 +312,7 @@ static void BB_PUTCHAR(wchar_t c) | |||
312 | ssize_t len = wcrtomb(buf, c, &mbst); | 312 | ssize_t len = wcrtomb(buf, c, &mbst); |
313 | if (len > 0) { | 313 | if (len > 0) { |
314 | buf[len] = '\0'; | 314 | buf[len] = '\0'; |
315 | fputs(buf, stdout); | 315 | fputs_stdout(buf); |
316 | } | 316 | } |
317 | } else { | 317 | } else { |
318 | /* In this case, c is always one byte */ | 318 | /* In this case, c is always one byte */ |
@@ -496,7 +496,7 @@ static void beep(void) | |||
496 | */ | 496 | */ |
497 | static void put_prompt_custom(bool is_full) | 497 | static void put_prompt_custom(bool is_full) |
498 | { | 498 | { |
499 | fputs((is_full ? cmdedit_prompt : prompt_last_line), stdout); | 499 | fputs_stdout((is_full ? cmdedit_prompt : prompt_last_line)); |
500 | cursor = 0; | 500 | cursor = 0; |
501 | cmdedit_y = cmdedit_prmt_len / cmdedit_termw; /* new quasireal y */ | 501 | cmdedit_y = cmdedit_prmt_len / cmdedit_termw; /* new quasireal y */ |
502 | cmdedit_x = cmdedit_prmt_len % cmdedit_termw; | 502 | cmdedit_x = cmdedit_prmt_len % cmdedit_termw; |
@@ -1955,7 +1955,7 @@ static void ask_terminal(void) | |||
1955 | pfd.events = POLLIN; | 1955 | pfd.events = POLLIN; |
1956 | if (safe_poll(&pfd, 1, 0) == 0) { | 1956 | if (safe_poll(&pfd, 1, 0) == 0) { |
1957 | S.sent_ESC_br6n = 1; | 1957 | S.sent_ESC_br6n = 1; |
1958 | fputs(ESC"[6n", stdout); | 1958 | fputs_stdout(ESC"[6n"); |
1959 | fflush_all(); /* make terminal see it ASAP! */ | 1959 | fflush_all(); /* make terminal see it ASAP! */ |
1960 | } | 1960 | } |
1961 | } | 1961 | } |
@@ -3085,7 +3085,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman | |||
3085 | #undef read_line_input | 3085 | #undef read_line_input |
3086 | int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize) | 3086 | int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize) |
3087 | { | 3087 | { |
3088 | fputs(prompt, stdout); | 3088 | fputs_stdout(prompt); |
3089 | fflush_all(); | 3089 | fflush_all(); |
3090 | if (!fgets(command, maxsize, stdin)) | 3090 | if (!fgets(command, maxsize, stdin)) |
3091 | return -1; | 3091 | return -1; |