Changeset 2326 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-verify.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

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

@@ -204 +204 @@
  * - @c restore_path
  * - @c use_lzo
- * - @c zip_exe
  * - @c zip_suffix
  * @param mtpt The mountpoint the CD/DVD/ISO is mounted on.
@@ -432 +431 @@
     mr_asprintf(outlog, "%s/afio.log", bkpinfo->tmpdir);
     /* if programmer forgot to say which compression thingy to use then find out */
-    if (strstr(tarball_fname, ".lzo")
-        && strcmp(bkpinfo->zip_suffix, "lzo")) {
+    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");
+        mr_free(bkpinfo->zip_exe);
+        mr_asprintf(bkpinfo->zip_exe, "lzop");
         strcpy(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
         bkpinfo->use_gzip = FALSE;
     }
-    if (strstr(tarball_fname, ".gz")
-        && strcmp(bkpinfo->zip_suffix, "gz")) {
+    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");
+        mr_free(bkpinfo->zip_exe);
+        mr_asprintf(bkpinfo->zip_exe, "gzip");
         strcpy(bkpinfo->zip_suffix, "gz");
         bkpinfo->use_lzo = FALSE;
         bkpinfo->use_gzip = TRUE;
     }
-    if (strstr(tarball_fname, ".bz2")
-        && strcmp(bkpinfo->zip_suffix, "bz2")) {
+    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");
+        mr_free(bkpinfo->zip_exe);
+        mr_asprintf(bkpinfo->zip_exe, "bzip2");
         strcpy(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
@@ -463 +462 @@
     } else {
         bkpinfo->use_star = FALSE;
-        mr_asprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
+        /* Here we suppose that there is always a compression program called */
+        if (bkpinfo->zip_exe) {
+            mr_asprintf(command, "afio -r -P %s -Z %s >> %s 2>> %s", bkpinfo->zip_exe, tarball_fname, outlog, outlog);
+        } else {
+            mr_asprintf(command, "afio -r -Z %s >> %s 2>> %s", tarball_fname, outlog, outlog);
+        }
     }
     log_msg(6, "command=%s", command);