Changeset 1769 in MondoRescue for branches/stable/mondo/src/common/libmondo-verify.c

Timestamp:

Nov 6, 2007, 1:37:38 AM (16 years ago)

Author:

Bruno Cornec

Message:

Continue on configuration file items (compression)

File:

• branches/stable/mondo/src/common/libmondo-verify.c (modified) (11 diffs)

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

@@ -41 +41 @@
 /**
  * Generate the filename of a tarball to verify.
- * @param bkpinfo The backup information structure. @c bkpinfo->zip_suffix is the only field used.
+ * @param bkpinfo The backup information structure. @c bkpinfo->compression_suffix is the only field used.
  * @param mountpoint The directory where the CD/DVD/ISO is mounted.
  * @param setno The afioball number to get the location of.
@@ -56 +56 @@
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
     sprintf(output, "%s/archives/%d.star.%s", mountpoint, setno,
-            bkpinfo->zip_suffix);
+            bkpinfo->compression_suffix);
     if (!does_file_exist(output)) {
         sprintf(output, "%s/archives/%d.afio.%s", mountpoint, setno,
-                bkpinfo->zip_suffix);
+                bkpinfo->compression_suffix);
     }
     return (output);
@@ -211 +211 @@
  * - @c compression_level
  * - @c restore_path
- * - @c use_lzo
- * - @c zip_suffix
+ * - @c compression_suffix
  * @param mtpt The mountpoint the CD/DVD/ISO is mounted on.
  * @return The number of differences (0 for perfect biggiefiles).
@@ -224 +223 @@
     char *mountpoint = NULL;
     char *command = NULL;
-    char *sz_exe = NULL;
     static char *bufblkA = NULL;
     static char *bufblkB = NULL;
@@ -252 +250 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mtpt);
-
-    if (bkpinfo->compression_level > 0) {
-        if (bkpinfo->use_lzo) {
-            mr_asprintf(&sz_exe, "lzop");
-        } else if (bkpinfo->use_gzip) {
-            mr_asprintf(&sz_exe, "gzip");
-        } else {
-            mr_asprintf(&sz_exe, "bzip2");
-        }
-    } else {
-        mr_asprintf(&sz_exe, "");
-    }
 
     iamhere("before vsbf");
@@ -286 +272 @@
     while (does_file_exist
            (slice_fname
-            (bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix))
+            (bigfile_num, slice_num, mountpoint, bkpinfo->compression_suffix))
            ||
            does_file_exist(slice_fname
@@ -340 +326 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (!does_file_exist(slice_fname(bigfile_num, slice_num, mountpoint, ""))) {
-                mr_asprintf(&command, "%s -dc %s 2>> %s", sz_exe,
-                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->zip_suffix),
+                mr_asprintf(&command, "%s -dc %s 2>> %s", bkpinfi->compression_tool,
+                        slice_fname(bigfile_num, slice_num, mountpoint, bkpinfo->compression_suffix),
                         MONDO_LOGFILE);
             } else {
@@ -392 +378 @@
     mr_free(tmp);
     mr_free(mountpoint);
-    mr_free(sz_exe);
 
     last_bigfile_num = bigfile_num;
@@ -414 +399 @@
  * You should be changed to the root directory (/) for this to work.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->use_lzo
  * - @c bkpinfo->tmpdir
- * - @c bkpinfo->zip_exe
- * - @c bkpinfo->zip_suffix
+ * - @c bkpinfo->compression_tool
+ * - @c bkpinfo->compression_suffix
  * @param tarball_fname The filename of the afioball to verify.
  * @return 0, always.
@@ -442 +426 @@
 
     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")) {
-        mr_msg(2, "OK, I'm going to start using lzop.");
-        strcpy(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")) {
-        mr_msg(2, "OK, I'm going to start using gzip.");
-        strcpy(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")) {
-        mr_msg(2, "OK, I'm going to start using bzip2.");
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
-        bkpinfo->use_lzo = FALSE;
-        bkpinfo->use_gzip = FALSE;
-    }
     unlink(outlog);
+
     if (strstr(tarball_fname, ".star")) {
         bkpinfo->use_star = TRUE;
@@ -483 +442 @@
         bkpinfo->use_star = FALSE;
         mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s",
-                 bkpinfo->zip_exe, tarball_fname, outlog, outlog);
+                 bkpinfo->compression_tool, tarball_fname, outlog, outlog);
     }
     mr_msg(6, "command=%s", command);