Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.c

Timestamp:

Aug 18, 2009, 2:37:39 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

File:

• branches/2.2.10/mondo/src/common/newt-specific.c (modified) (14 diffs)

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -294 +294 @@
      fatal_error(char *error_string) {
         /*@ buffers ***************************************************** */
-        char fatalstr[MAX_NEWT_COMMENT_LEN] =
-            "-------FATAL ERROR---------";
-        char *tmp;
-        char *command;
+        char *command = NULL;
         static bool already_exiting = FALSE;
 
         /*@ end vars **************************************************** */
 
-        malloc_string(command);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -311 +306 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
-            paranoid_free(tmp);
             finish(1);
         }
@@ -319 +313 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
-                paranoid_free(tmp);
                 finish(1);
             }
@@ -327 +320 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
-            paranoid_free(tmp);
             finish(1);
         }
@@ -338 +330 @@
         kill_anything_like_this("ntfsclone");
         sync();
-        /*
-        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
-        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
-            log_msg(2, "Waiting for child processes to terminate");
-            sleep(1);
-            run_program_and_log_output(tmp, 5);
-        }
-        */
 
         chdir("/");
         if (g_selfmounted_isodir) {
-            sprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            sprintf(command, "rmdir %s", g_selfmounted_isodir);
+            mr_free(command);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
+            mr_free(command);
         }
 
         if (!g_text_mode) {
-            log_msg(0, fatalstr);
+            log_msg(0, "-------FATAL ERROR---------");
             log_msg(0, error_string);
             newtFinished();
@@ -362 +348 @@
 
         printf("---FATALERROR--- %s\n", error_string);
-        printf
-                ("If you require technical support, please contact the mailing list.\n");
+        printf("If you require technical support, please contact the mailing list.\n");
         printf("See http://www.mondorescue.org for details.\n");
-        printf
-                ("The list's members can help you, if you attach that file to your e-mail.\n");
+        printf("The list's members can help you, if you attach that file to your e-mail.\n");
         printf("Log file: %s\n", MONDO_LOGFILE);
         printf("Mondo has aborted.\n");
@@ -372 +356 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
-        paranoid_free(tmp);
-        paranoid_free(command);
         finish(254);
     }
@@ -405 +387 @@
             mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
+
             mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
         }
         if (!g_text_mode) {
@@ -443 +426 @@
         mr_free(bkpinfo->exclude_paths);
         mr_free(bkpinfo->include_paths);
+        mr_free(bkpinfo->scratchdir);
 
         /* Then free the structure */
-        paranoid_free(bkpinfo);
+        mr_free(bkpinfo);
         free_libmondo_global_strings();
         free_newt_stuff();
@@ -947 +931 @@
         }
 
-        err_log_lines =
-            (char **) malloc(sizeof(char *) * g_noof_log_lines);
-        if (!err_log_lines) {
-            fatal_error("Out of memory");
-        }
+        err_log_lines = (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
 
         for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
-            if (!err_log_lines[i]) {
-                fatal_error("Out of memory");
-            }
+            err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN);
         }
 
@@ -1055 +1032 @@
         }
         if (!g_text_mode) {
-//      log_it("refreshing");
             newtRefresh();
         }
@@ -1080 +1056 @@
     void
      update_progress_form(char *blurb3) {
-        /*  log_it("update_progress_form --- called"); */
         if (g_current_progress == -999) {
-            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
             return;
         }
@@ -1194 +1168 @@
         }
     }
-
-
-
-
-
-
-
-
-
-
-
-
 
 
@@ -1280 +1242 @@
         }
         newtPushHelpLine(title_sz);
-        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
         b1 = newtButton(1, 1, "CD-R disks ");