Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/readprofile.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/readprofile.c (modified) (9 diffs)

branches/2.2.9/mindi-busybox/util-linux/readprofile.c

@@ -5 +5 @@
  *  Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it)
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+ * 1999-02-22 Arkadiusz Mickiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
  * 1999-09-01 Stephane Eranian <eranian@cello.hpl.hp.com>
@@ -42 +42 @@
 static const char defaultpro[] ALIGN1 = "/proc/profile";
 
-int readprofile_main(int argc, char **argv);
-int readprofile_main(int argc, char **argv)
+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, *mult = 0;
+    const char *mapFile, *proFile;
     unsigned long indx = 1;
     size_t len;
@@ -56 +56 @@
     char mapline[S_LEN];
     char mode[8];
-    int optAll = 0, optInfo = 0, optReset = 0;
-    int optVerbose = 0, optNative = 0;
-    int optBins = 0, optSub = 0;
     int maplineno = 1;
     int header_printed;
+    int multiplier = 0;
+    unsigned opt;
+    enum {
+        OPT_M = (1 << 0),
+        OPT_m = (1 << 1),
+        OPT_p = (1 << 2),
+        OPT_n = (1 << 3),
+        OPT_a = (1 << 4),
+        OPT_b = (1 << 5),
+        OPT_s = (1 << 6),
+        OPT_i = (1 << 7),
+        OPT_r = (1 << 8),
+        OPT_v = (1 << 9),
+    };
+#define optMult    (opt & OPT_M)
+#define optNative  (opt & OPT_n)
+#define optAll     (opt & OPT_a)
+#define optBins    (opt & OPT_b)
+#define optSub     (opt & OPT_s)
+#define optInfo    (opt & OPT_i)
+#define optReset   (opt & OPT_r)
+#define optVerbose (opt & OPT_v)
 
 #define next (current^1)
@@ -67 +86 @@
     mapFile = defaultmap;
 
-    opt_complementary = "nn:aa:bb:ss:ii:rr:vv";
-    getopt32(argv, "M:m:p:nabsirv",
-            &mult, &mapFile, &proFile,
-            &optNative, &optAll, &optBins, &optSub,
-            &optInfo, &optReset, &optVerbose);
-
-    if (optReset || mult) {
-        int multiplier, fd, to_write;
+    opt_complementary = "M+"; /* -M N */
+    opt = getopt32(argv, "M:m:p:nabsirv", &multiplier, &mapFile, &proFile);
+
+    if (opt & (OPT_M|OPT_r)) { /* mult or reset, or both */
+        int fd, to_write;
 
         /*
@@ -80 +96 @@
          * not sizeof(int), the multiplier is not changed
          */
-        if (mult) {
-            multiplier = xatoi_u(mult);
-            to_write = sizeof(int);
-        } else {
-            multiplier = 0;
-            to_write = 1;   /* sth different from sizeof(int) */
-        }
+        to_write = sizeof(int);
+        if (!optMult)
+            to_write = 1;  /* sth different from sizeof(int) */
 
         fd = xopen(defaultpro, O_WRONLY);
-
-        if (full_write(fd, &multiplier, to_write) != to_write)
-            bb_perror_msg_and_die("error writing %s", defaultpro);
-
+        xwrite(fd, &multiplier, to_write);
         close(fd);
         return EXIT_SUCCESS;
@@ -101 +110 @@
      */
     len = MAXINT(ssize_t);
-    buf = xmalloc_open_read_close(proFile, &len);
+    buf = xmalloc_xopen_read_close(proFile, &len);
     if (!optNative) {
-        int entries = len/sizeof(*buf);
+        int entries = len / sizeof(*buf);
         int big = 0, small = 0, i;
         unsigned *p;
@@ -136 +145 @@
     total = 0;
 
-    map = xfopen(mapFile, "r");
+    map = xfopen_for_read(mapFile);
 
     while (fgets(mapline, S_LEN, map)) {
@@ -168 +177 @@
            Absolute symbols */
         if ((*mode == 'A' || *mode == '?') && total == 0) continue;
-        if (*mode != 'T' && *mode != 't' &&
-            *mode != 'W' && *mode != 'w')
-            break;  /* only text is profiled */
+        if (*mode != 'T' && *mode != 't'
+         && *mode != 'W' && *mode != 'w'
+        ) {
+            break;  /* only text is profiled */
+        }
 
         if (indx >= len / sizeof(*buf))
@@ -191 +202 @@
             if (optVerbose || this > 0)
                 printf("  total\t\t\t\t%u\n", this);
-        } else if ((this || optAll) &&
-               (fn_len = next_add-fn_add) != 0) {
+        } else if ((this || optAll)
+                && (fn_len = next_add-fn_add) != 0
+        ) {
             if (optVerbose)
                 printf("%016llx %-40s %6i %8.4f\n", fn_add,