Changeset 3830 in MondoRescue for branches/3.3/mondo/src/mondorestore

Timestamp:

Mar 4, 2024, 5:33:57 PM (2 years ago)

Author:

Bruno Cornec

Message:

manages zip_exe and zip_suffix dynamically

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (4 diffs)
• mondorestore.c (modified) (2 diffs)

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

@@ -805 +805 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    strcpy(bkpinfo->zip_exe, "lzma");
-    strcpy(bkpinfo->zip_suffix, "lzma");
+    mr_asprintf(bkpinfo->zip_exe, "%s", "lzma");
+    mr_asprintf(bkpinfo->zip_suffix, "%s", "lzma");
 }
 
@@ -814 +814 @@
     bkpinfo->use_lzo = TRUE;
     bkpinfo->use_gzip = FALSE;
-    strcpy(bkpinfo->zip_exe, "lzop");
-    strcpy(bkpinfo->zip_suffix, "lzo");
+    mr_asprintf(bkpinfo->zip_exe, "%s", "lzop");
+    mr_asprintf(bkpinfo->zip_suffix, "%s", "lzo");
 }
 
@@ -823 +823 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = TRUE;
-    strcpy(bkpinfo->zip_exe, "gzip");
-    strcpy(bkpinfo->zip_suffix, "gz");
+    mr_asprintf(bkpinfo->zip_exe, "%s", "gzip");
+    mr_asprintf(bkpinfo->zip_suffix, "%s", "gz");
 }
 
@@ -832 +832 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    strcpy(bkpinfo->zip_exe, "bzip2");
-    strcpy(bkpinfo->zip_suffix, "bz2");
+    mr_asprintf(bkpinfo->zip_exe, "%s", "xz");
+    mr_asprintf(bkpinfo->zip_suffix, "%s", "xz");
 }
 

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -1154 +1154 @@
     }
 
-    if (!bkpinfo->zip_exe[0]) {
+    if (bkpinfo->zip_exe == NULL) {
         mr_asprintf(command, "cat > \"%s\"", file_to_openout);
     } else {
@@ -1215 +1215 @@
     paranoid_pclose(pout);
 
-    if (bkpinfo->zip_exe[0]) {
+    if (bkpinfo->zip_exe != NULL) {
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
             /* Re-enable SIGPIPE for gzip */