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

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

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

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

@@ -345 +345 @@
             log_msg(0, "-------FATAL ERROR---------");
             log_msg(0, error_string);
-            newtFinished();
         }
 
@@ -395 +394 @@
         }
         if (!g_text_mode) {
-            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                log_msg(1, "Calling newtFinished()");
-                newtFinished();
-            } else {
-                log_msg(1, "Calling newtSuspend()");
-                newtSuspend();
-            }
+            log_msg(1, "Calling newtFinished()");
+            newtFinished();
         }
         printf("Execution run ended; result=%d\n", signal);
@@ -444 +438 @@
 
         /*@ buffers ********************************************************** */
-        char *command;
-        char *tmp;
+        char *command = NULL;
+        char *tmp = NULL;
 
         /*@ pointers ********************************************************* */
@@ -453 +447 @@
         int i = 0;
 
-        malloc_string(command);
-        malloc_string(tmp);
         assert_string_is_neither_NULL_nor_zerolength(filename);
         assert(grep_for_me != NULL);
 
         if (!does_file_exist(filename)) {
-            paranoid_free(command);
-            paranoid_free(tmp);
             return;
         }
         if (grep_for_me[0] != '\0') {
-            sprintf(command, "grep '%s' %s | tail -n%d",
-                    grep_for_me, filename, g_noof_log_lines);
-        } else {
-            sprintf(command, "tail -n%d %s", g_noof_log_lines,
-                    filename);
+            mr_asprintf(command, "grep '%s' %s | tail -n%d", grep_for_me, filename, g_noof_log_lines);
+        } else {
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines, filename);
         }
         fin = popen(command, "r");
@@ -483 +471 @@
                     */
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        strcpy(tmp, err_log_lines[i] + 6);
+                        mr_asprintf(tmp, "%s", err_log_lines[i] + 6);
                         strcpy(err_log_lines[i], tmp);
+                        mr_free(tmp);
                     }
                     if (feof(fin)) {
@@ -493 +482 @@
             paranoid_pclose(fin);
         }
+        mr_free(command);
         refresh_log_screen();
-        paranoid_free(command);
-        paranoid_free(tmp);
     }
 
@@ -584 +572 @@
 
         /*@ buffers ********************************************************* */
-        char *title;
-        char *tmp;
+        char *title = NULL;
+        char *tmp = NULL;
 
         /*@ initialize ****************************************************** */
         g_isoform_old_progress = -1;
         g_mysterious_dot_counter = 0;
-        malloc_string(title);
+
+        assert(ttl != NULL);
         malloc_string(tmp);
-
-        assert(ttl != NULL);
-        strcpy(title, ttl);
+        mr_asprintf(title, "%s", ttl);
         strcpy(g_isoform_header_str, title);
         if (g_text_mode) {
@@ -620 +607 @@
         }
         update_evalcall_form(0);
+        mr_free(title);
         paranoid_free(tmp);
-        paranoid_free(title);
     }
 
@@ -641 +628 @@
         /*@ buffers ********************************************************* */
         char *b1c;
-        char *blurb1;
-        char *blurb2;
-        char *blurb3;
+        char *blurb1 = NULL;
+        char *blurb2 = NULL;
+        char *blurb3 = NULL;
 
         /*@ initialize ****************************************************** */
         g_mysterious_dot_counter = 0;
 
-        malloc_string(b1c);
         malloc_string(blurb1);
         malloc_string(blurb2);
         malloc_string(blurb3);
+        malloc_string(b1c);
 
         assert(title != NULL);
@@ -658 +645 @@
         assert(b3 != NULL);
 
-        strcpy(blurb1, b1);
-        strcpy(blurb2, b2);
-        strcpy(blurb3, b3);
+        strcpy(blurb1,  b1);
+        strcpy(blurb2,  b2);
+        strcpy(blurb3,  b3);
         strcpy(b1c, b1);
         center_string(b1c, 80);
@@ -695 +682 @@
         update_progress_form_full(blurb1, blurb2, blurb3);
         paranoid_free(b1c);
-        paranoid_free(blurb1);
-        paranoid_free(blurb2);
-        paranoid_free(blurb3);
+        mr_free(blurb1);
+        mr_free(blurb2);
+        mr_free(blurb3);
     }
 
@@ -1176 +1163 @@
 
         /*@ newt ************************************************************ */
-        char *title_sz;
-        char *minimsg_sz;
+        char *title_sz = NULL;
+        char *minimsg_sz = NULL;
         static t_bkptype possible_bkptypes[] =
             { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
@@ -1198 +1185 @@
         newtComponent myForm;
 
-        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
-        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
         outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
@@ -1217 +1202 @@
                 }
             }
-            paranoid_free(title_sz);
-            paranoid_free(minimsg_sz);
             paranoid_free(outstr);
             return (backup_type);
@@ -1224 +1207 @@
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            strcpy(title_sz,
-                   "Please choose the backup media from which you want to read data.");
-            strcpy(minimsg_sz, "Read from:");
-        } else {
-            strcpy(title_sz,
-                   "Please choose the backup media to which you want to archive data.");
-            strcpy(minimsg_sz, "Backup to:");
+            mr_asprintf(title_sz, "Please choose the backup media from which you want to read data.");
+            mr_asprintf(minimsg_sz, "Read from:");
+        } else {
+            mr_asprintf(title_sz, "Please choose the backup media to which you want to archive data.");
+            mr_asprintf(minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
@@ -1266 +1247 @@
         }
         newtPopHelpLine();
-        paranoid_free(title_sz);
-        paranoid_free(minimsg_sz);
+        mr_free(title_sz);
+        mr_free(minimsg_sz);
         paranoid_free(outstr);
         return (output);