Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-fork.c

Timestamp:

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

Author:

Bruno Cornec

Message:

• Lots of memory management backports from 3.1 to 3.2 - still not finished, nor working ATM. the common subdir was done during travel, so this is essentially a backup !

File:

• branches/3.2/mondo/src/common/libmondo-fork.c (modified) (32 diffs)

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

@@ -8 +8 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -38 +39 @@
     /*@ buffers ***************************************************** */
     static char result[MAX_STR_LEN];
-    char *tmp;
-    char *p;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
-    FILE *fin;
+    FILE *fin = NULL;
+    int res = 0;
 
     /*@ initialize data ********************************************* */
-    malloc_string(tmp);
     result[0] = '\0';
-    tmp[0] = '\0';
 
     /*@******************************************************************** */
@@ -53 +52 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (p = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
-             p = fgets(tmp, MAX_STR_LEN, fin)) {
+        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
             if (strlen(tmp) > 1) {
                 strcpy(result, tmp);
             }
+            mr_free(tmp);
         }
         paranoid_pclose(fin);
     } else {
-        log_OS_error("Unable to popen call");
+        log_OS_error("Unable to open resulting file");
     }
     strip_spaces(result);
-    paranoid_free(tmp);
-    return (result);
-}
-
-
-
-
+    mr_free(tmp);
+    return(result);
+}
 
 
@@ -86 +81 @@
  * @param isofile Replaces @c _ISO_ in @p basic_call. Should probably be the ISO image to create (-o parameter to mkisofs).
  * @param cd_no Replaces @c _CD#_ in @p basic_call. Should probably be the CD number.
- * @param logstub Unused.
  * @param what_i_am_doing The action taking place (e.g. "Making ISO #1"). Used as the title of the progress dialog.
  * @return Exit code of @c mkisofs (0 is success, anything else indicates failure).
- * @bug @p logstub is unused.
  */
 int
@@ -101 +94 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *command, *incoming,
-        *old_stderr, *cd_number_str;
-    char *p;
+    char *midway_call = NULL;
+    char *ultimate_call = NULL;
+    char *tmp = NULL;
+        
+    char *cd_number_str = NULL;
+    char *command = NULL;
+    char *p= NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
 /*@***********   End Variables ***************************************/
@@ -110 +108 @@
     log_msg(3, "Starting");
     assert(bkpinfo != NULL);
-    // BERLIOS: doesn't work even if the string is correct !
-    //assert_string_is_neither_NULL_nor_zerolength(basic_call);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
-    assert_string_is_neither_NULL_nor_zerolength(logstub);
+
     if (!(midway_call = malloc(1200))) {
         fatal_error("Cannot malloc midway_call");
@@ -123 +119 @@
         fatal_error("Cannot malloc tmp");
     }
-    if (!(command = malloc(1200))) {
-        fatal_error("Cannot malloc command");
-    }
-    malloc_string(incoming);
-    malloc_string(old_stderr);
-    malloc_string(cd_number_str);
-
-    incoming[0] = '\0';
-    old_stderr[0] = '\0';
 
     if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
@@ -139 +126 @@
     }
 
-    sprintf(cd_number_str, "%d", cd_no);
+    mr_asprintf(cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, tmp1, isofile, "_ISO_");
+    log_msg(4, "basic call = '%s'", tmp1);
+    mr_free(tmp1);
+
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    log_msg(4, "midway_call = '%s'", midway_call);
+    mr_free(cd_number_str);
+
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
-    log_msg(4, "basic call = '%s'", tmp1);
-    log_msg(4, "midway_call = '%s'", midway_call);
-    log_msg(4, "tmp = '%s'", tmp);
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    sprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
-
-    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);
-    strcpy(tmp, command);
+    mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+
+    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) {
-        p = strstr(tmp, "2>>");
+        mr_asprintf(tmp2, "%s", command);
+        p = strstr(tmp2, "2>>");
         if (p) {
             sprintf(p, "   ");
@@ -161 +149 @@
                 p++;
             }
-            for (; *p != ' '; p++) {
+            for (; (*p != ' ') && (*p != '\0'); p++) {
                 *p = ' ';
             }
         }
-        strcpy(command, tmp);
-#ifndef _XWIN
+        mr_free(command);
+        command = tmp2;
         if (!g_text_mode) {
             newtSuspend();
         }
-#endif
         log_msg(1, "command = '%s'", command);
         retval += system(command);
@@ -177 +164 @@
         }
         if (retval) {
-            log_msg(2, "Basic call '%s' returned an error.", tmp1);
-            popup_and_OK("Press ENTER to continue.");
-            popup_and_OK
-                ("mkisofs and/or cdrecord returned an error. CD was not created");
+            popup_and_OK("mkisofs and/or cdrecord returned an error. CD was not created");
         }
     }
@@ -186 +170 @@
     else {
         log_msg(3, "command = '%s'", command);
-//      yes_this_is_a_goto:
-        retval =
-            run_external_binary_with_percentage_indicator_NEW
-            (what_i_am_doing, command);
-    }
-
-    mr_free(tmp1);
+        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
+    }
+    mr_free(command);
     paranoid_free(midway_call);
     paranoid_free(ultimate_call);
     paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(incoming);
-    paranoid_free(old_stderr);
-    paranoid_free(cd_number_str);
     return (retval);
 }
@@ -232 +208 @@
     log_msg(1, "command = '%s'", command);
     if (!g_text_mode) {
-        retval = run_external_binary_with_percentage_indicator_NEW
-            (what_i_am_doing, command);
+        retval = run_external_binary_with_percentage_indicator_NEW(what_i_am_doing, command);
     } else {
         retval += system(command);
@@ -277 +252 @@
         return (1);
     }
-//  if (debug_level == TRUE) { debug_level=5; }
-
-    //  assert_string_is_neither_NULL_nor_zerolength(program);
 
     if (debug_level <= g_loglevel) {
@@ -322 +294 @@
                 }
             }
-            /* end of patch */
             strip_spaces(incoming);
             if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
@@ -342 +313 @@
         }
     }
-//  else
-//    { log_msg (0, "-------------------------------ran w/ res=%d------------------------------", res); }
     return (res);
 }
@@ -368 +337 @@
 
     /*@ buffers **************************************************** */
-    char *tmp = NULL;
     char *command = NULL;
-    char lockfile[MAX_STR_LEN];
+    char *lockfile = NULL;
 
     /*@ end vars *************************************************** */
@@ -376 +344 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
-
-    mr_asprintf(command,
-            "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
-            lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
+    mr_asprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
+    mr_asprintf(command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    mr_asprintf(tmp, "Executing %s", basic_call);
-    log_msg(2, tmp);
-    mr_free(tmp);
+    log_msg(2, "Executing %s", basic_call);
 
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        mr_asprintf(tmp, "Failed utterly to call '%s'", command);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Failed utterly to call '%s'", command);
         mr_free(command);
+        mr_free(lockfile);
         return (1);
     }
+
     if (!does_file_exist(lockfile)) {
         log_to_screen("Waiting for '%s' to start",command);
@@ -401 +365 @@
     }
     mr_free(command);
-#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)) {
-            /* TODO: Dead and wrong code */
-            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)) {
         log_file_end_to_screen(MONDO_LOGFILE, "");
         update_evalcall_form(1);
     }
-#endif
+
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;
@@ -434 +385 @@
     close_evalcall_form();
     unlink(lockfile);
+    mr_free(lockfile);
+
     return (retval);
 }
@@ -453 +406 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
-    char filestr[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *buf = NULL;
+    char *filestr = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
@@ -465 +419 @@
 
     log_msg(5, "Opening.");
-    if (!(tmp = malloc(tmpcap))) {
-        fatal_error("Failed to malloc() tmp");
-    }
-    tmp[0] = '\0';
+
     bufcap = 256L * 1024L;
     if (!(buf = malloc(bufcap))) {
@@ -477 +428 @@
         fin = f_orig;
         fout = f_archived;
-        sprintf(tmp, "%-64s", PIMP_START_SZ);
+        mr_asprintf(tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
+            mr_free(tmp);
             fatal_error("Can't write the introductory block");
         }
+        mr_free(tmp);
+
         while (1) {
             bytes_to_be_read = bytes_read_in = fread(buf, 1, bufcap, fin);
@@ -486 +440 @@
                 break;
             }
-            sprintf(tmp, "%-64ld", bytes_read_in);
+            mr_asprintf(tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
+                mr_free(tmp);
                 fatal_error("Cannot write introductory block");
             }
+            mr_free(tmp);
+
             log_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);
+            mr_asprintf(tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
+                mr_free(tmp);
                 fatal_error("Cannot write post-thingy block");
             }
+            mr_free(tmp);
             log_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
-        sprintf(tmp, "%-64ld", 0L);
+        mr_asprintf(tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
+            mr_free(tmp);
             fatal_error("Cannot write final introductory block");
         }
+        mr_free(tmp);
+
+        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 {
         fin = f_archived;
         fout = f_orig;
-        if (fread(tmp, 1, 64L, fin) != 64L) {
+        if (!(tmp1 = malloc(tmpcap))) {
+            fatal_error("Failed to malloc() tmp");
+        }
+        if (fread(tmp1, 1, 64L, fin) != 64L) {
+            mr_free(tmp1);
             fatal_error("Cannot read the introductory block");
         }
-        log_msg(5, "tmp is %s", tmp);
-        if (!strstr(tmp, PIMP_START_SZ)) {
+        log_msg(5, "tmp1 is %s", tmp1);
+        if (!strstr(tmp1, PIMP_START_SZ)) {
+            mr_free(tmp1);
             fatal_error("Can't find intro blk");
         }
-        if (fread(tmp, 1, 64L, fin) != 64L) {
+        if (fread(tmp1, 1, 64L, fin) != 64L) {
+            mr_free(tmp1);
             fatal_error("Cannot read introductory blk");
         }
-        bytes_to_be_read = atol(tmp);
+        bytes_to_be_read = atol(tmp1);
         while (bytes_to_be_read > 0) {
-            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno,
-                    bytes_to_be_read);
+            log_msg(7, "subslice#%ld, bytes=%ld", subsliceno, bytes_to_be_read);
             bytes_read_in = fread(buf, 1, bytes_to_be_read, fin);
             if (bytes_read_in != bytes_to_be_read) {
-                fatal_error
-                    ("Danger, WIll Robinson. Failed to read whole subvol from archives.");
+                mr_free(tmp1);
+                fatal_error("Danger, WIll Robinson. Failed to read whole subvol from archives.");
             }
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Cannot read post-thingy block");
             }
-            if (atol(tmp) != subsliceno) {
-                log_msg(1, "Wanted subslice %ld but got %ld ('%s')",
-                        subsliceno, atol(tmp), tmp);
+            if (atol(tmp1) != subsliceno) {
+                log_msg(1, "Wanted subslice %ld but got %ld ('%s')", subsliceno, atol(tmp1), tmp1);
             }
             log_msg(7, "Subslice #%ld read OK", subsliceno);
             subsliceno++;
-            if (fread(tmp, 1, 64, fin) != 64) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Cannot read introductory block");
             }
-            bytes_to_be_read = atol(tmp);
-        }
-    }
-
-//  log_msg(4, "Written %ld of %ld bytes", bytes_written_out, bytes_read_in);
+            bytes_to_be_read = atol(tmp1);
+        }
+    }
 
     if (direction == 'w') {
-        sprintf(tmp, "%-64s", PIMP_END_SZ);
+        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", tmp);
-        if (!strstr(tmp, PIMP_END_SZ)) {
-            if (fread(tmp, 1, 64, fin) != 64) {
+        log_msg(1, "tmpA is %s", tmp1);
+        if (!strstr(tmp1, PIMP_END_SZ)) {
+            if (fread(tmp1, 1, 64, fin) != 64) {
+                mr_free(tmp1);
                 fatal_error("Can't read the final block");
             }
-            log_msg(5, "tmpB is %s", tmp);
-            if (!strstr(tmp, PIMP_END_SZ)) {
-                sprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
+            log_msg(5, "tmpB is %s", tmp1);
+            if (!strstr(tmp1, PIMP_END_SZ)) {
+                mr_asprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
                 ftmp = fopen(filestr, "w");
-                bytes_read_in = fread(tmp, 1, 64, fin);
+                mr_free(filestr);
+
+                bytes_read_in = fread(tmp1, 1, 64, fin);
                 log_msg(1, "bytes_read_in = %ld", bytes_read_in);
-//      if (bytes_read_in!=128+64) { fatal_error("Can't read the terminating block"); }
+
                 if (fwrite(tmp, 1, bytes_read_in, ftmp)) {
                     fatal_error("Can't fwrite here");
                 }
-                sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
-//    log_msg(0, tmp);
+
+                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(tmp);
                 fatal_error("Missing terminating block");
             }
         }
     }
+    mr_free(tmp1);
 
     paranoid_free(buf);
-    paranoid_free(tmp);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -601 +581 @@
 // BACKUP
     int res = -1;
-    char*command;
+    char *command = NULL;
 
     if (!does_file_exist(input_device)) {
@@ -609 +589 @@
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --rescue --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(command, "ntfsclone --rescue --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
+
     unlink(output_fname);
     return (res);
@@ -638 +618 @@
 
 
-int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd)
-{
+int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
 
     /*@ int *************************************************************** */
@@ -650 +629 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
-    char *title;
+    char *command = NULL;
     /*@ pointers ********************************************************** */
     static int chldres = 0;
@@ -662 +640 @@
     *pchild_result = 999;
 
-    malloc_string(title);
-    malloc_string(command);
-    strcpy(title, tt);
-    sprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
-    if ((res =
-         pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit,
-                        (void *) command))) {
+    if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
         fatal_error("Unable to create an archival thread");
     }
 
     log_msg(8, "Parent running");
-    open_evalcall_form(title);
+    open_evalcall_form(tt);
+
     for (sleep(1); command[0] != '\0'; sleep(1)) {
         pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
-        if (pcno <= 0 || pcno > 100) {
-            log_msg(8, "Weird pc#");
+        if (pcno < 0 || pcno > 100) {
+            log_msg(8, "Weird pc# %d", pcno);
             continue;
         }
@@ -684 +658 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            strcpy(title, "Verifying...");
-            open_evalcall_form(title);
+            open_evalcall_form("Verifying...");
         }
         if (counter++ >= 5) {
@@ -694 +667 @@
         update_evalcall_form(percentage);
     }
+    mr_free(command);
+
     log_file_end_to_screen(MONDO_LOGFILE, "");
     close_evalcall_form();
@@ -703 +678 @@
     }
     log_msg(3, "Parent res = %d", res);
-    paranoid_free(command);
-    paranoid_free(title);
     return (res);
 }
-
-
 
 
@@ -721 +692 @@
 // RESTORE
     int res = -1;
-    char *command;
+    char *command = NULL;
 
     if ( !find_home_of_exe("ntfsclone")) {
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --rescue --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(command, "ntfsclone --rescue --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }