Changeset 1769 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.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-archive.c (modified) (16 diffs)

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

@@ -230 +230 @@
     mr_asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
              filelist, fname);
-    if (bkpinfo->use_lzo) {
-        fatal_error("Can't use lzop");
-    }
+
     if (bkpinfo->compression_level > 0) {
         mr_asprintf(&tmp, "%s -bz", command);
@@ -289 +287 @@
  * - @c scratchdir (only verifies existence)
  * - @c tmpdir (only verifies existence)
- * - @c zip_exe
- * - @c zip_suffix
+ * - @c compression_tool
+ * - @c compression_suffix
  * @param filelist The path to a file containing a list of files to be archived
  * in this fileset.
@@ -339 +337 @@
 
     if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
+        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->compression_tool,
                  bkpinfo->compression_level);
         mr_asprintf(&tmp, "%s/do-not-compress-these", MONDO_SHARE);
@@ -365 +363 @@
     }
     mr_asprintf(&command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
-             fname, bkpinfo->zip_suffix);
+             fname, bkpinfo->compression_suffix);
     paranoid_system(command);
     mr_free(command);
@@ -521 +519 @@
  * - @c nonbootable_backup
  * - @c tmpdir
- * - @c use_lzo
  *
  * @return The number of errors encountered (0 for success)
@@ -829 +826 @@
         mr_fprintf(fd1, "use-comp=no\n");
     }
-    if (bkpinfo->use_gzip) {
-        mr_fprintf(fd1, "use-gzip=yes\n");
-    } else {
-        mr_fprintf(fd1, "use-gzip=no\n");
-    }
-    if (bkpinfo->use_lzo) {
-        mr_fprintf(fd1, "use-lzo=yes\n");
-    } else {
-        mr_fprintf(fd1, "use-lzo=no\n");
+    if (bkpinfo->compression_tool) {
+        mr_fprintf(fd1, "compression_tool=%s\n",bkpinfo->compression_tool);
+    }
+    if (bkpinfo->compression_suffix) {
+        mr_fprintf(fd1, "compression_suffix=%s\n",bkpinfo->compression_suffix);
+    }
+    if (bkpinfo->compression_type != none) {
+        mr_fprintf(fd1, "compression_type=%d\n",bkpinfo->compression_type);
     }
     if (bkpinfo->use_star) {
@@ -998 +994 @@
  *   structure. Fields used:
  *   - @c tmpdir
- *   - @c zip_suffix
+ *   - @c compression_suffix
  *
  * Any of the above may be modified by the caller at any time.
@@ -1059 +1055 @@
         /* backup this set of files */
         sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+                bkpinfo->tmpdir, archiving_set_no, bkpinfo->compression_suffix);
         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, archiving_set_no);
@@ -1071 +1067 @@
 
         mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+                 archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->compression_suffix);
         if (does_file_exist(tmp)) {
             mr_msg(4, "[%d:%d] - waiting for storer",
@@ -1317 +1313 @@
  * - @c scratchdir
  * - @c tmpdir
- * - @c zip_suffix
+ * - @c compression_suffix
  *
  * @return The number of errors encountered (0 for success)
@@ -1427 +1423 @@
                     bkpinfo->tmpdir, storing_set_no);
             sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                    bkpinfo->tmpdir, storing_set_no, bkpinfo->compression_suffix);
             if (g_getfattr) {
                 sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
@@ -2093 +2089 @@
         /* backup this set of files */
         mr_asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
+                 bkpinfo->tmpdir, curr_set_no, bkpinfo->compression_suffix);
 
         mr_msg(1, "EXAT'g set %ld", curr_set_no);
@@ -2758 +2754 @@
  * - @c tmpdir
  * - @c use_lzo
- * - @c zip_exe
- * - @c zip_suffix
+ * - @c compression_tool
+ * - @c compression_suffix
  *
  * @param biggie_filename The file to chop up.
@@ -2909 +2905 @@
         should_I_compress_slices = FALSE;
     } else {
-        mr_asprintf(&suffix, bkpinfo->zip_suffix);
+        mr_asprintf(&suffix, bkpinfo->compression_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -2957 +2953 @@
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
-                mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
+                mr_asprintf(&command, "%s -%d %s", bkpinfo->compression_tool,
                          bkpinfo->compression_level,
                          curr_slice_fname_uncompressed);
@@ -2979 +2975 @@
                 mr_msg(2, "Failed to compress the slice");
             }
-            if (bkpinfo->use_lzo
+            if ((bkpinfo->compression_type == lzo)
                 && strcmp(curr_slice_fname_compressed,
                           curr_slice_fname_uncompressed)) {