Changeset 3194 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

File:

• branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (5 diffs)

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

@@ -639 +639 @@
 /** add mallocs **/
 char value[MAX_STR_LEN];
-char *tmp = NULL;
 char *tmp1 = NULL;
 char *envtmp1 = NULL;
@@ -936 +935 @@
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-            mr_strcpy(iso_mnt, call_program_and_get_last_line_of_output(command));
+            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
         } else {
-            mr_asprintf(iso_mnt, "/tmp/isodir");
+            sprintf(iso_mnt, "/tmp/isodir");
             mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
@@ -979 +978 @@
 }
 g_backup_media_type = bkpinfo->backup_media_type;
-paranoid_free(value);
-paranoid_free(iso_mnt);
-paranoid_free(iso_path);
 return (0);
 
@@ -2053 +2049 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_sprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(command,    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2103 +2099 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    mr _asprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
     mr_free(command);