Changeset 3830 in MondoRescue for branches/3.3/mondo/src/common/libmondo-verify.c

Timestamp:

Mar 4, 2024, 5:33:57 PM (3 months ago)

Author:

Bruno Cornec

Message:

manages zip_exe and zip_suffix dynamically

File:

• branches/3.3/mondo/src/common/libmondo-verify.c (modified) (4 diffs)

branches/3.3/mondo/src/common/libmondo-verify.c

@@ -281 +281 @@
         slice_num = last_slice_num + 1;
     }
-    while (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
-           ||
-           does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
+    while (does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))) {
         // handle slices until end of CD
         if (slice_num == 0) {
@@ -427 +425 @@
     if (strstr(tarball_fname, ".lzo") && strcmp(bkpinfo->zip_suffix, "lzo")) {
         log_msg(2, "OK, I'm going to start using lzop.");
-        strcpy(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        mr_free(bkpinfo->zip_exe);
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_exe, "%s", "lzop");
+        mr_asprintf(bkpinfo->zip_suffix, "%s", "lzo");
         bkpinfo->use_lzo = TRUE;
         bkpinfo->use_gzip = FALSE;
@@ -435 +435 @@
     if (strstr(tarball_fname, ".gz") && strcmp(bkpinfo->zip_suffix, "gz")) {
         log_msg(2, "OK, I'm going to start using gzip.");
-        strcpy(bkpinfo->zip_exe, "gzip");
-        strcpy(bkpinfo->zip_suffix, "gz");
+        mr_free(bkpinfo->zip_exe);
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_exe, "%s", "gzip");
+        mr_asprintf(bkpinfo->zip_suffix, "%s", "gz");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = TRUE;
@@ -443 +445 @@
     if (strstr(tarball_fname, ".bz2") && strcmp(bkpinfo->zip_suffix, "bz2")) {
         log_msg(2, "OK, I'm going to start using bzip2.");
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        mr_free(bkpinfo->zip_exe);
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_exe, "%s", "bzip2");
+        mr_asprintf(bkpinfo->zip_suffix, "%s", "bz2");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = FALSE;
         bkpinfo->use_lzma = FALSE;
     }
-    if (strstr(tarball_fname, ".lzma") && strcmp(bkpinfo->zip_suffix, "lzma")) {
+    if (strstr(tarball_fname, ".xz") && strcmp(bkpinfo->zip_suffix, "xz")) {
         log_msg(2, "OK, I'm going to start using lzma.");
-        strcpy(bkpinfo->zip_exe, "lzma");
-        strcpy(bkpinfo->zip_suffix, "lzma");
+        mr_free(bkpinfo->zip_exe);
+        mr_free(bkpinfo->zip_suffix);
+        mr_asprintf(bkpinfo->zip_exe, "%s", "xz");
+        mr_asprintf(bkpinfo->zip_suffix, "%s", "xz");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = FALSE;
         bkpinfo->use_lzma = TRUE;
     }
-    if (bkpinfo->zip_exe == NULL) {
-        strcpy(bkpinfo->zip_exe, "none");
-    }
+    // As suffix is used even when no compression make it non-NULL
     if (bkpinfo->zip_suffix == NULL) {
-        strcpy(bkpinfo->zip_suffix, "");
+        mr_asprintf(bkpinfo->zip_suffix, "%s", "");
     }
     unlink(outlog);