Merge branch 'busybox' into merge

8 files changed, 189 insertions, 70 deletions

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index f28d4fdd2..e58cb0fd1 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -299,9 +299,6 @@ static int get_boot(enum action what);
 static int get_boot(void);
 #endif
 
-#define PLURAL   0
-#define SINGULAR 1
-
 static sector_t get_start_sect(const struct partition *p);
 static sector_t get_nr_sects(const struct partition *p);
 
@@ -591,18 +588,18 @@ partname(const char *dev, int pno, int lth)
         return bufp;
 }
 
+#if ENABLE_FEATURE_SGI_LABEL || ENABLE_FEATURE_OSF_LABEL
 static ALWAYS_INLINE struct partition *
 get_part_table(int i)
 {
         return ptes[i].part_table;
 }
+#endif
 
-static const char *
-str_units(int n)
-{      /* n==1: use singular */
-        if (n == 1)
-                return display_in_cyl_units ? "cylinder" : "sector";
-        return display_in_cyl_units ? "cylinders" : "sectors";
+static ALWAYS_INLINE const char *
+str_units(void)
+{
+        return display_in_cyl_units ? "cylinder" : "sector";
 }
 
 static int
@@ -1778,8 +1775,8 @@ change_units(void)
 {
         display_in_cyl_units = !display_in_cyl_units;
         update_units();
-        printf("Changing display/entry units to %s\n",
-                str_units(PLURAL));
+        printf("Changing display/entry units to %ss\n",
+                str_units());
 }
 
 static void
@@ -2030,8 +2027,7 @@ check_consistency(const struct partition *p, int partition)
 static void
 list_disk_geometry(void)
 {
-        ullong bytes = ((ullong)total_number_of_sectors << 9);
-        ullong xbytes = bytes / (1024*1024);
+        ullong xbytes = total_number_of_sectors / (1024*1024 / 512);
         char x = 'M';
 
         if (xbytes >= 10000) {
@@ -2041,11 +2037,12 @@ list_disk_geometry(void)
         }
         printf("Disk %s: %llu %cB, %llu bytes, %"SECT_FMT"u sectors\n"
                 "%u cylinders, %u heads, %u sectors/track\n"
-                "Units: %s of %u * %u = %u bytes\n\n",
+                "Units: %ss of %u * %u = %u bytes\n"
+                "\n",
                 disk_device, xbytes, x,
-                bytes, total_number_of_sectors,
+                ((ullong)total_number_of_sectors * 512), total_number_of_sectors,
                 g_cylinders, g_heads, g_sectors,
-                str_units(PLURAL),
+                str_units(),
                 units_per_sector, sector_size, units_per_sector * sector_size
         );
 }
@@ -2486,7 +2483,7 @@ add_partition(int n, int sys)
                 for (i = 0; i < g_partitions; i++)
                         first[i] = (cround(first[i]) - 1) * units_per_sector;
 
-        snprintf(mesg, sizeof(mesg), "First %s", str_units(SINGULAR));
+        snprintf(mesg, sizeof(mesg), "First %s", str_units());
         do {
                 temp = start;
                 for (i = 0; i < g_partitions; i++) {
@@ -2548,7 +2545,7 @@ add_partition(int n, int sys)
         } else {
                 snprintf(mesg, sizeof(mesg),
                          "Last %s or +size{,K,M,G,T}",
-                         str_units(SINGULAR)
+                         str_units()
                 );
                 stop = read_int(cround(start), cround(limit), cround(limit), cround(start), mesg);
                 if (display_in_cyl_units) {
diff --git a/util-linux/fdisk_aix.c b/util-linux/fdisk_aix.c
index ee5df50e5..0a5e818fe 100644
--- a/util-linux/fdisk_aix.c
+++ b/util-linux/fdisk_aix.c
@@ -6,10 +6,10 @@
  */
 
 typedef struct {
-        unsigned int   magic;        /* expect AIX_LABEL_MAGIC */
-        unsigned int   fillbytes1[124];
-        unsigned int   physical_volume_id;
-        unsigned int   fillbytes2[124];
+        uint32_t magic;        /* expect AIX_LABEL_MAGIC */
+        uint32_t fillbytes1[124];
+        uint32_t physical_volume_id;
+        uint32_t fillbytes2[124];
 } aix_partition;
 
 #define AIX_LABEL_MAGIC         0xc9c2d4c1
@@ -17,20 +17,18 @@ typedef struct {
 #define AIX_INFO_MAGIC          0x00072959
 #define AIX_INFO_MAGIC_SWAPPED  0x59290700
 
-#define aixlabel ((aix_partition *)MBRbuffer)
-
-
 /*
-  Changes:
-  * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-  *     Internationalization
-  *
-  * 2003-03-20 Phillip Kesling <pkesling@sgi.com>
-  *      Some fixes
-*/
+ * Changes:
+ * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ *     Internationalization
+ *
+ * 2003-03-20 Phillip Kesling <pkesling@sgi.com>
+ *      Some fixes
+ */
 
-static smallint aix_other_endian; /* bool */
-static smallint aix_volumes = 1; /* max 15 */
+// Write-only vars, unfinished code?
+//static smallint aix_other_endian; /* bool */
+//static smallint aix_volumes = 1; /* max 15 */
 
 /*
  * only dealing with free blocks here
@@ -54,18 +52,20 @@ aix_info(void)
 static int
 check_aix_label(void)
 {
+        aix_partition *aixlabel = (void*)MBRbuffer;
+
         if (aixlabel->magic != AIX_LABEL_MAGIC
          && aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED
         ) {
-                current_label_type = 0;
-                aix_other_endian = 0;
+                current_label_type = LABEL_DOS;
+//              aix_other_endian = 0;
                 return 0;
         }
-        aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
+//      aix_other_endian = (aixlabel->magic == AIX_LABEL_MAGIC_SWAPPED);
         update_units();
         current_label_type = LABEL_AIX;
         g_partitions = 1016;
-        aix_volumes = 15;
+//      aix_volumes = 15;
         aix_info();
         /*aix_nolabel();*/              /* %% */
         /*aix_label = 1;*/              /* %% */
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index dbe889f7c..e884e3dc1 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -161,7 +161,7 @@ check_gpt_label(void)
         if (!valid_part_table_flag(MBRbuffer)
          || first->sys_ind != LEGACY_GPT_TYPE
         ) {
-                current_label_type = 0;
+                current_label_type = LABEL_DOS;
                 return 0;
         }
 
@@ -171,7 +171,7 @@ check_gpt_label(void)
         gpt_hdr = (void *)pe.sectorbuffer;
 
         if (gpt_hdr->magic != SWAP_LE64(GPT_MAGIC)) {
-                current_label_type = 0;
+                current_label_type = LABEL_DOS;
                 return 0;
         }
 
@@ -194,7 +194,7 @@ check_gpt_label(void)
          || SWAP_LE32(gpt_hdr->hdr_size) > sector_size
         ) {
                 puts("\nwarning: unable to parse GPT disklabel\n");
-                current_label_type = 0;
+                current_label_type = LABEL_DOS;
                 return 0;
         }
 
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 1328c1fcd..92180b2bc 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -470,7 +470,7 @@ xbsd_new_part(void)
         end = xbsd_dlabel.d_secperunit - 1;
 #endif
 
-        snprintf(mesg, sizeof(mesg), "First %s", str_units(SINGULAR));
+        snprintf(mesg, sizeof(mesg), "First %s", str_units());
         begin = read_int(bsd_cround(begin), bsd_cround(begin), bsd_cround(end),
                 0, mesg);
 
@@ -478,7 +478,7 @@ xbsd_new_part(void)
                 begin = (begin - 1) * xbsd_dlabel.d_secpercyl;
 
         snprintf(mesg, sizeof(mesg), "Last %s or +size or +sizeM or +sizeK",
-                str_units(SINGULAR));
+                str_units());
         end = read_int(bsd_cround(begin), bsd_cround(end), bsd_cround(end),
                 bsd_cround(begin), mesg);
 
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index 0e5491a19..c90c801e2 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -295,19 +295,19 @@ sgi_list_table(int xtra)
                         "%u cylinders, %u physical cylinders\n"
                         "%u extra sects/cyl, interleave %u:1\n"
                         "%s\n"
-                        "Units = %s of %u * 512 bytes\n\n",
+                        "Units = %ss of %u * 512 bytes\n\n",
                         disk_device, g_heads, g_sectors, g_cylinders,
                         SGI_SSWAP16(sgiparam.pcylcount),
                         SGI_SSWAP16(sgiparam.sparecyl),
                         SGI_SSWAP16(sgiparam.ilfact),
                         (char *)sgilabel,
-                        str_units(PLURAL), units_per_sector);
+                        str_units(), units_per_sector);
         } else {
                 printf("\nDisk %s (SGI disk label): "
                         "%u heads, %u sectors, %u cylinders\n"
-                        "Units = %s of %u * 512 bytes\n\n",
+                        "Units = %ss of %u * 512 bytes\n\n",
                         disk_device, g_heads, g_sectors, g_cylinders,
-                        str_units(PLURAL), units_per_sector );
+                        str_units(), units_per_sector );
         }
 
         w = strlen(disk_device);
@@ -720,7 +720,7 @@ sgi_add_partition(int n, int sys)
                 printf("You got a partition overlap on the disk. Fix it first!\n");
                 return;
         }
-        snprintf(mesg, sizeof(mesg), "First %s", str_units(SINGULAR));
+        snprintf(mesg, sizeof(mesg), "First %s", str_units());
         while (1) {
                 if (sys == SGI_VOLUME) {
                         last = sgi_get_lastblock();
@@ -746,7 +746,7 @@ sgi_add_partition(int n, int sys)
                 printf("You will get a partition overlap on the disk. "
                                 "Fix it first!\n");
         }
-        snprintf(mesg, sizeof(mesg), " Last %s", str_units(SINGULAR));
+        snprintf(mesg, sizeof(mesg), " Last %s", str_units());
         last = read_int(scround(first), scround(last)-1, scround(last)-1,
                         scround(first), mesg)+1;
         if (display_in_cyl_units)
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index 3697a69b9..29d7c283a 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -491,7 +491,7 @@ add_sun_partition(int n, int sys)
                         return;
                 }
         }
-        snprintf(mesg, sizeof(mesg), "First %s", str_units(SINGULAR));
+        snprintf(mesg, sizeof(mesg), "First %s", str_units());
         while (1) {
                 if (whole_disk)
                         first = read_int(0, 0, 0, 0, mesg);
@@ -546,7 +546,7 @@ and is of type 'Whole disk'\n");
         }
         snprintf(mesg, sizeof(mesg),
                 "Last %s or +size or +sizeM or +sizeK",
-                str_units(SINGULAR));
+                str_units());
         if (whole_disk)
                 last = read_int(scround(stop2), scround(stop2), scround(stop2),
                                 0, mesg);
@@ -567,8 +567,8 @@ and is of type 'Whole disk'\n");
 "You haven't covered the whole disk with the 3rd partition,\n"
 "but your value %u %s covers some other partition.\n"
 "Your entry has been changed to %u %s\n",
-                                scround(last), str_units(SINGULAR),
-                                scround(stop), str_units(SINGULAR));
+                                scround(last), str_units(),
+                                scround(stop), str_units());
                         last = stop;
                 }
         } else if (!whole_disk && last > stop)
@@ -636,20 +636,20 @@ sun_list_table(int xtra)
                 "%u cylinders, %u alternate cylinders, %u physical cylinders\n"
                 "%u extra sects/cyl, interleave %u:1\n"
                 "%s\n"
-                "Units = %s of %u * 512 bytes\n\n",
+                "Units = %ss of %u * 512 bytes\n\n",
                         disk_device, g_heads, g_sectors, SUN_SSWAP16(sunlabel->rspeed),
                         g_cylinders, SUN_SSWAP16(sunlabel->nacyl),
                         SUN_SSWAP16(sunlabel->pcylcount),
                         SUN_SSWAP16(sunlabel->sparecyl),
                         SUN_SSWAP16(sunlabel->ilfact),
                         (char *)sunlabel,
-                        str_units(PLURAL), units_per_sector);
+                        str_units(), units_per_sector);
         else
                 printf(
         "\nDisk %s (Sun disk label): %u heads, %u sectors, %u cylinders\n"
-        "Units = %s of %u * 512 bytes\n\n",
+        "Units = %ss of %u * 512 bytes\n\n",
                         disk_device, g_heads, g_sectors, g_cylinders,
-                        str_units(PLURAL), units_per_sector);
+                        str_units(), units_per_sector);
 
         printf("%*s Flag    Start       End    Blocks   Id  System\n",
                 w + 1, "Device");
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 41aade5ea..bb1dc519a 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
         if (!(flags & 2)) { /* no -p (-s may be present) */
                 if (time(NULL) == remote_time)
                         bb_simple_error_msg("current time matches remote time");
-                else
-                        if (stime(&remote_time) < 0)
+                else {
+                        struct timespec ts;
+                        ts.tv_sec = remote_time;
+                        ts.tv_nsec = 0;
+                        if (clock_settime(CLOCK_REALTIME, &ts) < 0)
                                 bb_simple_perror_msg_and_die("can't set time of day");
+                }
         }
 
         if (flags != 1) /* not lone -s */
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index ed8878ad4..b542f8c83 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -20,6 +20,14 @@
 //config:       Needed for machines with more than 32-64 CPUs:
 //config:       affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
 //config:       in this case. Otherwise, it is limited to sizeof(long).
+//config:
+//config:config FEATURE_TASKSET_CPULIST
+//config:       bool "CPU list support (-c option)"
+//config:       default y
+//config:       depends on FEATURE_TASKSET_FANCY
+//config:       help
+//config:       Add support for taking/printing affinity as CPU list when '-c'
+//config:       option is used. For example, it prints '0-3,7' instead of mask '8f'.
 
 //applet:IF_TASKSET(APPLET_NOEXEC(taskset, taskset, BB_DIR_USR_BIN, BB_SUID_DROP, taskset))
 
@@ -108,26 +116,120 @@ static unsigned long *get_aff(int pid, unsigned *sz)
         return mask;
 }
 
+#if ENABLE_FEATURE_TASKSET_CPULIST
+/*
+ * Parse the CPU list and set the mask accordingly.
+ *
+ * The list element can be either a CPU index or a range of CPU indices.
+ * Example: "1,3,5-7". Stride can be specified: "0-7:2" is "0,2,4,6".
+ * Note: leading and trailing whitespace is not allowed.
+ *  util-linux 2.31 allows leading and sometimes trailing whitespace:
+ *  ok:     taskset -c ' 1,  2'
+ *  ok:     taskset -c ' 1 , 2'
+ *  ok:     taskset -c ' 1-7: 2 ,8'
+ *  not ok: taskset -c ' 1 '
+ *  not ok: taskset -c ' 1-7: 2 '
+ */
+static void parse_cpulist(ul *mask, unsigned max, char *s)
+{
+        char *aff = s;
+        for (;;) {
+                unsigned bit, end;
+                unsigned stride = 1;
+
+                bit = end = bb_strtou(s, &s, 10);
+                if (*s == '-') {
+                        s++;
+                        end = bb_strtou(s, &s, 10);
+                        if (*s == ':') {
+                                s++;
+                                stride = bb_strtou(s, &s, 10);
+                        }
+                }
+                if ((*s != ',' && *s != '\0')
+                 || bit > end
+                 || end == UINT_MAX /* bb_strtou returns this on malformed / ERANGE numbers */
+                 || (stride - 1) > (UINT_MAX / 4)
+                /* disallow 0, malformed input, and too large stride prone to overflows */
+                ) {
+                        bb_error_msg_and_die("bad affinity '%s'", aff);
+                }
+                while (bit <= end && bit < max) {
+                        mask[bit / BITS_UL] |= (1UL << (bit & MASK_UL));
+                        bit += stride;
+                }
+                if (*s == '\0')
+                        break;
+                s++;
+        }
+}
+static void print_cpulist(const ul *mask, unsigned mask_size_in_bytes)
+{
+        const ul *mask_end;
+        const char *delim;
+        unsigned pos;
+        ul bit;
+
+        mask_end = mask + mask_size_in_bytes / sizeof(mask[0]);
+        delim = "";
+        pos = 0;
+        bit = 1;
+        for (;;) {
+                if (*mask & bit) {
+                        unsigned onebit = pos + 1;
+                        printf("%s%u", delim, pos);
+                        do {
+                                pos++;
+                                bit <<= 1;
+                                if (bit == 0) {
+                                        mask++;
+                                        if (mask >= mask_end)
+                                                break;
+                                        bit = 1;
+                                }
+                        } while (*mask & bit);
+                        if (onebit != pos)
+                                printf("-%u", pos - 1);
+                        delim = ",";
+                }
+                pos++;
+                bit <<= 1;
+                if (bit == 0) {
+                        mask++;
+                        if (mask >= mask_end)
+                                break;
+                        bit = 1;
+                }
+        }
+        bb_putchar('\n');
+}
+#endif
+
 int taskset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int taskset_main(int argc UNUSED_PARAM, char **argv)
 {
         ul *mask;
         unsigned mask_size_in_bytes;
         pid_t pid = 0;
-        unsigned opt_p;
         const char *current_new;
         char *aff;
+        unsigned opts;
+        enum {
+                OPT_p = 1 << 0,
+                OPT_c = (1 << 1) * ENABLE_FEATURE_TASKSET_CPULIST,
+        };
 
         /* NB: we mimic util-linux's taskset: -p does not take
          * an argument, i.e., "-pN" is NOT valid, only "-p N"!
          * Indeed, util-linux-2.13-pre7 uses:
          * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
 
-        opt_p = getopt32(argv, "^+" "p" "\0" "-1" /* at least 1 arg */);
+        opts = getopt32(argv, "^+" "p"IF_FEATURE_TASKSET_CPULIST("c")
+                        "\0" "-1" /* at least 1 arg */);
         argv += optind;
 
         aff = *argv++;
-        if (opt_p) {
+        if (opts & OPT_p) {
                 char *pid_str = aff;
                 if (*argv) { /* "-p <aff> <pid> ...rest.is.ignored..." */
                         pid_str = *argv; /* NB: *argv != NULL in this case */
@@ -144,8 +246,14 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
         current_new = "current";
  print_aff:
         mask = get_aff(pid, &mask_size_in_bytes);
-        if (opt_p) {
-                printf("pid %d's %s affinity mask: "TASKSET_PRINTF_MASK"\n",
+        if (opts & OPT_p) {
+#if ENABLE_FEATURE_TASKSET_CPULIST
+                if (opts & OPT_c) {
+                        printf("pid %d's %s affinity list: ", pid, current_new);
+                        print_cpulist(mask, mask_size_in_bytes);
+                } else
+#endif
+                        printf("pid %d's %s affinity mask: "TASKSET_PRINTF_MASK"\n",
                                 pid, current_new, from_mask(mask, mask_size_in_bytes));
                 if (*argv == NULL) {
                         /* Either it was just "-p <pid>",
@@ -158,17 +266,27 @@ int taskset_main(int argc UNUSED_PARAM, char **argv)
         }
         memset(mask, 0, mask_size_in_bytes);
 
-        /* Affinity was specified, translate it into mask */
-        /* it is always in hex, skip "0x" if it exists */
-        if (aff[0] == '0' && (aff[1]|0x20) == 'x')
-                aff += 2;
-
         if (!ENABLE_FEATURE_TASKSET_FANCY) {
+                /* Affinity was specified, translate it into mask */
+                /* it is always in hex, skip "0x" if it exists */
+                if (aff[0] == '0' && (aff[1]|0x20) == 'x')
+                        aff += 2;
                 mask[0] = xstrtoul(aff, 16);
-        } else {
+        }
+#if ENABLE_FEATURE_TASKSET_CPULIST
+        else if (opts & OPT_c) {
+                parse_cpulist(mask, mask_size_in_bytes * 8, aff);
+        }
+#endif
+        else {
                 unsigned i;
                 char *last_char;
 
+                /* Affinity was specified, translate it into mask */
+                /* it is always in hex, skip "0x" if it exists */
+                if (aff[0] == '0' && (aff[1]|0x20) == 'x')
+                        aff += 2;
+
                 i = 0; /* bit pos in mask[] */
 
                 /* aff is ASCII hex string, accept very long masks in this form.