Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 29, 2009, 7:19:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3145@localhost: bruno | 2009-06-29 17:18:58 +0200

• Remove 2 memory leaks and change the behavoir for function media_descriptor_string which now allocates the string it returns (which needs to be free by the caller)

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (21 diffs)

branches/2.2.9/mondo/src/common/libmondo-archive.c

@@ -1586 +1586 @@
     char *message_to_screen = NULL;
     char *old_pwd;
+    char *mds = NULL;
 
     malloc_string(old_pwd);
@@ -1597 +1598 @@
     (void)chdir(bkpinfo->scratchdir);
 
-    mr_asprintf(&message_to_screen, "Copying data to make %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    mr_asprintf(&message_to_screen, "Copying data to make %s #%d",mds, g_current_media_number);
+    mr_free(mds);
     log_msg(1, message_to_screen);
 
@@ -1689 +1690 @@
     char *tmp2;
     char *tmp3;
+    char *mds = NULL;
     bool cd_is_mountable;
 
@@ -1746 +1748 @@
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
-        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)", mds, g_current_media_number);
+        mr_free(mds);
 
         pause_and_ask_for_cdr(2, &cd_is_mountable); /* if g_current_media_number >= 2 then pause & ask */
@@ -1843 +1845 @@
         paranoid_free(message_to_screen);
     } else {
-        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d", mds, g_current_media_number);
         log_msg(1, message_to_screen);
-        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ", mds,  g_current_media_number);
+        mr_free(mds);
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
@@ -1925 +1925 @@
     if (bkpinfo->call_burn_iso[0] != '\0') {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
-        mr_asprintf(&message_to_screen, "Burning %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        mr_asprintf(&message_to_screen, "Burning %s #%d", mds, g_current_media_number);
+        mr_free(mds);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
         res =
@@ -1945 +1945 @@
 
     if (bkpinfo->call_after_iso[0] != '\0') {
-        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
+        mr_free(mds);
         res =
             eval_call_to_make_ISO(bkpinfo->call_after_iso,
@@ -2052 +2052 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    malloc_string(bigfile_fname);
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1;
@@ -2078 +2077 @@
         return (1);
     }
+
+    malloc_string(bigfile_fname);
     for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
          fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
@@ -2759 +2760 @@
     char *szserfname;
     char *szunmount;
+    char *mds = NULL;
 
     malloc_string(tmp);
@@ -2769 +2771 @@
     malloc_string(szunmount);
 
-    sprintf(szmsg, "I am about to burn %s #%d",
-            media_descriptor_string(g_backup_media_type),
-            g_current_media_number);
+    mds = media_descriptor_string(g_backup_media_type);
+    sprintf(szmsg, "I am about to burn %s #%d", mds, g_current_media_number);
+    mr_free(mds);
     log_to_screen(szmsg);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
@@ -2812 +2814 @@
         } else if (!does_file_exist(szcdno)
                    || !does_file_exist(szserfname)) {
+            mds = media_descriptor_string(g_backup_media_type);
             log_to_screen
-                ("%s has data on it but it's probably not a Mondo CD.",
-                 media_descriptor_string(g_backup_media_type));
+                ("%s has data on it but it's probably not a Mondo CD.", mds);
+            mr_free(mds);
         } else {
-            log_to_screen("%s found in drive. It's a Mondo disk.",
-                          media_descriptor_string(g_backup_media_type));
+            mds = media_descriptor_string(g_backup_media_type);
+            log_to_screen("%s found in drive. It's a Mondo disk.", mds);
+            mr_free(mds);
+
             cd_number = atoi(last_line_of_file(szcdno));
             sprintf(tmp, "cat %s 2> /dev/null", szserfname);
@@ -2830 +2835 @@
                 our_serial_str, g_serial_string);
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
-            log_msg(2, "This %s is part of this backup set!",
-                    media_descriptor_string(g_backup_media_type));
+            mds = media_descriptor_string(g_backup_media_type);
+            log_msg(2, "This %s is part of this backup set!", mds);
             ok_go_ahead_burn_it = FALSE;
             if (cd_number == g_current_media_number - 1) {
-                log_to_screen
-                    ("I think you've left the previous %s in the drive.",
-                     media_descriptor_string(g_backup_media_type));
+                log_to_screen("I think you've left the previous %s in the drive.", mds);
             } else {
-                log_to_screen
-                    ("Please remove this %s. It is part of the backup set you're making now.",
-                     media_descriptor_string(g_backup_media_type));
+                log_to_screen("Please remove this %s. It is part of the backup set you're making now.", mds);
             }
+            mr_free(mds);
+
         } else {
             log_to_screen("...but not part of _our_ backup set.");
@@ -2847 +2850 @@
         mr_free(our_serial_str);
     } else {
+        mds = media_descriptor_string(g_backup_media_type);
         log_msg(2,
-                "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
-                media_descriptor_string(g_backup_media_type));
+                "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
         if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE)) {
             ok_go_ahead_burn_it = FALSE;
-            log_to_screen("There isn't a writable %s in the drive.",
-                          media_descriptor_string(g_backup_media_type));
-        }
-    }
-
-/*
-  if (g_current_media_number > ask_for_one_if_more_than_this)
-    {
-      ok_go_ahead_burn_it = FALSE;
-      log_it("paafcd: %d > %d, so I'll definitely pause.", g_current_media_number > ask_for_one_if_more_than_this);
-    }
-*/
+            log_to_screen("There isn't a writable %s in the drive.", mds);
+        }
+        mr_free(mds);
+    }
 
     if (!ok_go_ahead_burn_it) {
         eject_device(cdrom_dev);
+        mds = media_descriptor_string(g_backup_media_type);
         sprintf(tmp,
-                "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
-                media_descriptor_string(g_backup_media_type),
-                g_current_media_number,
-                media_descriptor_string(g_backup_media_type));
+                "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
+                mds, g_current_media_number, mds);
+        mr_free(mds);
+
         popup_and_OK(tmp);
         goto gotos_make_me_puke;
@@ -2878 +2874 @@
     }
 
+    mds = media_descriptor_string(g_backup_media_type);
     log_msg(2,
-            "paafcd: OK, I assume I have a blank/reusable %s in the drive...",
-            media_descriptor_string(g_backup_media_type));
+            "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
     //  if (ask_for_one_if_more_than_this>1) { popup_and_OK(szmsg); }
 
-    log_to_screen("Proceeding w/ %s in drive.",
-                  media_descriptor_string(g_backup_media_type));
+    log_to_screen("Proceeding w/ %s in drive.", mds);
+    mr_free(mds);
+
     paranoid_free(tmp);
     paranoid_free(szmsg);
@@ -3369 +3366 @@
     char *lastcd_fname;
     char *isofile;
+    char *mds = NULL;
 
     /*@ bool ******************************************************** */
@@ -3388 +3386 @@
     }
 
-    log_msg(1, "OK, time to make %s #%d",
-            media_descriptor_string(bkpinfo->backup_media_type),
-            g_current_media_number);
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    log_msg(1, "OK, time to make %s #%d", mds, g_current_media_number);
+    mr_free(mds);
 
     /* label the ISO with its number */
@@ -3447 +3445 @@
         }
         if (bkpinfo->verify_data && !res) {
+            mds = media_descriptor_string(g_backup_media_type);
             log_to_screen
-                ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
-                 media_descriptor_string(g_backup_media_type));
+                ("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
+            mr_free(mds);
             chdir("/");
             log_it("Before calling verification of image()");
@@ -3462 +3461 @@
             that_one_was_ok = TRUE;
         } else {
-            sprintf(tmp, "Failed to create %s #%d. Retry?",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            sprintf(tmp, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            mr_free(mds);
             res = ask_me_yes_or_no(tmp);
             if (!res) {
@@ -3525 +3524 @@
     int res = 0, retval = 0, cdno = 0;
     char *tmp;
+    char *mds = NULL;
     long diffs = 0;
 
@@ -3564 +3564 @@
             retval += res;
             if (res) {
+                mds = media_descriptor_string(bkpinfo->backup_media_type);
                 sprintf(tmp,
-                        "Warnings/errors were reported while checking %s #%d",
-                        media_descriptor_string(bkpinfo->backup_media_type),
-                        g_current_media_number);
+                        "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                mr_free(mds);
                 log_to_screen(tmp);