Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondorestore.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/mondorestore/mondorestore.c (modified) (16 diffs)

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -1075 +1075 @@
     char *bigblk;
     char *p;
+    char *mds = NULL;
     int retval = 0;
     int finished = FALSE;
@@ -1242 +1243 @@
                     g_current_media_number);
             g_current_media_number++;
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
             sprintf(tmp,
-                    "Asking for %s #%d so that I may read slice #%ld\n",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    "Asking for %s #%d so that I may read slice #%ld\n", mds, 
                     g_current_media_number, sliceno);
             log_msg(2, tmp);
-            sprintf(tmp, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            sprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
+            mr_free(mds);
+
             log_to_screen(tmp);
             insist_on_this_cd_number(g_current_media_number);
@@ -1301 +1302 @@
                                     suffix), MONDO_LOGFILE);
             }
-            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
                     g_current_media_number, bigfileno + 1, sliceno);
+            mr_free(mds);
             log_msg(2, tmp);
 
@@ -1912 +1914 @@
   /** malloc add ***/
     char *tmp;
+    char *mds = NULL;
     char *command;
     char *afio_fname;
@@ -1932 +1935 @@
     /* to do it with a file... */
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
     sprintf(tmp,
             "Restoring from fileset #%ld (%ld KB) on %s #%d",
-            current_tarball_number, (long) size >> 10,
-            media_descriptor_string(bkpinfo->backup_media_type),
-            g_current_media_number);
+            current_tarball_number, (long) size >> 10, mds, g_current_media_number);
+    mr_free(mds);
+
     log_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
@@ -2101 +2105 @@
   /** malloc **/
     char *tmp;
+    char *mds = NULL;
     bool just_changed_cds = FALSE;
     char *xattr_fname;
@@ -2149 +2154 @@
             log_msg(3,
                     "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
             log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
-                    bigfileno + 1,
-                    media_descriptor_string(bkpinfo->backup_media_type),
+                    bigfileno + 1, mds,
                     g_current_media_number);
             log_msg(3, "Slicename would have been %s",
@@ -2162 +2167 @@
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                sprintf(tmp, "Restoring from %s #%d",
-                        media_descriptor_string(bkpinfo->backup_media_type),
+                sprintf(tmp, "Restoring from %s #%d", mds,
                         g_current_media_number);
                 log_to_screen(tmp);
@@ -2176 +2180 @@
                 bigfileno++;
             }
+            mr_free(mds);
         } else {
             just_changed_cds = FALSE;
@@ -2251 +2256 @@
   /**malloc ***/
     char *tmp = NULL;
+    char *mds = NULL;
     char *tmp1 = NULL;
     char *tarball_fname;
@@ -2275 +2281 @@
     paranoid_free(tmp);
 
-    sprintf(progress_str, "Restoring from %s #%d",
-            media_descriptor_string(bkpinfo->backup_media_type),
-            g_current_media_number);
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    sprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+
     log_to_screen(progress_str);
     open_progress_form("Restoring from archives",
@@ -2327 +2333 @@
         } else {
             sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number,
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+                    current_tarball_number, mds, g_current_media_number);
 //    log_msg(3, "progress_str = %s", progress_str);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
@@ -2339 +2343 @@
             }
             mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number, current_tarball_number);
+                    mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2362 +2365 @@
         }
     }
+    mr_free(mds);
+
     close_progress_form();
     if (retval) {
@@ -2576 +2581 @@
   /** malloc **/
     char *tmp;
+    char *mds = NULL;
     char *progress_str;
     char *tmp_fname;
@@ -2661 +2667 @@
         current_afioball_number++;
         g_current_progress++;
+        mds = media_descriptor_string(bkpinfo->backup_media_type),
         sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                current_afioball_number,
-                media_descriptor_string(bkpinfo->backup_media_type),
+                current_afioball_number, mds,
                 g_current_media_number);
+        mr_free(mds);
         res =
             read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);