Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/bbconfig.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/bbconfig.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/miscutils/bbconfig.c

@@ -4 +4 @@
 #include "libbb.h"
 #include "bbconfigopts.h"
+#if ENABLE_FEATURE_COMPRESS_BBCONFIG
+# include "archive.h"
+# include "bbconfigopts_bz2.h"
+#endif
 
-int bbconfig_main(int argc, char **argv);
-int bbconfig_main(int argc, char **argv)
+int bbconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-    printf(bbconfig_config);
+#if ENABLE_FEATURE_COMPRESS_BBCONFIG
+    bunzip_data *bd;
+    int i = start_bunzip(&bd,
+            /* src_fd: */ -1,
+            /* inbuf:  */ bbconfig_config_bz2,
+            /* len:    */ sizeof(bbconfig_config_bz2));
+    /* read_bunzip can longjmp to start_bunzip, and ultimately
+     * end up here with i != 0 on read data errors! Not trivial */
+    if (!i) {
+        /* Cannot use xmalloc: will leak bd in NOFORK case! */
+        char *outbuf = malloc_or_warn(sizeof(bbconfig_config));
+        if (outbuf) {
+            read_bunzip(bd, outbuf, sizeof(bbconfig_config));
+            full_write1_str(outbuf);
+        }
+    }
+#else
+    full_write1_str(bbconfig_config);
+#endif
     return 0;
 }