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

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

@@ -64 +64 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 /* must be _after_ libbb.h: */
 #include <linux/hdreg.h>
@@ -368 +369 @@
 #endif
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-struct BUG_G_too_big {
-    char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define get_identity       (G.get_identity           )
 #define get_geom           (G.get_geom               )
@@ -434 +432 @@
 #define hwif_ctrl          (G.hwif_ctrl              )
 #define hwif_irq           (G.hwif_irq               )
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+    setup_common_bufsiz(); \
+    BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+} while (0)
 
 
@@ -466 +467 @@
 {
     if (get_arg) {
-        printf(" setting %s to %ld", s, arg);
+        printf(" setting %s to %lu", s, arg);
         on_off(arg);
     }
@@ -473 +474 @@
 static void print_value_on_off(const char *str, unsigned long argp)
 {
-    printf(" %s\t= %2ld", str, argp);
+    printf(" %s\t= %2lu", str, argp);
     on_off(argp != 0);
 }
@@ -764 +765 @@
         like_std = 5;
         if ((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==STBY_ID_VAL))
-            printf("powers-up in standby; SET FEATURES subcmd spins-up.\n");
+            puts("powers-up in standby; SET FEATURES subcmd spins-up.");
         if (((val[CONFIG]==STBY_NID_VAL) || (val[CONFIG]==PWRD_NID_VAL)) && (val[GEN_CONFIG] & INCOMPLETE))
-            printf("\n\tWARNING: ID response incomplete.\n\tFollowing data may be incorrect.\n\n");
+            puts("\n\tWARNING: ID response incomplete.\n\tFollowing data may be incorrect.\n");
     }
 
@@ -876 +877 @@
         min_std = like_std > 4 ? like_std - 3 : 1;
 
-    printf("Configuration:\n");
+    puts("Configuration:");
     /* more info from the general configuration word */
     if ((eqpt != CDROM) && (like_std == 1)) {
@@ -910 +911 @@
         bbbig = 0;
         if ((ll > 0x00FBFC10) && (!val[LCYLS]))
-            printf("\tCHS addressing not supported\n");
+            puts("\tCHS addressing not supported");
         else {
             jj = val[WHATS_VALID] & OK_W54_58;
@@ -981 +982 @@
             (val[CAPAB_0] & IORDY_OFF) ? "" :"not");
     } else
-        printf("no IORDY\n");
+        puts("no IORDY");
 
     if ((like_std == 1) && val[BUF_TYPE]) {
@@ -1013 +1014 @@
         printf("\tR/W multiple sector transfer: ");
         if ((like_std < 3) && !(val[SECTOR_XFER_MAX] & SECTOR_XFER))
-            printf("not supported\n");
+            puts("not supported");
         else {
             printf("Max = %u\tCurrent = ", val[SECTOR_XFER_MAX] & SECTOR_XFER);
@@ -1019 +1020 @@
                 printf("%u\n", val[SECTOR_XFER_CUR] & SECTOR_XFER);
             else
-                printf("?\n");
+                puts("?");
         }
         if ((like_std > 3) && (val[CMDS_SUPP_1] & 0x0008)) {
@@ -1041 +1042 @@
         /* ATAPI */
         if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ))
-            printf("\tATA sw reset required\n");
+            puts("\tATA sw reset required");
 
         if (val[PKT_REL] || val[SVC_NBSY]) {
@@ -1057 +1058 @@
     printf("\tDMA: ");
     if (!(val[CAPAB_0] & DMA_SUP))
-        printf("not supported\n");
+        puts("not supported");
     else {
         if (val[DMA_MODE] && !val[SINGLE_DMA] && !val[MULTI_DMA])
@@ -1080 +1081 @@
 
         if ((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP))
-            printf("\t\tInterleaved DMA support\n");
+            puts("\t\tInterleaved DMA support");
 
         if ((val[WHATS_VALID] & OK_W64_70)
@@ -1122 +1123 @@
 
     if ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) {
-        printf("Commands/features:\n"
-            "\tEnabled\tSupported:\n");
+        puts("Commands/features:\n"
+            "\tEnabled\tSupported:");
         jj = val[CMDS_SUPP_0];
         kk = val[CMDS_EN_0];
@@ -1151 +1152 @@
      && (val[SECU_STATUS] || val[ERASE_TIME] || val[ENH_ERASE_TIME])
     ) {
-        printf("Security:\n");
+        puts("Security:");
         if (val[PSWD_CODE] && (val[PSWD_CODE] != NOVAL_1))
             printf("\tMaster password revision code = %u\n", val[PSWD_CODE]);
@@ -1367 +1368 @@
     }
 #endif /* __NEW_HD_DRIVE_ID */
-    printf("\n\n * current active mode\n\n");
+    puts("\n\n * current active mode\n");
 }
 #endif
@@ -1508 +1509 @@
         on_off(0);
     else if (value == BUSSTATE_TRISTATE)
-        printf(" (tristate)\n");
+        puts(" (tristate)");
     else
-        printf(" (unknown: %d)\n", value);
+        printf(" (unknown: %u)\n", value);
 }
 #endif
@@ -1532 +1533 @@
     if (standby == 254)
         printf("reserved");
-    printf(")\n");
+    puts(")");
 }
 
@@ -1583 +1584 @@
     else
         printf("unknown");
-    printf(")\n");
+    puts(")");
 }
 #endif /* HDIO_DRIVE_CMD */
@@ -1590 +1591 @@
 {
     if (flag)
-        printf(" setting %s to %ld\n", s, value);
+        printf(" setting %s to %lu\n", s, value);
 }
 
@@ -1634 +1635 @@
             printf(" attempting to ");
             if (piomode == 255)
-                printf("auto-tune PIO mode\n");
+                puts("auto-tune PIO mode");
             else if (piomode < 100)
                 printf("set PIO mode to %d\n", piomode);
@@ -1763 +1764 @@
 #define WIN_STANDBYNOW2 0x94
 #endif
-        printf(" issuing standby command\n");
+        puts(" issuing standby command");
         args[0] = WIN_STANDBYNOW1;
         ioctl_alt_or_warn(HDIO_DRIVE_CMD, args, WIN_STANDBYNOW2);
@@ -1774 +1775 @@
 #define WIN_SLEEPNOW2 0x99
 #endif
-        printf(" issuing sleep command\n");
+        puts(" issuing sleep command");
         args[0] = WIN_SLEEPNOW1;
         ioctl_alt_or_warn(HDIO_DRIVE_CMD, args, WIN_SLEEPNOW2);
@@ -1780 +1781 @@
     if (set_seagate) {
         args[0] = 0xfb;
-        printf(" disabling Seagate auto powersaving mode\n");
+        puts(" disabling Seagate auto powersaving mode");
         ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
     }
@@ -1816 +1817 @@
             printf(" IO_support\t=%3ld (", parm);
             if (parm == 0)
-                printf("default 16-bit)\n");
+                puts("default 16-bit)");
             else if (parm == 2)
-                printf("16-bit)\n");
+                puts("16-bit)");
             else if (parm == 1)
-                printf("32-bit)\n");
+                puts("32-bit)");
             else if (parm == 3)
-                printf("32-bit w/sync)\n");
+                puts("32-bit w/sync)");
             else if (parm == 8)
-                printf("Request-Queue-Bypass)\n");
+                puts("Request-Queue-Bypass)");
             else
-                printf("\?\?\?)\n");
+                puts("\?\?\?)");
         }
     }
@@ -1838 +1839 @@
             printf(fmt, "using_dma", parm);
             if (parm == 8)
-                printf(" (DMA-Assisted-PIO)\n");
+                puts(" (DMA-Assisted-PIO)");
             else
                 on_off(parm != 0);
@@ -1922 +1923 @@
             dump_identity(&id);
         } else if (errno == -ENOMSG)
-            printf(" no identification info available\n");
+            puts(" no identification info available");
         else if (ENABLE_IOCTL_HEX2STR_ERROR)  /* To be coherent with ioctl_or_warn */
             bb_perror_msg("HDIO_GET_IDENTITY");