Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/verror_msg.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/verror_msg.c (modified) (6 diffs)

branches/3.3/mindi-busybox/libbb/verror_msg.c

@@ -12 +12 @@
 #endif
 
+#if ENABLE_FEATURE_SYSLOG
+smallint syslog_level = LOG_ERR;
+#endif
 smallint logmode = LOGMODE_STDIO;
 const char *msg_eol = "\n";
@@ -18 +21 @@
 {
     char *msg, *msg1;
+    char stack_msg[80];
     int applet_len, strerr_len, msgeol_len, used;
 
@@ -25 +29 @@
     if (!s) /* nomsg[_and_die] uses NULL fmt */
         s = ""; /* some libc don't like printf(NULL) */
+
+    applet_len = strlen(applet_name) + 2; /* "applet: " */
+    strerr_len = strerr ? strlen(strerr) : 0;
+    msgeol_len = strlen(msg_eol);
+
+    /* This costs ~90 bytes of code, but avoids costly
+     * malloc()[in vasprintf]+realloc()+memmove()+free() in 99% of cases.
+     * ~40% speedup.
+     */
+    if ((int)sizeof(stack_msg) - applet_len > 0) {
+        va_list p2;
+
+        /* It is not portable to use va_list twice, need to va_copy it */
+        va_copy(p2, p);
+        used = vsnprintf(stack_msg + applet_len, (int)sizeof(stack_msg) - applet_len, s, p2);
+        va_end(p2);
+        msg = stack_msg;
+        used += applet_len;
+        if (used < (int)sizeof(stack_msg) - 3 - msgeol_len - strerr_len)
+            goto add_pfx_and_sfx;
+    }
 
     used = vasprintf(&msg, s, p);
@@ -35 +60 @@
      * children can produce log messages simultaneously. */
 
-    applet_len = strlen(applet_name) + 2; /* "applet: " */
-    strerr_len = strerr ? strlen(strerr) : 0;
-    msgeol_len = strlen(msg_eol);
     /* can't use xrealloc: it calls error_msg on failure,
      * that may result in a recursion */
@@ -50 +72 @@
         memmove(msg + applet_len, msg, used);
         used += applet_len;
+ add_pfx_and_sfx:
         strcpy(msg, applet_name);
         msg[applet_len - 2] = ':';
@@ -71 +94 @@
 #if ENABLE_FEATURE_SYSLOG
     if (logmode & LOGMODE_SYSLOG) {
-        syslog(LOG_ERR, "%s", msg + applet_len);
+        syslog(syslog_level, "%s", msg + applet_len);
     }
 #endif
-    free(msg);
+    if (msg != stack_msg)
+        free(msg);
 }