Changeset 2327 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-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/common/libmondo-tools.c (modified) (5 diffs)

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -479 +479 @@
     if (bkpinfo->use_lzo) {
         mr_asprintf(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        mr_asprintf(bkpinfo->zip_suffix, "lzo");
     } else if (bkpinfo->use_gzip) {
         mr_asprintf(bkpinfo->zip_exe, "gzip");
-        strcpy(bkpinfo->zip_suffix, "gz");
+        mr_asprintf(bkpinfo->zip_suffix, "gz");
     } else if (bkpinfo->compression_level != 0) {
         mr_asprintf(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        mr_asprintf(bkpinfo->zip_suffix, "bz2");
+    } else {
+        mr_asprintf(bkpinfo->zip_exe, "none");
+        mr_asprintf(bkpinfo->zip_suffix, "");
     }
 
@@ -798 +801 @@
     mr_free(bkpinfo->boot_device);
     mr_free(bkpinfo->zip_exe);
+    mr_free(bkpinfo->zip_suffix);
+    mr_free(bkpinfo->image_devs);
     mr_free(bkpinfo->isodir);
     mr_free(bkpinfo->prefix);
@@ -804 +809 @@
     mr_free(bkpinfo->include_paths);
     mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->restore_path);
     mr_free(bkpinfo->nfs_mount);
     mr_free(bkpinfo->nfs_remote_dir);
@@ -829 +835 @@
     bkpinfo->boot_device = NULL;
     bkpinfo->zip_exe = NULL;
-    bkpinfo->zip_suffix[0] = '\0';
-    bkpinfo->image_devs[0] = '\0';
+    bkpinfo->zip_suffix = NULL;
+    bkpinfo->image_devs = NULL;
     bkpinfo->compression_level = 3;
     bkpinfo->use_lzo = FALSE;
@@ -853 +859 @@
     bkpinfo->include_paths = NULL;
     bkpinfo->exclude_paths = NULL;
-    bkpinfo->restore_path[0] = '\0';
+    bkpinfo->restore_path = NULL;
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';