Merge branch 'busybox' into merge

2 files changed, 66 insertions, 77 deletions

diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 7092ecd92..4863a5c29 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -101,8 +101,6 @@ union semun {
 #define TIME 4
 #define PID 5
 
-static char format;
-
 static void print_perms(int id, struct ipc_perm *ipcp)
 {
         struct passwd *pw;
@@ -125,8 +123,7 @@ static void print_perms(int id, struct ipc_perm *ipcp)
         else    printf(" %-10d\n", ipcp->gid);
 }
 
-
-static NOINLINE void do_shm(void)
+static NOINLINE void do_shm(int format)
 {
         int maxid, shmid, id;
         struct shmid_ds shmseg;
@@ -252,8 +249,7 @@ static NOINLINE void do_shm(void)
         }
 }
 
-
-static NOINLINE void do_sem(void)
+static NOINLINE void do_sem(int format)
 {
         int maxid, semid, id;
         struct semid_ds semary;
@@ -358,8 +354,7 @@ static NOINLINE void do_sem(void)
         }
 }
 
-
-static NOINLINE void do_msg(void)
+static NOINLINE void do_msg(int format)
 {
         int maxid, msqid, id;
         struct msqid_ds msgque;
@@ -466,7 +461,6 @@ static NOINLINE void do_msg(void)
         }
 }
 
-
 static void print_shm(int shmid)
 {
         struct shmid_ds shmds;
@@ -493,7 +487,6 @@ static void print_shm(int shmid)
         printf("change_time=%-26.24s\n\n", ctime(&shmds.shm_ctime));
 }
 
-
 static void print_msg(int msqid)
 {
         struct msqid_ds buf;
@@ -570,9 +563,9 @@ static void print_sem(int semid)
 }
 
 //usage:#define ipcs_trivial_usage
-//usage:       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
+//usage:       "[[-smq] -i SHMID] | [[-asmq] [-tcplu]]"
 //usage:#define ipcs_full_usage "\n\n"
-//usage:       "        -i      Show specific resource"
+//usage:       "        -i ID   Show specific resource"
 //usage:     "\nResource specification:"
 //usage:     "\n        -m      Shared memory segments"
 //usage:     "\n        -q      Message queues"
@@ -588,60 +581,57 @@ static void print_sem(int semid)
 int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ipcs_main(int argc UNUSED_PARAM, char **argv)
 {
-        int id = 0;
-        unsigned flags = 0;
+        int format = 0;
         unsigned opt;
         char *opt_i;
-#define flag_print      (1<<0)
-#define flag_msg        (1<<1)
-#define flag_sem        (1<<2)
-#define flag_shm        (1<<3)
 
         opt = getopt32(argv, "i:aqsmtcplu", &opt_i);
-        if (opt & 0x1) { // -i
+#define flag_msg (1<<2)
+#define flag_sem (1<<3)
+#define flag_shm (1<<4)
+        if (opt & (1<<5)) format = TIME; // -t
+        if (opt & (1<<6)) format = CREATOR; // -c
+        if (opt & (1<<7)) format = PID; // -p
+        if (opt & (1<<8)) format = LIMITS; // -l
+        if (opt & (1<<9)) format = STATUS; // -u
+
+        if (opt & (1<<0)) { // -i
+                int id;
+
                 id = xatoi(opt_i);
-                flags |= flag_print;
-        }
-        if (opt & 0x2) flags |= flag_msg | flag_sem | flag_shm; // -a
-        if (opt & 0x4) flags |= flag_msg; // -q
-        if (opt & 0x8) flags |= flag_sem; // -s
-        if (opt & 0x10) flags |= flag_shm; // -m
-        if (opt & 0x20) format = TIME; // -t
-        if (opt & 0x40) format = CREATOR; // -c
-        if (opt & 0x80) format = PID; // -p
-        if (opt & 0x100) format = LIMITS; // -l
-        if (opt & 0x200) format = STATUS; // -u
-
-        if (flags & flag_print) {
-                if (flags & flag_shm) {
+                if (opt & flag_shm) {
                         print_shm(id);
                         fflush_stdout_and_exit(EXIT_SUCCESS);
                 }
-                if (flags & flag_sem) {
+                if (opt & flag_sem) {
                         print_sem(id);
                         fflush_stdout_and_exit(EXIT_SUCCESS);
                 }
-                if (flags & flag_msg) {
+                if (opt & flag_msg) {
                         print_msg(id);
                         fflush_stdout_and_exit(EXIT_SUCCESS);
                 }
                 bb_show_usage();
         }
 
-        if (!(flags & (flag_shm | flag_msg | flag_sem)))
-                flags |= flag_msg | flag_shm | flag_sem;
+        if ((opt & (1<<1)) // -a
+         || !(opt & (flag_msg | flag_sem | flag_shm)) // none of -q,-s,-m == all
+        ) {
+                opt |= flag_msg | flag_sem | flag_shm;
+        }
+
         bb_putchar('\n');
 
-        if (flags & flag_msg) {
-                do_msg();
+        if (opt & flag_msg) {
+                do_msg(format);
                 bb_putchar('\n');
         }
-        if (flags & flag_shm) {
-                do_shm();
+        if (opt & flag_shm) {
+                do_shm(format);
                 bb_putchar('\n');
         }
-        if (flags & flag_sem) {
-                do_sem();
+        if (opt & flag_sem) {
+                do_sem(format);
                 bb_putchar('\n');
         }
         fflush_stdout_and_exit(EXIT_SUCCESS);
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 8fc33be3c..219c0c18c 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -61,27 +61,22 @@
 
 #define S_LEN 128
 
-/* These are the defaults */
-static const char defaultmap[] ALIGN1 = "/boot/System.map";
-static const char defaultpro[] ALIGN1 = "/proc/profile";
-
 int readprofile_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int readprofile_main(int argc UNUSED_PARAM, char **argv)
 {
         FILE *map;
         const char *mapFile, *proFile;
-        unsigned long indx = 1;
+        unsigned long indx;
         size_t len;
-        uint64_t add0 = 0;
+        uint64_t add0;
         unsigned int step;
         unsigned int *buf, total, fn_len;
         unsigned long long fn_add, next_add;     /* current and next address */
         char fn_name[S_LEN], next_name[S_LEN];   /* current and next name */
         char mapline[S_LEN];
         char mode[8];
-        int maplineno = 1;
-        int header_printed;
-        int multiplier = 0;
+        int maplineno;
+        int multiplier;
         unsigned opt;
         enum {
                 OPT_M = (1 << 0),
@@ -106,8 +101,9 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
 
 #define next (current^1)
 
-        proFile = defaultpro;
-        mapFile = defaultmap;
+        proFile = "/proc/profile";
+        mapFile = "/boot/System.map";
+        multiplier = 0;
 
         opt = getopt32(argv, "M:+m:p:nabsirv", &multiplier, &mapFile, &proFile);
 
@@ -122,7 +118,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
                 if (!optMult)
                         to_write = 1;  /* sth different from sizeof(int) */
 
-                fd = xopen(defaultpro, O_WRONLY);
+                fd = xopen("/proc/profile", O_WRONLY);
                 xwrite(fd, &multiplier, to_write);
                 close(fd);
                 return EXIT_SUCCESS;
@@ -133,12 +129,13 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
          */
         len = MAXINT(ssize_t);
         buf = xmalloc_xopen_read_close(proFile, &len);
+        len /= sizeof(*buf);
+
         if (!optNative) {
-                int entries = len / sizeof(*buf);
-                int big = 0, small = 0, i;
+                int big = 0, small = 0;
                 unsigned *p;
 
-                for (p = buf+1; p < buf+entries; p++) {
+                for (p = buf+1; p < buf+len; p++) {
                         if (*p & ~0U << (sizeof(*buf)*4))
                                 big++;
                         if (*p & ((1 << (sizeof(*buf)*4))-1))
@@ -147,15 +144,15 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
                 if (big > small) {
                         bb_error_msg("assuming reversed byte order, "
                                 "use -n to force native byte order");
-                        for (p = buf; p < buf+entries; p++)
-                                for (i = 0; i < sizeof(*buf)/2; i++) {
-                                        unsigned char *b = (unsigned char *) p;
-                                        unsigned char tmp;
-
-                                        tmp = b[i];
-                                        b[i] = b[sizeof(*buf)-i-1];
-                                        b[sizeof(*buf)-i-1] = tmp;
-                                }
+                        BUILD_BUG_ON(sizeof(*p) > 8);
+                        for (p = buf; p < buf+len; p++) {
+                                if (sizeof(*p) == 2)
+                                        *p = bswap_16(*p);
+                                if (sizeof(*p) == 4)
+                                        *p = bswap_32(*p);
+                                if (sizeof(*p) == 8)
+                                        *p = bb_bswap_64(*p);
+                        }
                 }
         }
 
@@ -165,10 +162,9 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
                 return EXIT_SUCCESS;
         }
 
-        total = 0;
-
         map = xfopen_for_read(mapFile);
-
+        add0 = 0;
+        maplineno = 1;
         while (fgets(mapline, S_LEN, map)) {
                 if (sscanf(mapline, "%llx %s %s", &fn_add, mode, fn_name) != 3)
                         bb_error_msg_and_die("%s(%i): wrong map line",
@@ -187,8 +183,11 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
         /*
          * Main loop.
          */
+        total = 0;
+        indx = 1;
         while (fgets(mapline, S_LEN, map)) {
-                unsigned int this = 0;
+                bool header_printed;
+                unsigned int this;
 
                 if (sscanf(mapline, "%llx %s %s", &next_add, mode, next_name) != 3)
                         bb_error_msg_and_die("%s(%i): wrong map line",
@@ -198,17 +197,17 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
 
                 /* ignore any LEADING (before a '[tT]' symbol is found)
                    Absolute symbols */
-                if ((*mode == 'A' || *mode == '?') && total == 0) continue;
-                if (*mode != 'T' && *mode != 't'
-                 && *mode != 'W' && *mode != 'w'
-                ) {
+                if ((mode[0] == 'A' || mode[0] == '?') && total == 0)
+                        continue;
+                if ((mode[0]|0x20) != 't' && (mode[0]|0x20) != 'w') {
                         break;  /* only text is profiled */
                 }
 
-                if (indx >= len / sizeof(*buf))
+                if (indx >= len)
                         bb_error_msg_and_die("profile address out of range. "
                                         "Wrong map file?");
 
+                this = 0;
                 while (indx < (next_add-add0)/step) {
                         if (optBins && (buf[indx] || optAll)) {
                                 if (!header_printed) {
@@ -256,7 +255,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* clock ticks, out of kernel text - probably modules */
-        printf("%6u %s\n", buf[len/sizeof(*buf)-1], "*unknown*");
+        printf("%6u *unknown*\n", buf[len-1]);
 
         /* trailer */
         if (optVerbose)