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

branches/3.3/mindi-busybox/miscutils/fbsplash.c

@@ -35 +35 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <linux/fb.h>
 
@@ -151 +152 @@
     // map the device in memory
     G.addr = mmap(NULL,
-            G.scr_var.yres * G.scr_fix.line_length,
+            (G.scr_var.yres_virtual ?: G.scr_var.yres) * G.scr_fix.line_length,
             PROT_WRITE, MAP_SHARED, fbfd, 0);
     if (G.addr == MAP_FAILED)
@@ -354 +355 @@
         theme_file = stdin;
     } else {
-        int fd = open_zipped(G.image_filename);
+        int fd = open_zipped(G.image_filename, /*fail_if_not_compressed:*/ 0);
         if (fd < 0)
             bb_simple_perror_msg_and_die(G.image_filename);
@@ -374 +375 @@
      */
 #define concat_buf bb_common_bufsiz1
+    setup_common_bufsiz();
+
     read_ptr = concat_buf;
     while (1) {
         int w, h, max_color_val;
-        int rem = concat_buf + sizeof(concat_buf) - read_ptr;
+        int rem = concat_buf + COMMON_BUFSIZE - read_ptr;
         if (rem < 2
          || fgets(read_ptr, rem, theme_file) == NULL
@@ -517 +520 @@
     // already in the pipe
     while ((num_buf = xmalloc_fgetline(fp)) != NULL) {
-        if (strncmp(num_buf, "exit", 4) == 0) {
+        if (is_prefixed_with(num_buf, "exit")) {
             DEBUG_MESSAGE("exit");
             break;