Changeset 2327 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 18, 2009, 3:20:37 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3338@localhost: bruno | 2009-08-11 23:03:30 +0200
bkpinfo->zip_suffix, bkpinfo->image_devs and bkpinfo->restore_path are now allocated dynmically

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)

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

@@ -895 +895 @@
 mr_free(value);
 
-bkpinfo->zip_suffix[0] = '\0';
 value = read_cfg_var(cfg_file, "use-lzo");
 if (value && strstr(value, "yes")) {
@@ -902 +901 @@
     mr_free(bkpinfo->zip_exe);
     mr_asprintf(bkpinfo->zip_exe, "lzop");
-    strcpy(bkpinfo->zip_suffix, "lzo");
+    mr_free(bkpinfo->zip_suffix);
+    mr_asprintf(bkpinfo->zip_suffix, "lzo");
 }
 mr_free(value);
@@ -912 +912 @@
     mr_free(bkpinfo->zip_exe);
     mr_asprintf(bkpinfo->zip_exe, "gzip");
-    strcpy(bkpinfo->zip_suffix, "gz");
+    mr_free(bkpinfo->zip_suffix);
+    mr_asprintf(bkpinfo->zip_suffix, "gz");
 }
 mr_free(value);
@@ -922 +923 @@
     mr_free(bkpinfo->zip_exe);
     mr_asprintf(bkpinfo->zip_exe, "bzip2");
-    strcpy(bkpinfo->zip_suffix, "bz2");
+    mr_free(bkpinfo->zip_suffix);
+    mr_asprintf(bkpinfo->zip_suffix, "bz2");
 }
 mr_free(value);
+
+if (bkpinfo->zip_exe == NULL) {
+    mr_asprintf(bkpinfo->zip_exe, "none");
+}
+if (bkpinfo->zip_suffix == NULL) {
+    mr_asprintf(bkpinfo->zip_suffix, "");
+}
 
 value = read_cfg_var(cfg_file, "differential");