X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Freadahead%2Freadahead-analyze.c;h=9a929c0937f9cf212196bc545d531fbb4997bac3;hb=927e96326c195ad39a45b091f98e9c635f400982;hp=5a5b9176d0837b14ed75c19b6fc94b0037da06ef;hpb=87ce22cc0d097d9cd0297d0141eadba6c573c299;p=elogind.git

diff --git a/src/readahead/readahead-analyze.c b/src/readahead/readahead-analyze.c
index 5a5b9176d..9a929c093 100644
--- a/src/readahead/readahead-analyze.c
+++ b/src/readahead/readahead-analyze.c
@@ -32,49 +32,46 @@
 
 #include "readahead-common.h"
 
-int main_analyze(const char *pack_path)
-{
-        char line[1024];
-        char path[PATH_MAX];
+int main_analyze(const char *pack_path) {
+        char line[LINE_MAX];
         FILE *pack;
         int a;
         int missing = 0;
-        off_t size;
-        long tsize = 0;
-        uint64_t inode;
-        uint32_t b;
-        uint32_t c;
-        struct stat st;
-        int pagesize = getpagesize();
+        off_t tsize = 0;
 
         if (!pack_path)
                 pack_path = "/.readahead";
 
-        pack = fopen(pack_path, "r");
+        pack = fopen(pack_path, "re");
         if (!pack) {
-                fprintf(stderr, "Pack file missing\n");
-                return EXIT_FAILURE;
+                log_error("Pack file missing.");
+                goto fail;
         }
 
-        if (!(fgets(line, sizeof(line), pack))) {
-                fprintf(stderr, "Pack file corrupt\n");
-                return EXIT_FAILURE;
+        if (!fgets(line, sizeof(line), pack)) {
+                log_error("Pack file corrupt.");
+                goto fail;
         }
 
-        if (!strstr(line, READAHEAD_PACK_FILE_VERSION)) {
-                fprintf(stderr, "Pack file version incompatible with this parser\n");
-                return EXIT_FAILURE;
+        char_array_0(line);
+
+        if (!endswith(line, READAHEAD_PACK_FILE_VERSION)) {
+                log_error("Pack file version incompatible with this parser.");
+                goto fail;
         }
 
         if ((a = getc(pack)) == EOF) {
-                fprintf(stderr, "Pack file corrupt\n");
-                return EXIT_FAILURE;
+                log_error("Pack file corrupt.");
+                goto fail;
         }
 
-        fprintf(stdout, "   pct  sections     size: path\n");
-        fprintf(stdout, "   ===  ========     ====: ====\n");
+        fputs("   pct  sections     size: path\n"
+              "   ===  ========     ====: ====\n", stdout);
 
-        while(true) {
+        for (;;) {
+                char path[PATH_MAX];
+                struct stat st;
+                uint64_t inode;
                 int pages = 0;
                 int sections = 0;
 
@@ -84,21 +81,23 @@ int main_analyze(const char *pack_path)
                 path[strlen(path)-1] = 0;
 
                 if (fread(&inode, sizeof(inode), 1, pack) != 1) {
-                        fprintf(stderr, "Pack file corrupt\n");
-                        return EXIT_FAILURE;
+                        log_error("Pack file corrupt.");
+                        goto fail;
                 }
 
-                while (true) {
+                for (;;) {
+                        uint32_t b, c;
+
                         if (fread(&b, sizeof(b), 1, pack) != 1  ||
                             fread(&c, sizeof(c), 1, pack) != 1) {
-                                fprintf(stderr, "Pack file corrupt\n");
-                                return EXIT_FAILURE;
+                                log_error("Pack file corrupt.");
+                                goto fail;
                         }
                         if ((b == 0) && (c == 0))
                                 break;
 
                         /* Uncomment this to get all the chunks separately
-                        fprintf(stdout, " %d: %d %d\n", sections, b, c);
+                           printf(" %d: %d %d\n", sections, b, c);
                          */
 
                         pages += (c - b);
@@ -106,20 +105,22 @@ int main_analyze(const char *pack_path)
                 }
 
                 if (stat(path, &st) == 0) {
+                        off_t size;
+
                         if (sections == 0)
                                 size = st.st_size;
                         else
-                                size = pages * pagesize;
+                                size = pages * page_size();
 
                         tsize += size;
 
-                        fprintf(stdout, "  %4d%% (%2d) %12ld: %s\n",
-                                sections ? (int)(size / st.st_size * 100.0) : 100,
+                        printf("  %4d%% (%2d) %12ld: %s\n",
+                                sections ? (int) (size * 100 / st.st_size) : 100,
                                 sections ? sections : 1,
                                 (unsigned long)size,
                                 path);
                 } else {
-                        fprintf(stdout, "  %4dp (%2d) %12s: %s (MISSING)\n",
+                        printf("  %4dp (%2d) %12s: %s (MISSING)\n",
                                 sections ? pages : -1,
                                 sections ? sections : 1,
                                 "???",
@@ -129,10 +130,21 @@ int main_analyze(const char *pack_path)
 
         }
 
-        fprintf(stdout, "\nHOST:    %s", line);
-        fprintf(stdout, "TYPE:    %c\n", a);
-        fprintf(stdout, "MISSING: %d\n", missing);
-        fprintf(stdout, "TOTAL:   %ld\n", tsize);
+        fclose(pack);
+
+        printf("\nHOST:    %s"
+               "TYPE:    %c\n"
+               "MISSING: %d\n"
+               "TOTAL:   %llu\n",
+               line,
+               a,
+               missing,
+               (unsigned long long) tsize);
 
         return EXIT_SUCCESS;
+
+fail:
+        if(pack)
+                fclose(pack);
+        return EXIT_FAILURE;
 }