Changeset 1173 in MondoRescue for branches/stable/mondo/src/common/libmondo-fork.c

Timestamp:

Feb 16, 2007, 12:25:24 PM (17 years ago)

Author:

Bruno Cornec

Message:

merges from trunk for memory management for libmondo-mountlist.c mainly

File:

• branches/stable/mondo/src/common/libmondo-fork.c (modified) (12 diffs)

branches/stable/mondo/src/common/libmondo-fork.c

@@ -46 +46 @@
 
     assert_string_is_neither_NULL_nor_zerolength(call);
+
     if ((fin = popen(call, "r"))) {
         for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
@@ -184 +185 @@
     char *callstr = NULL;
     char *incoming = NULL;
-    char *tmp = NULL;
 
     /*@ int ********************************************************* */
     int res = 0;
     size_t n = 0;
-    int i;
-    int len;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -325 +323 @@
         }
     }
-#ifdef _XWIN
-    /* This only can update when newline goes into the file,
-       but it's *much* prettier/faster on Qt. */
-    while (does_file_exist(lockfile)) {
-        while (!feof(fin)) {
-            if (!fgets(tmp, 512, fin))
-                break;
-            log_to_screen(tmp);
-        }
-        usleep(500000);
-    }
-#else
     /* This works on Newt, and it gives quicker updates. */
     for (; does_file_exist(lockfile); sleep(1)) {
@@ -342 +328 @@
         update_evalcall_form(1);
     }
-#endif
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;
@@ -379 +364 @@
 // if dir=='r' then copy from archived to orig
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
@@ -396 +382 @@
         fin = f_orig;
         fout = f_archived;
-        sprintf(tmp, "%-64s", PIMP_START_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_START_SZ);
+        if (fwrite(tmp1, 1, 64, fout) != 64) {
             fatal_error("Can't write the introductory block");
         }
+        mr_free(tmp1);
+
         while (1) {
             bytes_to_be_read = bytes_read_in = fread(buf, 1, bufcap, fin);
@@ -405 +393 @@
                 break;
             }
-            sprintf(tmp, "%-64ld", bytes_read_in);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", bytes_read_in);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write introductory block");
             }
+            mr_free(tmp1);
+
             mr_msg(7,
                     "subslice #%ld --- I have read %ld of %ld bytes in from f_orig",
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            sprintf(tmp, "%-64ld", subsliceno);
-            if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_asprintf(&tmp1, "%-64ld", subsliceno);
+            if (fwrite(tmp1, 1, 64, fout) != 64) {
                 fatal_error("Cannot write post-thingy block");
             }
+            mr_free(tmp1);
+
             mr_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
@@ -427 +419 @@
         fin = f_archived;
         fout = f_orig;
+        tmp = mr_malloc(64L);
         if (fread(tmp, 1, 64L, fin) != 64L) {
             fatal_error("Cannot read the introductory block");
@@ -447 +440 @@
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read post-thingy block");
             }
@@ -456 +449 @@
             mr_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Cannot read introductory block");
             }
@@ -466 +459 @@
 
     if (direction == 'w') {
-        sprintf(tmp, "%-64s", PIMP_END_SZ);
-        if (fwrite(tmp, 1, 64, fout) != 64) {
+        mr_asprintf(&tmp1, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp1, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
+        mr_free(tmp1);
     } else {
         mr_msg(1, "tmpA is %s", tmp);
         if (!strstr(tmp, PIMP_END_SZ)) {
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp, 1, 64L, fin) != 64L) {
                 fatal_error("Can't read the final block");
             }
@@ -479 +473 @@
             if (!strstr(tmp, PIMP_END_SZ)) {
                 ftmp = fopen("/tmp/out.leftover", "w");
-                bytes_read_in = fread(tmp, 1, 64, fin);
+                bytes_read_in = fread(tmp, 1, 64L, fin);
                 mr_msg(1, "bytes_read_in = %ld", bytes_read_in);
 //      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }