Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (28 diffs)

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -46 +46 @@
 {
     /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
     char *command = NULL;
 
     /*@ pointers **************************************************** */
-    char *p;
+    char *p = NULL;
     FILE *fin;
-
-    /*@ initialize pointers ***************************************** */
-
-    p = output;
 
     /*@************************************************************** */
@@ -64 +60 @@
         fin = popen(command, "r");
         if (fin) {
-            (void) fgets(output, MAX_STR_LEN, fin);
+            mr_getline(output, fin);
             p = strchr(output, ' ');
+            if (p != NULL) {
+                *p = '\0';
+            } else {
+                mr_free(output);
+                mr_asprintf(output, "");
+            }
             paranoid_pclose(fin);
         }
@@ -71 +73 @@
     } else {
         log_it("File '%s' not found; cannot calc checksum", filename);
-    }
-    if (p) {
-        *p = '\0';
+        mr_asprintf(output, "");
     }
     return (output);
@@ -125 +125 @@
     /*@ buffers ***************************************************** */
     char *command = NULL;
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ long ******************************************************** */
@@ -132 +132 @@
     /*@ pointers **************************************************** */
     FILE *fin;
-
-    /*@ initialize [0] to null ******************************************** */
-    incoming[0] = '\0';
 
     assert_string_is_neither_NULL_nor_zerolength(filename);
@@ -152 +149 @@
             noof_lines = 0;
         } else {
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-            while (strlen(incoming) > 0
-                   && incoming[strlen(incoming) - 1] < 32) {
+            mr_getline(incoming, fin);
+            while (strlen(incoming) > 0 && incoming[strlen(incoming) - 1] < 32) {
                 incoming[strlen(incoming) - 1] = '\0';
             }
             noof_lines = atol(incoming);
+            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -206 +203 @@
     char *outfname = NULL;
     char *tmp = NULL;
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */
@@ -236 +233 @@
     mr_free(outfname);
 
-    for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -247 +243 @@
             log_it("Excluding '%s'-nonexistent\n", incoming);
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -470 +469 @@
 {
     /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
     char *command = NULL;
 
@@ -480 +479 @@
     if (!does_file_exist(filename)) {
         log_it("Tring to get last line of nonexistent file (%s)", filename);
-        output[0] = '\0';
+        mr_asprintf(output, "");
         return (output);
     }
@@ -487 +486 @@
     mr_free(command);
 
-    (void) fgets(output, MAX_STR_LEN, fin);
+    mr_getline(output, fin);
     paranoid_pclose(fin);
     while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
@@ -526 +525 @@
  * @bug I don't know what this function does. However, it seems orphaned, so it should probably be removed.
  */
-int
-make_checksum_list_file(char *filelist, char *cksumlist, char *comppath)
-{
+int make_checksum_list_file(char *filelist, char *cksumlist, char *comppath) {
     /*@ pointers **************************************************** */
     FILE *fin;
@@ -539 +536 @@
 
     /*@ buffer ****************************************************** */
-    char stub_fname[1000];
-    char curr_fname[1000];
+    char *stub_fname = NULL;
+    char *curr_fname = NULL;
     char *curr_cksum = NULL;
     char *tmp = NULL;
@@ -571 +568 @@
         return (1);
     }
-    for (fgets(stub_fname, 999, fin); !feof(fin);
-         fgets(stub_fname, 999, fin)) {
+    for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
         if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
             stub_fname[i] = '\0';
         }
         mr_asprintf(tmp, "%s%s", comppath, stub_fname);
-        strcpy(curr_fname, tmp + 1);
+        mr_free(stub_fname);
+
+        mr_asprintf(curr_fname, "%s", tmp + 1);
         mr_free(tmp);
 
@@ -587 +585 @@
             current_time = get_time();
             counter = 0;
+            /* BERLIOS: 37 really ? */
             curr_fname[37] = '\0';
             curr_pos = ftello(fin) / 1024;
             percentage = (int) (curr_pos * 100 / filelist_length);
             time_taken = current_time - start_time;
-            if (percentage == 0) {
-                /*              printf("%0d%% done      \r",percentage); */
-            } else {
+            if (percentage != 0) {
                 time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
                 log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
@@ -599 +596 @@
             sync();
         }
-    }
+        mr_free(curr_fname);
+    }
+    mr_free(stub_fname);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -678 +678 @@
 
     /*@ buffers **************************************************** */
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ end vars *************************************************** */
@@ -689 +689 @@
         return (0);
     }
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-    }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
     paranoid_fclose(fin);
     return (matches);
@@ -737 +739 @@
 {
     /*@ buffers ***************************************************** */
-    char *fname;
+    char *fname = NULL;
     char *biggielist = NULL;
     char *tmp = NULL;
@@ -751 +753 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(fname);
     log_it("Calculating size of all biggiefiles (in total)");
     mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
@@ -762 +763 @@
     } else {
         log_msg(4, "Reading it...");
-        for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
-             fgets(fname, MAX_STR_LEN, fin)) {
+        for (mr_getline(fname, fin); !feof(fin); mr_getline(fname, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -772 +772 @@
                     if (!tmp) {
                         mr_free(tmp);
+                        mr_free(fname);
                         fatal_error("ntfsresize not found");
                     }
@@ -799 +800 @@
                 break;
             }
-        }
+            mr_free(fname);
+        }
+        mr_free(fname);
     }
     log_it("Closing...");
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    paranoid_free(fname);
     return (scratchL);
 }
@@ -817 +819 @@
 {
     /*@ buffer ****************************************************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *command = NULL;
     long long llres;
@@ -833 +835 @@
       llres = 0;
     } else {
-      (void) fgets(tmp, MAX_STR_LEN, fin);
+      mr_getline(tmp, fin);
       paranoid_pclose(fin);
       p = strchr(tmp, '\t');
@@ -843 +845 @@
         llres += (int) (*p - '0');
       }
+      mr_free(tmp);
     }
     mr_free(command);
@@ -1289 +1292 @@
     }
     /* BERLIOS: This is just plain WRONG !! */
-    mr_asprintf(do_not_compress_these, "%s", last_line_of_file(tmp));
+    do_not_compress_these = last_line_of_file(tmp);
     mr_free(tmp);