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

Timestamp:

Feb 8, 2007, 3:08:10 AM (13 years ago)

Author:

Bruno Cornec

Message:

Memory management improvements again for libmondo-fork.c & libmondo-files.c

File:

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

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

@@ -1 @@
-/* libmondo-fork.c
-   $Id$
-*/
-
-
+/* libmondo-fork.c - subroutines for handling forking/pthreads/etc.
+ * $Id$
+ */
 #include "my-stuff.h"
 #include "mr_mem.h"
@@ -9 +7 @@
 #include "libmondo-fork.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -96 +94 @@
 
     /*@ buffers      *** */
-    char *midway_call, *ultimate_call, *tmp, *command, *incoming,
-        *old_stderr, *cd_number_str;
-    char *p;
+    char *midway_call, *ultimate_call, *tmp;
+    char *p = NULL; 
+    char *cd_number_str = NULL;
+    char *command = NULL;
+    
 
 /*@***********   End Variables ***************************************/
@@ -107 +107 @@
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
+
     midway_call = mr_malloc(1200);
     ultimate_call = mr_malloc(1200);
     tmp = mr_malloc(1200);
-    command = mr_malloc(1200);
-    malloc_string(incoming);
-    malloc_string(old_stderr);
-    malloc_string(cd_number_str);
-
-    incoming[0] = '\0';
-    old_stderr[0] = '\0';
-
-    sprintf(cd_number_str, "%d", cd_no);
+
+    mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
+    mr_free(cd_number_str);
+
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
     mr_msg(4, "basic call = '%s'", basic_call);
@@ -126 +122 @@
     mr_msg(4, "tmp = '%s'", tmp);
     mr_msg(4, "ultimate call = '%s'", ultimate_call);
-    sprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
 
     log_to_screen
-        ("Please be patient. Do not be alarmed by on-screen inactivity.");
+        (_("Please be patient. Do not be alarmed by on-screen inactivity."));
     mr_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
-    strcpy(tmp, command);
     if (bkpinfo->manual_cd_tray) {
-        p = strstr(tmp, "2>>");
+        /* Find everything after a 2>> and remove it */
+        p = strstr(command, "2>>");
         if (p) {
-            sprintf(p, "   ");
-            while (*p == ' ') {
-                p++;
-            }
-            for (; *p != ' '; p++) {
+            for (; *p != ' ' && *p != '\0'; p++) {
                 *p = ' ';
             }
         }
-        strcpy(command, tmp);
 #ifndef _XWIN
         if (!g_text_mode) {
@@ -157 +148 @@
         if (retval) {
             mr_msg(2, "Basic call '%s' returned an error.", basic_call);
-            popup_and_OK("Press ENTER to continue.");
+            popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK
-                ("mkisofs and/or cdrecord returned an error. CD was not created");
+                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
         }
     }
@@ -170 +161 @@
             (what_i_am_doing, command);
     }
+    mr_free(command);
 
     mr_free(midway_call);
     mr_free(ultimate_call);
     mr_free(tmp);
-    mr_free(command);
-    mr_free(incoming);
-    mr_free(old_stderr);
-    mr_free(cd_number_str);
-/*
-  if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
-    {
-      mr_msg(3, "Ejecting DVD device");
-      eject_device(bkpinfo->media_device);
-    }
-*/
     return (retval);
 }
-
-
 
 
@@ -200 +179 @@
 {
     /*@ buffer ****************************************************** */
-    char callstr[MAX_STR_LEN * 2];
-    char incoming[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN * 2];
-    char initial_label[MAX_STR_LEN * 2];
+    char *callstr = NULL;
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */
-    int res;
+    int res = 0;
+    size_t n = 0;
     int i;
     int len;
@@ -223 +201 @@
         return (1);
     }
-//  if (debug_level == TRUE) { debug_level=5; }
-
-    //  assert_string_is_neither_NULL_nor_zerolength(program);
 
     if (debug_level <= g_loglevel) {
@@ -231 +206 @@
         log_if_failure = TRUE;
     }
-    sprintf(callstr,
+    mr_asprintf(&callstr,
             "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
             program);
@@ -260 +235 @@
                 "--------------------------------start of output-----------------------------");
     }
+    mr_free(callstr);
+
     if (log_if_failure
         &&
@@ -270 +247 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin);
+             mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;
@@ -287 +264 @@
             }
         }
+        mr_free(incoming);
         paranoid_fclose(fin);
     }
@@ -303 +281 @@
     return (res);
 }
-
 
 
@@ -325 +302 @@
 
     /*@ buffers **************************************************** */
-    char tmp[MAX_STR_LEN * 2];
-    char command[MAX_STR_LEN * 2];
-    char lockfile[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *command = NULL;
+    char *lockfile = NULL;
 
     /*@ end vars *************************************************** */
@@ -333 +310 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    sprintf(lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
+    mr_asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
     mkstemp(lockfile);
-    sprintf(command,
+    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);
-    sprintf(tmp, "Executing %s", basic_call);
+    mr_asprintf(&tmp, "Executing %s", basic_call);
     mr_msg(2, tmp);
+    mr_free(tmp);
+
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        sprintf(tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(&tmp, _("Failed utterly to call '%s'"), command);
         log_to_screen(tmp);
+        mr_free(tmp);
+        mr_free(lockfile);
+        mr_free(command);
         return (1);
     }
+    mr_free(command);
+
     if (!does_file_exist(lockfile)) {
-        log_to_screen("Waiting for external binary to start");
+        log_to_screen(_("Waiting for external binary to start"));
         for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
             mr_msg(3, "Waiting for lockfile %s to exist", lockfile);
@@ -375 +359 @@
     res = pclose(fin);
     /* Log actual pclose errors. */
-    if (errno) mr_msg(5, "pclose err: %d", errno);
+    if (errno) {
+        mr_msg(5, "pclose err: %d", errno);
+    }
     /* Check if we have a valid status. If we do, extract the called program's exit code. */
     /* If we don't, highlight this fact by returning -1. */
@@ -385 +371 @@
     close_evalcall_form();
     unlink(lockfile);
+    mr_free(lockfile);
+
     return (retval);
 }
 
 
-
-
 /**
- * Apparently unused. @bug This has a purpose, but what?
+ * Apparently used. @bug This has a purpose, but what?
  */
 #define PIMP_START_SZ "STARTSTARTSTART9ff3kff9a82gv34r7fghbkaBBC2T231hc81h42vws8"
@@ -404 +390 @@
 // if dir=='w' then copy from orig to archived
 // if dir=='r' then copy from archived to orig
-    char *tmp;
-    char *buf;
+    char *tmp = NULL;
+    char *buf = NULL;
     long int bytes_to_be_read, bytes_read_in, bytes_written_out =
         0, bufcap, subsliceno = 0;
     int retval = 0;
-    FILE *fin;
-    FILE *fout;
-    FILE *ftmp;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
+    FILE *ftmp = NULL;
 
     mr_msg(5, "Opening.");
@@ -526 +512 @@
 }
 
-
-
-
 /**
  * Feed @p input_device through ntfsclone to @p output_fname.
@@ -539 +522 @@
 // BACKUP
     int res = -1;
-    char*command;
+    char *command = NULL;
 
     if (!does_file_exist(input_device)) {
@@ -547 +530 @@
         fatal_error("ntfsclone not found");
     }
-    malloc_string(command);
-    sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
     mr_free(command);
+
     unlink(output_fname);
     return (res);
@@ -556 +539 @@
 
 
-
-
-
 int run_external_binary_with_percentage_indicator_OLD(char *tt, char *cmd)
 {
 
-    /*@ int *************************************************************** */
     int res = 0;
     int percentage = 0;
@@ -569 +548 @@
     int last_pcno = 0;
 
-    /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *tempfile;
     char *title;
@@ -577 +555 @@
 
     malloc_string(title);
-    malloc_string(command);
     malloc_string(tempfile);
     assert_string_is_neither_NULL_nor_zerolength(cmd);
@@ -586 +563 @@
            call_program_and_get_last_line_of_output
            ("mktemp -q /tmp/mondo.XXXXXXXX"));
-    sprintf(command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
     mr_msg(3, command);
@@ -592 +569 @@
     if (!(pin = popen(command, "r"))) {
         log_OS_error("fmt err");
+        mr_free(command);
         return (1);
     }
+    mr_free(command);
+
     maxpc = 100;
 // OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD OLD
@@ -618 +598 @@
     }
     unlink(tempfile);
-    mr_free(command);
     mr_free(tempfile);
     mr_free(title);
     return (res);
 }
-
-
 
 
@@ -643 +620 @@
     pthread_exit((void *) (&res));
 }
-
-
 
 
@@ -659 +634 @@
 
     /*@ buffers *********************************************************** */
-    char *command;
+    char *command = NULL;
     char *title;
     /*@ pointers ********************************************************** */
@@ -672 +647 @@
 
     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);
     mr_msg(3, "command = '%s'", command);
     if ((res =
@@ -703 +677 @@
         update_evalcall_form(percentage);
     }
+    mr_free(command);
+
     log_file_end_to_screen(MONDO_LOGFILE, "");
     close_evalcall_form();
@@ -712 +688 @@
     }
     mr_msg(3, "Parent res = %d", res);
-    mr_free(command);
     mr_free(title);
     return (res);
 }
-
-
 
 
@@ -730 +703 @@
 // 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 --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
     mr_free(command);