aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-12-10 11:16:47 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-12-10 11:16:47 +0000
commit517413f9affae582f5e824ef45805662d676be6a (patch)
tree624ef48c2de51f7c458b3c2c0b9f17fff0af8da5 /libbb
parente53738558f2f1aa8cd536545479ab98b0df808c5 (diff)
downloadbusybox-w32-517413f9affae582f5e824ef45805662d676be6a.tar.gz
busybox-w32-517413f9affae582f5e824ef45805662d676be6a.tar.bz2
busybox-w32-517413f9affae582f5e824ef45805662d676be6a.zip
bb_info_msg: make it do atomic, unbuffered writes
udhcpc: fix a problem where we don't open listening socket fast enough function old new delta bb_info_msg 70 126 +56 change_listen_mode 37 78 +41 udhcp_listen_socket 151 124 -27 udhcpc_main 2344 2285 -59
Diffstat (limited to 'libbb')
-rw-r--r--libbb/info_msg.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/libbb/info_msg.c b/libbb/info_msg.c
index ffef05e54..8b8a1fcca 100644
--- a/libbb/info_msg.c
+++ b/libbb/info_msg.c
@@ -12,6 +12,7 @@
12 12
13void FAST_FUNC bb_info_msg(const char *s, ...) 13void FAST_FUNC bb_info_msg(const char *s, ...)
14{ 14{
15#ifdef THIS_ONE_DOESNT_DO_SINGLE_WRITE
15 va_list p; 16 va_list p;
16 /* va_copy is used because it is not portable 17 /* va_copy is used because it is not portable
17 * to use va_list p twice */ 18 * to use va_list p twice */
@@ -27,4 +28,29 @@ void FAST_FUNC bb_info_msg(const char *s, ...)
27 vsyslog(LOG_INFO, s, p2); 28 vsyslog(LOG_INFO, s, p2);
28 va_end(p2); 29 va_end(p2);
29 va_end(p); 30 va_end(p);
31#else
32 int used;
33 char *msg;
34 va_list p;
35
36 if (logmode == 0)
37 return;
38
39 va_start(p, s);
40 used = vasprintf(&msg, s, p);
41 if (used < 0)
42 return;
43
44 if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG))
45 syslog(LOG_INFO, "%s", msg);
46 if (logmode & LOGMODE_STDIO) {
47 fflush(stdout);
48 /* used = strlen(msg); - must be true already */
49 msg[used++] = '\n';
50 full_write(STDOUT_FILENO, msg, used);
51 }
52
53 free(msg);
54 va_end(p);
55#endif
30} 56}