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

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

@@ -329 +329 @@
  * - Used: @c bkpinfo->backup_media_type
  * - Used: @c bkpinfo->writer_speed
- * - Used: @c bkpinfo->compression_level
  * - Used: @c bkpinfo->include_paths
  * - Used: @c bkpinfo->prefix
@@ -340 +339 @@
  * - Used: @c bkpinfo->scratchdir
  * - Used: @c bkpinfo->tmpdir
- * - Used: @c bkpinfo->use_lzo
  * - Modified: @c bkpinfo->call_before_iso
  * - Modified: @c bkpinfo->call_make_iso
  * - Modified: @c bkpinfo->optimal_set_size
- * - Modified: @c bkpinfo->zip_exe
- * - Modified: @c bkpinfo->zip_suffix
  * 
  * @return number of errors, or 0 for success.
@@ -436 +432 @@
     }
     mr_free(command);
-
-    if (bkpinfo->use_lzo) {
-        strcpy(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
-    } else if (bkpinfo->use_gzip) {
-        strcpy(bkpinfo->zip_exe, "gzip");
-        strcpy(bkpinfo->zip_suffix, "gz");
-    } else if (bkpinfo->compression_level != 0) {
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
-    } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
-    }
 
 // CD-R or CD-RW or DVD
@@ -734 +717 @@
     bkpinfo->manual_tray = mr_conf->manual_tray;
     bkpinfo->internal_tape_block_size = mr_conf->internal_tape_blocksize;
+    bkpinfo->compression_level = mr_conf->compression_level;
+    mr_asprintf(&tmp,mr_conf->compression_suffix);
+    bkpinfo->compression_suffix = tmp;
+    mr_asprintf(&tmp,mr_conf->compression_tool);
+    bkpinfo->compression_tool = tmp;
     mr_asprintf(&tmp,mr_conf->media_device);
     bkpinfo->media_device = tmp;
@@ -762 +750 @@
     }
     bkpinfo->boot_device[0] = '\0';
-    bkpinfo->zip_exe[0] = '\0';
-    bkpinfo->zip_suffix[0] = '\0';
     bkpinfo->restore_path[0] = '\0';
-    bkpinfo->use_lzo = FALSE;
-    bkpinfo->use_gzip = FALSE;
     bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
@@ -798 +782 @@
     bkpinfo->differential = FALSE;
     bkpinfo->writer_speed = mr_conf->iso_burning_speed;
-    bkpinfo->compression_level = 3;
 }
 
@@ -913 +896 @@
     retval += whine_if_not_found(mr_conf->iso_burning_cmd);
     retval += whine_if_not_found(MKE2FS_OR_NEWFS);
-    retval += whine_if_not_found("bzip2");
+    retval += whine_if_not_found(mr_conf->compresstion_tool);
     retval += whine_if_not_found("gzip");
     retval += whine_if_not_found("awk");