Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/fbset.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/util-linux/fbset.c (modified) (10 diffs)

branches/3.3/mindi-busybox/util-linux/fbset.c

@@ -165 +165 @@
 } g_cmdoptions[] = {
     /*"12345678" + NUL */
+//TODO: convert to index_in_strings()
     { "fb"      , 1, CMD_FB       },
     { "db"      , 1, CMD_DB       },
@@ -249 +250 @@
             continue;
         s = p + strlen(mode);
-        //bb_info_msg("CHECK[%s][%s][%d]", mode, p-1, *s);
+        //bb_error_msg("CHECK[%s][%s][%d]", mode, p-1, *s);
         /* exact match? */
         if (((!*s || isspace(*s)) && '"' != s[-1]) /* end-of-token */
          || ('"' == *s && '"' == p[-1]) /* ends with " but starts with " too! */
         ) {
-            //bb_info_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s));
+            //bb_error_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s));
             break;
         }
@@ -265 +266 @@
         int i;
 
-//bb_info_msg("???[%s][%s]", token[0], token[1]);
+//bb_error_msg("???[%s][%s]", token[0], token[1]);
         if (strcmp(token[0], "endmode") == 0) {
-//bb_info_msg("OK[%s]", mode);
+//bb_error_msg("OK[%s]", mode);
             return 1;
         }
@@ -295 +296 @@
                 base->bits_per_pixel = base_bits_per_pixel;
             }
-//bb_info_msg("GEO[%s]", p);
+//bb_error_msg("GEO[%s]", p);
             break;
         case 1:
@@ -322 +323 @@
                 base->vsync_len = base_vsync_len;
             }
-//bb_info_msg("TIM[%s]", p);
+//bb_error_msg("TIM[%s]", p);
             break;
         case 2:
@@ -328 +329 @@
             static const uint32_t syncs[] = {FB_VMODE_INTERLACED, FB_VMODE_DOUBLE};
             ss(&base->vmode, syncs[i-2], p, "false");
-//bb_info_msg("VMODE[%s]", p);
+//bb_error_msg("VMODE[%s]", p);
             break;
         }
@@ -336 +337 @@
             static const uint32_t syncs[] = {FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT};
             ss(&base->sync, syncs[i-4], p, "low");
-//bb_info_msg("SYNC[%s]", p);
+//bb_error_msg("SYNC[%s]", p);
             break;
         }
         case 7:
             ss(&base->sync, FB_SYNC_EXT, p, "false");
-//bb_info_msg("EXTSYNC[%s]", p);
+//bb_error_msg("EXTSYNC[%s]", p);
             break;
         case 8: {
@@ -350 +351 @@
 
             sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d",
-                &red_offset, &red_length,
-                &green_offset, &green_length,
-                &blue_offset, &blue_length,
-                &transp_offset, &transp_length);
+                &red_length, &red_offset,
+                &green_length, &green_offset,
+                &blue_length, &blue_offset,
+                &transp_length, &transp_offset);
             base->red.offset = red_offset;
             base->red.length = red_length;
@@ -417 +418 @@
 
     const char *fbdev = DEFAULTFBDEV;
-    const char *modefile = DEFAULTFBMODE;
+    IF_FEATURE_FBSET_READMODE(const char *modefile = DEFAULTFBMODE;)
     char *thisarg;
     char *mode = mode; /* for compiler */
@@ -445 +446 @@
                 break;
             case CMD_DB:
-                modefile = argv[1];
+                IF_FEATURE_FBSET_READMODE(modefile = argv[1];)
                 break;
             case CMD_ALL: