[git commit] use write_str() functions where appropriate

Denys Vlasenko vda.linux at googlemail.com
Sun Nov 29 10:49:37 UTC 2020


commit: https://git.busybox.net/busybox/commit/?id=b86a9ed699e2c4693167d6ead00ac307bd9c01c6
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
chat_main                                           1300    1295      -5
finalize_tty_attrs                                    80      70     -10
getty_main                                          1538    1519     -19
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-34)             Total: -34 bytes

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 loginutils/getty.c | 6 +++---
 miscutils/chat.c   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/loginutils/getty.c b/loginutils/getty.c
index 99af72f68..6c6d409f4 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -404,7 +404,7 @@ static void finalize_tty_attrs(void)
 	set_tty_attrs();
 
 	/* Now the newline character should be properly written */
-	full_write(STDOUT_FILENO, "\n", 1);
+	full_write1_str("\n");
 }
 
 /* extract baud rate from modem status message */
@@ -498,13 +498,13 @@ static char *get_logname(void)
 			case 0x7f:
 				G.tty_attrs.c_cc[VERASE] = c;
 				if (bp > G.line_buf) {
-					full_write(STDOUT_FILENO, "\010 \010", 3);
+					full_write1_str("\010 \010");
 					bp--;
 				}
 				break;
 			case CTL('U'):
 				while (bp > G.line_buf) {
-					full_write(STDOUT_FILENO, "\010 \010", 3);
+					full_write1_str("\010 \010");
 					bp--;
 				}
 				break;
diff --git a/miscutils/chat.c b/miscutils/chat.c
index a7faaf284..86a114df6 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -379,7 +379,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
 					// dump device input if ECHO ON
 					if (echo) {
 //						if (buf[buf_len] < ' ') {
-//							full_write(STDERR_FILENO, "^", 1);
+//							full_write2_str("^");
 //							buf[buf_len] += '@';
 //						}
 						full_write(STDERR_FILENO, buf+buf_len, 1);
@@ -509,7 +509,7 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_CHAT_IMPLICIT_CR
 				// or terminate command with \r (if not inhibited)
 				else if (!nocr)
-					xwrite(STDOUT_FILENO, "\r", 1);
+					xwrite_str(STDOUT_FILENO, "\r");
 #endif
 				// bail out unless we sent command successfully
 				if (exitcode)


More information about the busybox-cvs mailing list