Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/mondoarchive

Timestamp:

Jun 29, 2009, 7:19:14 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3144@localhost: bruno | 2009-06-26 12:18:08 +0200

• Remove mr_string.c|.h useless and in de=uplication with mr_str.c|.h
• Solve with valgrind's help some memroy leak (harmless mostly)
• Solve a seg fault at end, when unallocating a bkpinfo member after the strcuture disallocation !
• after mr_strtok, memory ssociated with the token needs to be free
• Adds a new function free_newt_stuff to free newt related allocated memory
• Do not exit if mr_free is unsuccessful, and only warn when debug > 8

File:

• branches/2.2.9/mondo/src/mondoarchive/mondoarchive.c (modified) (13 diffs)

branches/2.2.9/mondo/src/mondoarchive/mondoarchive.c

@@ -76 +76 @@
     tmp = get_uname_m();
     log_msg(0, "running on %s architecture", tmp);
-    free(tmp);
+    mr_free(tmp);
     log_msg(0,
             "-----------------------------------------------------------");
@@ -138 +138 @@
 void distro_specific_kludges_at_end_of_mondoarchive(void)
 {
-//  char tmp[500];
     log_msg(2, "Restarting magicdev if necessary");
     sync();
@@ -166 +165 @@
 int main(int argc, char *argv[])
 {
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
     int res, retval;
@@ -196 +195 @@
     retval = 0;
     diffs = 0;
-    malloc_string(tmp);
     malloc_libmondo_global_strings();
 
@@ -244 +242 @@
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -254 +251 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
         printf("in=%s; out=%s\n", argv[2], tmp);
+        paranoid_free(tmp);
         finish(1);
     }
@@ -273 +272 @@
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -283 +281 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         if (find_cdrw_device(tmp)) {
             printf("Failed to find CDR-RW drive\n");
@@ -294 +293 @@
             printf("CD-ROM is at %s\n", tmp);
         }
+        paranoid_free(tmp);
         finish(0);
     }
@@ -301 +301 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
+        malloc_string(tmp);
         if (find_dvd_device(tmp, atoi(argv[2]))) {
             printf("Failed to find DVD drive\n");
@@ -306 +307 @@
             printf("DVD is at %s\n", tmp);
         }
+        paranoid_free(tmp);
         finish(0);
     }
@@ -373 +375 @@
         res = verify_data();
         if (res < 0) {
-            sprintf(tmp, "%d difference%c found.", -res,
+            mr_asprintf(&tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
             mr_asprintf(&say_at_end, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
             res = 0;
         }
@@ -412 +415 @@
         paranoid_free(say_at_end);
     }
-    sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
+    mr_free(tmp);
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
-        sprintf(tmp, "umount %s1", bkpinfo->media_device);
+        mr_asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);
+        mr_free(tmp);
     }