Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/init/bootchartd.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/init/bootchartd.c (modified) (4 diffs)

branches/3.3/mindi-busybox/init/bootchartd.c

@@ -48 +48 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
@@ -61 +62 @@
 #endif
 
+#if !ENABLE_TAR && !ENABLE_WERROR
+# warning Note: bootchartd requires tar command, but you did not select it.
+#elif !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_WERROR
+# warning Note: bootchartd requires tar -z support, but you did not select it.
+#endif
+
 #define BC_VERSION_STR "0.8"
 
@@ -110 +117 @@
     char jiffy_line[COMMON_BUFSIZE];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void dump_file(FILE *fp, const char *filename)
@@ -188 +195 @@
          * Try a few locations which are likely ti exist.
          */
-        static const char dirs[] = "/mnt\0""/tmp\0""/boot\0""/proc\0";
+        static const char dirs[] ALIGN1 = "/mnt\0""/tmp\0""/boot\0""/proc\0";
         const char *try_dir = dirs;
         while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) {