Changeset 2326 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Aug 18, 2009, 3:19:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3337@localhost: bruno | 2009-08-11 20:02:18 +0200
bkpinfo->boot_device and bkpinfo->zip_exe are now dynamically allocated

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

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

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

@@ -895 +895 @@
 mr_free(value);
 
-bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+bkpinfo->zip_suffix[0] = '\0';
 value = read_cfg_var(cfg_file, "use-lzo");
 if (value && strstr(value, "yes")) {
     bkpinfo->use_lzo = TRUE;
     bkpinfo->use_gzip = FALSE;
-    strcpy(bkpinfo->zip_exe, "lzop");
+    mr_free(bkpinfo->zip_exe);
+    mr_asprintf(bkpinfo->zip_exe, "lzop");
     strcpy(bkpinfo->zip_suffix, "lzo");
 }
@@ -909 +910 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = TRUE;
-    strcpy(bkpinfo->zip_exe, "gzip");
+    mr_free(bkpinfo->zip_exe);
+    mr_asprintf(bkpinfo->zip_exe, "gzip");
     strcpy(bkpinfo->zip_suffix, "gz");
 }
@@ -918 +920 @@
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;
-    strcpy(bkpinfo->zip_exe, "bzip2");
+    mr_free(bkpinfo->zip_exe);
+    mr_asprintf(bkpinfo->zip_exe, "bzip2");
     strcpy(bkpinfo->zip_suffix, "bz2");
 }

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -1488 +1488 @@
     }
 
-    if (!bkpinfo->zip_exe[0]) {
+    if (bkpinfo->zip_exe == NULL) {
         mr_asprintf(command, "cat > \"%s\"", file_to_openout);
     } else {
@@ -1549 +1549 @@
     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 */