Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-fork.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-fork.c (modified) (10 diffs)

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

@@ -123 +123 @@
     char *cd_number_str = NULL;
     char *command = NULL;
-    char *p;
+    char *p= NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
@@ -140 +140 @@
 
     mr_asprintf(cd_number_str, "%d", cd_no);
+    midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
     log_msg(4, "basic call = '%s'", tmp1);
-    midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
     mr_free(tmp1);
 
+    tmp = resolve_naff_tokens(midway_call, cd_number_str, "_CD#_");
     log_msg(4, "midway_call = '%s'", midway_call);
-    tmp = resolve_naff_tokens(midway_call, cd_number_str, "_CD#_");
     mr_free(cd_number_str);
     mr_free(midway_call);
 
-    log_msg(4, "tmp = '%s'", tmp);
     ultimate_call = resolve_naff_tokens(tmp, MONDO_LOGFILE, "_ERR_");
+    log_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_free(tmp);
 
-    log_msg(4, "ultimate call = '%s'", ultimate_call);
     mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
     mr_free(ultimate_call);
 
-    log_to_screen
-        ("Please be patient. Do not be alarmed by on-screen inactivity.");
-    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
-            what_i_am_doing);
+    log_to_screen("Please be patient. Do not be alarmed by on-screen inactivity.");
+    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'", what_i_am_doing);
     if (bkpinfo->manual_cd_tray) {
         mr_asprintf(tmp2, "%s", command);
         p = strstr(tmp2, "2>>");
         if (p) {
-            *p++ = ' ';
-            *p++ = ' ';
-            *p++ = ' ';
+            sprintf(p, "   ");
             while (*p == ' ') {
                 p++;
@@ -376 +371 @@
         return (1);
     }
-    mr_free(command);
 
     if (!does_file_exist(lockfile)) {
@@ -384 +378 @@
         }
     }
+    mr_free(command);
 
     for (; does_file_exist(lockfile); sleep(1)) {
@@ -535 +530 @@
             bytes_to_be_read = atol(tmp1);
         }
+    }
+
+    if (direction == 'w') {
+        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
+        if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_free(tmp);
+            fatal_error("Can't write the final block");
+        }
+        mr_free(tmp);
+    } else {
         log_msg(1, "tmpA is %s", tmp1);
         if (!strstr(tmp1, PIMP_END_SZ)) {
@@ -554 +559 @@
                 }
 
-                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
+                mr_asprintf(tmp, "I am here - %lld", (long long)ftello(fin));
                 if (fread(tmp, 1, tmpcap, fin)) {
+                    mr_free(tmp);
                     fatal_error("Can't fread here");
                 }
                 log_msg(0, "tmp = '%s'", tmp);
                 if (fwrite(tmp, 1, tmpcap, ftmp)) {
+                    mr_free(tmp);
                     fatal_error("Can't fwrite there");
                 }
                 fclose(ftmp);
-                mr_free(tmp1);
+                mr_free(tmp);
                 fatal_error("Missing terminating block");
             }
         }
-        mr_free(tmp1);
-    }
+    }
+    mr_free(tmp1);
 
     paranoid_free(buf);
@@ -595 +602 @@
     command = find_home_of_exe("ntfsclone");
     if (!command) {
-        mr_free(command);
         fatal_error("ntfsclone not found");
     }
@@ -641 +647 @@
     /*@ buffers *********************************************************** */
     char *command = NULL;
-    char *title = NULL;
     /*@ pointers ********************************************************** */
     static int chldres = 0;
@@ -659 +664 @@
 
     log_msg(8, "Parent running");
-    mr_asprintf(title, "%s", tt);
-    open_evalcall_form(title);
-    mr_free(title);
+    open_evalcall_form(tt);
 
     for (sleep(1); command[0] != '\0'; sleep(1)) {
@@ -672 +675 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            mr_asprintf(title, "Verifying...");
-            open_evalcall_form(title);
-            mr_free(title);
+            open_evalcall_form("Verifying...");
         }
         if (counter++ >= 5) {