Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/mondorestore/mondorestore.c (modified) (19 diffs)

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

@@ -2 +2 @@
 $Id$
 restores mondoarchive data
+The main file for mondorestore.
 ***************************************************************************/
-
-/**
- * @file
- * The main file for mondorestore.
- */
 
 /**************************************************************************
@@ -14 +10 @@
 #include <pthread.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -364 +361 @@
 
     /* Clean up blkid cache file if they exist */
-    asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
-    asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
@@ -379 +376 @@
 
     /* Clean up multiconf cache file if they exist */
-    asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
+    mr_asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
 
     /* Edit multipath.conf if needed to adapt wwid */
-    asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
+    mr_asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
     if (does_file_exist(tmp1)) {
         log_msg(2, "We may need to clean /etc/multipath.conf");
@@ -394 +391 @@
 
     if (bkpinfo->restore_mode != nuke) {
-        asprintf(&editor, "%s", find_my_editor());
-        asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+        mr_asprintf(&editor, "%s", find_my_editor());
+        mr_asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
         popup_and_OK("You will now edit multipath.conf");
         if (!g_text_mode) {
@@ -788 +785 @@
     assert(raidlist != NULL);
 
-    asprintf(&tmpA, "%s", "xxxxxxxxx");
-    asprintf(&tmpB, "%s", "xxxxxxxxx");
-    asprintf(&tmpC, "%s", "xxxxxxxxx");
+    mr_asprintf(&tmpA, "%s", "         ");
+    mr_asprintf(&tmpB, "%s", "         ");
+    mr_asprintf(&tmpC, "%s", "         ");
 
     log_msg(2, "nuke_mode --- starting");
@@ -1671 +1668 @@
 
   /** malloc **/
-    char *command;
+    char *command = NULL;
     char *tmp;
     char *filelist_name;
@@ -1685 +1682 @@
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(command);
     malloc_string(tmp);
     malloc_string(filelist_name);
@@ -1698 +1694 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-    sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
+    paranoid_free(command);
+
     sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
             (int) (random() % 32768));
@@ -1783 +1781 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            sprintf(command,
+            mr_asprintf(&command,
                     "star -x -force-remove -U " STAR_ACL_SZ
                     " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
-                strcat(command, " -bz");
+                mr_strcat(command, " -bz");
             }
         } else {
             if (filelist_subset_fname[0] != '\0') {
-                sprintf(command,
+                mr_asprintf(&command,
                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
                         TAPE_BLOCK_SIZE,
@@ -1798 +1796 @@
                         tarball_fname);
             } else {
-                sprintf(command,
+                mr_asprintf(&command,
                         "afio -i -b %ld -c %ld -M 8m %s %s",
                         TAPE_BLOCK_SIZE,
@@ -1804 +1802 @@
             }
         }
+
 #undef BUFSIZE
-        sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
-                temp_log);
+        mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
         log_msg(1, "command = '%s'", command);
         unlink(temp_log);
@@ -1818 +1816 @@
             }
         }
+        paranoid_free(command);
+
         if (res && length_of_file(temp_log) < 5) {
             res = 0;
@@ -1849 +1849 @@
         }
         if (retval) {
-            sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
+            paranoid_free(command);
+
             log_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
@@ -1867 +1869 @@
 
   leave_sub:
-    paranoid_free(command);
     paranoid_free(tmp);
     paranoid_free(filelist_name);
@@ -2249 +2250 @@
     long max_val;
   /**malloc ***/
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *tarball_fname;
     char *progress_str;
@@ -2271 +2273 @@
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
+    paranoid_free(tmp);
+
     sprintf(progress_str, "Restoring from %s #%d",
             media_descriptor_string(bkpinfo->backup_media_type),
@@ -2334 +2338 @@
                                               filelist);
             }
-            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, current_tarball_number);
             if (res) {
-                strcat(tmp, "reported errors");
+                mr_strcat(tmp1, "reported errors");
             } else if (attempts > 1) {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp1, "succeeded");
             } else {
-                strcat(tmp, "succeeded");
+                mr_strcat(tmp1, "succeeded");
             }
             if (attempts > 1) {
-                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
-                        attempts);
-            }
-            strcpy(comment, tmp);
+                mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
+            }
+            strcpy(comment, tmp1);
+            paranoid_free(tmp1);
             if (attempts > 1) {
                 log_to_screen(comment);
@@ -2364 +2368 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tmp);
     paranoid_free(tarball_fname);
     paranoid_free(progress_str);