Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.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-verify.c (modified) (7 diffs)

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

@@ -411 +411 @@
     char *command = NULL;
     char *outlog = NULL;
-    char *tmp;
-    //  char *p;
+    char *tmp = NULL;
 
     /*@ pointers ******************************************************* */
@@ -422 +421 @@
 
 
-    malloc_string(tmp);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
@@ -499 +497 @@
         pin = popen(command, "r");
         if (pin) {
-            for (fgets(tmp, MAX_STR_LEN, pin); !feof(pin);
-                 fgets(tmp, MAX_STR_LEN, pin)) {
+            for (mr_getline(tmp, pin); !feof(pin); mr_getline(tmp, pin)) {
                 if (bkpinfo->use_star) {
                     if (!strstr(tmp, "diffopts=")) {
-                        while (strlen(tmp) > 0
-                               && tmp[strlen(tmp) - 1] < 32) {
+                        while (strlen(tmp) > 0 && tmp[strlen(tmp) - 1] < 32) {
                             tmp[strlen(tmp) - 1] = '\0';
                         }
                         if (strchr(tmp, '/')) {
                             if (!diffs) {
-                                log_msg(0, "'%s' - differences found",
-                                        tarball_fname);
+                                log_msg(0, "'%s' - differences found", tarball_fname);
                             }
-                            log_msg(0, "star: /%s",
-                                    strip_afio_output_line(tmp));
+                            log_msg(0, "star: /%s", strip_afio_output_line(tmp));
                             diffs++;
                         }
@@ -519 +513 @@
                 } else {
                     if (!diffs) {
-                        log_msg(0, "'%s' - differences found",
-                                tarball_fname);
+                        log_msg(0, "'%s' - differences found", tarball_fname);
                     }
                     log_msg(0, "afio: /%s", strip_afio_output_line(tmp));
                     diffs++;
                 }
+                mr_free(tmp);
             }
+            mr_free(tmp);
             paranoid_pclose(pin);
         } else {
@@ -533 +528 @@
     mr_free(command);
     mr_free(outlog);
-    paranoid_free(tmp);
     return (0);
 }
@@ -681 +675 @@
     mr_asprintf(biggie_cksum, "%s", slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
+        orig_cksum = calc_checksum_of_file(biggie_fname);
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
@@ -690 +684 @@
             mr_free(tmp);
         }
+        mr_free(orig_cksum);
     }
     mr_free(biggie_cksum);
     mr_free(test_file);
-    mr_free(orig_cksum);
     paranoid_free(slice_fnam);
     return (retval);