Changeset 998 in MondoRescue for branches/stable/mondo/src

Timestamp:

Dec 7, 2006, 2:01:34 AM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to solve #113

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (6 diffs)
• common/libmondo-files.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (3 diffs)
• common/libmondo-verify.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-restore.c (modified) (2 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 diff)

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

@@ -697 +697 @@
     char *command;
     char *use_lzo_sz;
+    char *use_gzip_sz;
     char *use_comp_sz;
     char *use_star_sz;
@@ -727 +728 @@
     malloc_string(scratchdir);
     malloc_string(use_lzo_sz);
+    malloc_string(use_gzip_sz);
     malloc_string(use_star_sz);
     malloc_string(use_comp_sz);
@@ -771 +773 @@
     } else {
         strcpy(use_lzo_sz, "no");
+    }
+    if (bkpinfo->use_gzip) {
+        strcpy(use_gzip_sz, "yes");
+    } else {
+        strcpy(use_gzip_sz, "no");
     }
     if (bkpinfo->use_star) {
@@ -1003 +1010 @@
             "mindi --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d", bkpinfo->tmpdir,   // parameter #2
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir,  // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
@@ -1020 +1027 @@
             use_star_sz,        // parameter #17
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
-            bkpinfo->differential); // parameter #19 (INT)
+            bkpinfo->differential,  // parameter #19 (INT)
+            use_gzip_sz);       // parameter #20 (STRING)
 
 // Watch it! This next line adds a parameter...
@@ -1075 +1083 @@
     paranoid_free(tmp);
     paranoid_free(use_lzo_sz);
+    paranoid_free(use_gzip_sz);
     paranoid_free(scratchdir);
     paranoid_free(use_comp_sz);

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

@@ -1358 +1358 @@
     if (bkpinfo->use_lzo) {
         scratchLL = (scratchLL * 2) / 3;
+    else if (bkpinfo->use_gzip) {
+        scratchLL = (scratchLL * 2) / 3;
     } else {
         scratchLL = scratchLL / 2;

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

@@ -649 +649 @@
         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");
@@ -967 +970 @@
     bkpinfo->restore_path[0] = '\0';
     bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
     bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
@@ -1122 +1126 @@
     }
     retval += whine_if_not_found("bzip2");
+    retval += whine_if_not_found("gzip");
     retval += whine_if_not_found("awk");
     retval += whine_if_not_found("md5sum");

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

@@ -337 +337 @@
         if (bkpinfo->use_lzo) {
             strcpy(sz_exe, "lzop");
+        else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
         } else {
             strcpy(sz_exe, "bzip2");
@@ -519 +521 @@
         strcpy(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
+        bkpinfo->use_gzip = FALSE;
+    }
+    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");
+        strcpy(bkpinfo->zip_suffix, "gz");
+        bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = TRUE;
     }
     if (strstr(tarball_fname, ".bz2")
@@ -526 +537 @@
         strcpy(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = FALSE;
     }
     unlink(outlog);

branches/stable/mondo/src/common/mondostructures.h

@@ -398 +398 @@
    */
     bool use_lzo;
+
+  /**
+   * If TRUE, then use @c gzip to compress data.
+   * This is used mainly in estimates. The backup/restore may or may
+   * not work if you do not set this. You should also set @p zip_exe
+   * and @p zip_suffix.
+   */
+    bool use_gzip;
 
   /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -926 +926 @@
             log_to_screen
                 ("Please install LZOP. You can't use '-L' until you do.\n");
+        }
+    }
+
+    if (flag_set['G']) {
+        bkpinfo->use_gzip = TRUE;
+        if (run_program_and_log_output("which gzip", FALSE)) {
+            retval++;
+            log_to_screen
+                ("Please install gzip. You can't use '-G' until you do.\n");
         }
     }

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1572 +1572 @@
                     if (does_file_exist
                         (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    strcpy(bzip2_command, "gzip");
+                    strcpy(suffix, "gz");
+                } else
+                    if (does_file_exist
+                        (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
                     strcpy(bzip2_command, "bzip2");
@@ -2037 +2043 @@
         if (strstr(tarball_fname, ".bz2")) {
             strcpy(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
             strcpy(executable, "lzop");

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -317 +317 @@
     if (strstr(tarball_fname, ".bz2")) {
         strcpy(compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".gz")) {
+        strcpy(compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
         strcpy(compressor_exe, "lzop");

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

@@ -1136 +1136 @@
     if (strstr(value, "yes")) {
         bkpinfo->use_lzo = TRUE;
+        bkpinfo->use_gzip = FALSE;
         strcpy(bkpinfo->zip_exe, "lzop");
         strcpy(bkpinfo->zip_suffix, "lzo");
     } else {
-        read_cfg_var(cfg_file, "use-comp", value);
+        read_cfg_var(cfg_file, "use-gzip", value);
         if (strstr(value, "yes")) {
             bkpinfo->use_lzo = FALSE;
-            strcpy(bkpinfo->zip_exe, "bzip2");
-            strcpy(bkpinfo->zip_suffix, "bz2");
+            bkpinfo->use_gzip = TRUE;
+            strcpy(bkpinfo->zip_exe, "gzip");
+            strcpy(bkpinfo->zip_suffix, "gz");
         } else {
-            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+            read_cfg_var(cfg_file, "use-comp", value);
+            if (strstr(value, "yes")) {
+                bkpinfo->use_lzo = FALSE;
+                bkpinfo->use_gzip = FALSE;
+                strcpy(bkpinfo->zip_exe, "bzip2");
+                strcpy(bkpinfo->zip_suffix, "bz2");
+            } else {
+                bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+            }
         }
     }

branches/stable/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

@@ -63 +63 @@
             if echo "$slicename" | grep "bz2" > /dev/null ; then
                 bzip2 -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
+            elif echo "$slicename" | grep "gz" > /dev/null ; then
+                gzip -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
             elif echo "$slicename" | grep "lzo" > /dev/null ; then
                 lzop -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"