Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/util-linux/readprofile.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/util-linux/readprofile.c (modified) (14 diffs)

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  *  readprofile.c - used to read /proc/profile
@@ -4 +5 @@
  *  Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it)
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -44 +33 @@
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "libbb.h"
 #include <sys/utsname.h>
 
-#include "busybox.h"
-
 #define S_LEN 128
 
 /* These are the defaults */
-static const char defaultmap[]="/boot/System.map";
-static const char defaultpro[]="/proc/profile";
-
+static const char defaultmap[] ALIGN1 = "/boot/System.map";
+static const char defaultpro[] ALIGN1 = "/proc/profile";
+
+int readprofile_main(int argc, char **argv);
 int readprofile_main(int argc, char **argv)
 {
     FILE *map;
-    int proFd;
-    const char *mapFile, *proFile, *mult=0;
-    unsigned long len=0, indx=1;
-    uint64_t add0=0;
+    const char *mapFile, *proFile, *mult = 0;
+    unsigned long indx = 1;
+    size_t len;
+    uint64_t add0 = 0;
     unsigned int step;
     unsigned int *buf, total, fn_len;
-    unsigned long long fn_add, next_add;          /* current and next address */
+    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 c;
-    int optAll=0, optInfo=0, optReset=0, optVerbose=0, optNative=0;
-    int optBins=0, optSub=0;
-    char mapline[S_LEN];
-    int maplineno=1;
+    int optAll = 0, optInfo = 0, optReset = 0;
+    int optVerbose = 0, optNative = 0;
+    int optBins = 0, optSub = 0;
+    int maplineno = 1;
     int header_printed;
 
@@ -86 +67 @@
     mapFile = defaultmap;
 
-    while ((c = getopt(argc, argv, "M:m:np:itvarVbs")) != -1) {
-        switch(c) {
-        case 'm':
-            mapFile = optarg;
-            break;
-        case 'n':
-            optNative++;
-            break;
-        case 'p':
-            proFile = optarg;
-            break;
-        case 'a':
-            optAll++;
-            break;
-        case 'b':
-            optBins++;
-            break;
-        case 's':
-            optSub++;
-            break;
-        case 'i':
-            optInfo++;
-            break;
-        case 'M':
-            mult = optarg;
-            break;
-        case 'r':
-            optReset++;
-            break;
-        case 'v':
-            optVerbose++;
-            break;
-        default:
-            bb_show_usage();
-        }
-    }
+    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) {
@@ -131 +81 @@
          */
         if (mult) {
-            multiplier = strtoul(mult, 0, 10);
+            multiplier = xatoi_u(mult);
             to_write = sizeof(int);
         } else {
@@ -138 +88 @@
         }
 
-        fd = bb_xopen(defaultpro,O_WRONLY);
-
-        if (write(fd, &multiplier, to_write) != to_write)
+        fd = xopen(defaultpro, O_WRONLY);
+
+        if (full_write(fd, &multiplier, to_write) != to_write)
             bb_perror_msg_and_die("error writing %s", defaultpro);
 
@@ -150 +100 @@
      * Use an fd for the profiling buffer, to skip stdio overhead
      */
-
-    proFd = bb_xopen(proFile,O_RDONLY);
-
-    if (((int)(len=lseek(proFd,0,SEEK_END)) < 0)
-        || (lseek(proFd,0,SEEK_SET) < 0))
-        bb_perror_msg_and_die(proFile);
-
-    buf = xmalloc(len);
-
-    if (read(proFd,buf,len) != len)
-        bb_perror_msg_and_die(proFile);
-
-    close(proFd);
-
+    len = MAXINT(ssize_t);
+    buf = xmalloc_open_read_close(proFile, &len);
     if (!optNative) {
         int entries = len/sizeof(*buf);
-        int big = 0,small = 0,i;
+        int big = 0, small = 0, i;
         unsigned *p;
 
@@ -176 +114 @@
         }
         if (big > small) {
-            bb_error_msg("Assuming reversed byte order. "
-                "Use -n to force native byte order.");
+            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++) {
@@ -198 +136 @@
     total = 0;
 
-    map = bb_xfopen(mapFile, "r");
-
-    while (fgets(mapline,S_LEN,map)) {
-        if (sscanf(mapline,"%llx %s %s",&fn_add,mode,fn_name) != 3)
+    map = xfopen(mapFile, "r");
+
+    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",
                          mapFile, maplineno);
 
-        if (!strcmp(fn_name,"_stext")) /* only elf works like this */ {
+        if (!strcmp(fn_name, "_stext")) /* only elf works like this */ {
             add0 = fn_add;
             break;
@@ -218 +156 @@
      * Main loop.
      */
-    while (fgets(mapline,S_LEN,map)) {
+    while (fgets(mapline, S_LEN, map)) {
         unsigned int this = 0;
 
-        if (sscanf(mapline,"%llx %s %s",&next_add,mode,next_name) != 3)
+        if (sscanf(mapline, "%llx %s %s", &next_add, mode, next_name) != 3)
             bb_error_msg_and_die("%s(%i): wrong map line",
-                         mapFile, maplineno);
+                    mapFile, maplineno);
 
         header_printed = 0;
@@ -241 +179 @@
             if (optBins && (buf[indx] || optAll)) {
                 if (!header_printed) {
-                    printf ("%s:\n", fn_name);
+                    printf("%s:\n", fn_name);
                     header_printed = 1;
                 }
-                printf ("\t%"PRIx64"\t%u\n", (indx - 1)*step + add0, buf[indx]);
+                printf("\t%"PRIx64"\t%u\n", (indx - 1)*step + add0, buf[indx]);
             }
             this += buf[indx++];
@@ -252 +190 @@
         if (optBins) {
             if (optVerbose || this > 0)
-                printf ("  total\t\t\t\t%u\n", this);
+                printf("  total\t\t\t\t%u\n", this);
         } else if ((this || optAll) &&
                (fn_len = next_add-fn_add) != 0) {
             if (optVerbose)
                 printf("%016llx %-40s %6i %8.4f\n", fn_add,
-                       fn_name,this,this/(double)fn_len);
+                       fn_name, this, this/(double)fn_len);
             else
                 printf("%6i %-40s %8.4f\n",
-                       this,fn_name,this/(double)fn_len);
+                       this, fn_name, this/(double)fn_len);
             if (optSub) {
                 unsigned long long scan;
@@ -277 +215 @@
 
         fn_add = next_add;
-        strcpy(fn_name,next_name);
+        strcpy(fn_name, next_name);
 
         maplineno++;
@@ -288 +226 @@
     if (optVerbose)
         printf("%016x %-40s %6i %8.4f\n",
-               0,"total",total,total/(double)(fn_add-add0));
+               0, "total", total, total/(double)(fn_add-add0));
     else
         printf("%6i %-40s %8.4f\n",
-               total,"total",total/(double)(fn_add-add0));
+               total, "total", total/(double)(fn_add-add0));
 
     fclose(map);