Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (25 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -206 +206 @@
 {
 
-/** needs malloc **/
 char *command = NULL;
-char *file;
-char *tmp;
+char *file = NULL;
+char *tmp = NULL;
 int res;
 
-malloc_string(file);
-malloc_string(tmp);
 assert_string_is_neither_NULL_nor_zerolength(f);
 assert_string_is_neither_NULL_nor_zerolength(list_fname);
@@ -219 +216 @@
 
 if (strncmp(preamble, f, strlen(preamble)) == 0) {
-    strcpy(file, f + strlen(preamble));
+    mr_asprintf(file, "%s", f + strlen(preamble));
 } else {
-    strcpy(file, f);
+    mr_asprintf(file, "%s", f);
 }
 if (file[0] == '/' && file[1] == '/') {
-    strcpy(tmp, file);
-    strcpy(file, tmp + 1);
+    mr_asprintf(tmp, "%s", file);
+    mr_free(file);
+
+    mr_asprintf(file, "%s", tmp + 1);
+    mr_free(tmp);
 }
 log_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
 mr_asprintf(command, "grep -E '^%s$' %s", file, list_fname);
+mr_free(file);
+
 res = run_program_and_log_output(command, FALSE);
 mr_free(command);
-paranoid_free(file);
-mr_free(tmp);
 if (res) {
     return (FALSE);
@@ -429 +429 @@
     }
     if (res) {
-        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
-                format, mountdir);
+        log_msg(1, "Unable to mount device %s (type %s) at %s", device, format, mountdir);
         log_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
@@ -479 +478 @@
 char *tmp = NULL;
 char *these_failed = NULL;
-char *format;
 struct mountlist_itself *mountlist = NULL;
-
-malloc_string(format);
 
 assert(p_external_copy_of_mountlist != NULL);
@@ -511 +507 @@
             update_progress_form(tmp);
             mr_free(tmp);
-            strcpy(format, mountlist->el[lino].format);
-            res = mount_device(mountlist->el[lino].device,
-                       mountlist->el[lino].mountpoint,
-                       format, writeable);
+            res = mount_device(mountlist->el[lino].device, mountlist->el[lino].mountpoint, mountlist->el[lino].format, writeable);
+
             retval += res;
             if (res) {
@@ -556 +550 @@
     run_program_and_log_output("df -m", 3);
     paranoid_free(mountlist);
-    paranoid_free(format);
     return (retval);
 }
@@ -728 +721 @@
 char *iso_path = NULL;
 char *old_isodir = NULL;
-char cfg_file[100];
+char *cfg_file = NULL;
 t_bkptype media_specified_by_user;
 
@@ -736 +729 @@
 
 if (!cfgf) {
-    strcpy(cfg_file, g_mondo_cfg_file);
+    cfg_file = g_mondo_cfg_file;
 } else {
-    strcpy(cfg_file, cfgf);
+    cfg_file = cfgf;
 }
 
@@ -1495 +1488 @@
     char *conffile;
     char *tmp = NULL;
-    char *editor;
+    char *editor = NULL;
     char *p = NULL;
 
@@ -1501 +1494 @@
     bool done;
 
-    malloc_string(editor);
     malloc_string(rootdev);
     malloc_string(rootdrive);
     malloc_string(conffile);
     assert_string_is_neither_NULL_nor_zerolength(bd);
-    strcpy(editor, find_my_editor());
     mr_asprintf(boot_device, "%s", bd);
 
@@ -1544 +1535 @@
                 newtSuspend();
             }
+            mr_asprintf(editor, "%s", find_my_editor());
+
             mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
@@ -1559 +1552 @@
             paranoid_system(tmp);
             mr_free(tmp);
+            mr_free(editor);
 
             if (!g_text_mode) {
@@ -1611 +1605 @@
     paranoid_free(rootdrive);
     paranoid_free(conffile);
-    paranoid_free(editor);
 
     return (res);
@@ -1631 +1624 @@
     char *command = NULL;
     char *tmp = NULL;
-    char *editor;
+    char *editor = NULL;
 
     int res;
     int done;
 
-    malloc_string(editor);
-    strcpy(editor, find_my_editor());
     if (offer_to_run_stabelilo
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
@@ -1657 +1648 @@
                     newtSuspend();
                 }
+                mr_asprintf(editor, "%s", find_my_editor());
+
                 mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
@@ -1664 +1657 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
+
+                mr_free(editor);
 
                 if (!g_text_mode) {
@@ -1682 +1677 @@
         res = TRUE;
     }
-    paranoid_free(editor);
     return (res);
 }
@@ -1701 +1695 @@
     char *command = NULL;
     char *tmp = NULL;
-    char *editor;
+    char *editor = NULL;
 
     int res;
     int done;
     bool run_lilo_M = FALSE;
-    malloc_string(editor);
 
     if (!run_program_and_log_output
@@ -1713 +1706 @@
     }
 
-    strcpy(editor, find_my_editor());
     if (offer_to_run_stablilo
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
@@ -1733 +1725 @@
                     newtSuspend();
                 }
+                mr_asprintf(editor, "%s", find_my_editor());
+
                 mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
@@ -1740 +1734 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
+
+                mr_free(editor);
 
                 if (!g_text_mode) {
@@ -1795 +1791 @@
                                    " lilo -M /dev/sda", 3);
     }
-    paranoid_free(editor);
     return (res);
 }
@@ -1821 +1816 @@
     int done;
 
-    malloc_string(editor);
     assert_string_is_neither_NULL_nor_zerolength(bd);
 
-    strcpy(editor, find_my_editor());
     mr_asprintf(boot_device, "%s", bd);
 
@@ -1838 +1831 @@
                     newtSuspend();
                 }
+                mr_asprintf(editor, "%s", find_my_editor());
                 mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_free(editor);
+
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1884 +1880 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(editor);
     return (res);
 }