Changeset 1043 in MondoRescue for trunk/mondo/src/common

Timestamp:

Jan 8, 2007, 11:31:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• libmondo-archive.c (modified) (5 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files.c (modified) (1 diff)
• libmondo-tools.c (modified) (3 diffs)
• libmondo-verify.c (modified) (3 diffs)
• mondostructures.h (modified) (1 diff)

trunk/mondo/src/common/libmondo-archive.c

@@ -546 +546 @@
     char *command = NULL;
     char *use_lzo_sz = NULL;
+    char *use_gzip_sz = NULL;
     char *use_comp_sz = NULL;
     char *use_star_sz = NULL;
@@ -607 +608 @@
     } else {
         mr_asprintf(&use_lzo_sz, "no");
+    }
+    if (bkpinfo->use_gzip) {
+        mr_asprintf(&use_gzip_sz, "yes");
+    } else {
+        mr_asprintf(&use_gzip_sz, "no");
     }
     if (bkpinfo->use_star) {
@@ -861 +867 @@
              "mindi --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", 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
@@ -879 +885 @@
              bkpinfo->internal_tape_block_size, // parameter #18 (LONG)
              bkpinfo->differential, // parameter #19 (INT)
+             use_gzip_sz,       // parameter #20 (STRING)
              tmp);
     mr_free(tmp);
@@ -891 +898 @@
     mr_free(devs_to_exclude);
     mr_free(use_lilo_sz);
+    mr_free(use_gzip_sz);
 
     log_msg(2, command);

trunk/mondo/src/common/libmondo-filelist.c

@@ -428 +428 @@
     char *syscall;
     char *file_to_analyze = NULL;
+    char *strtmp = NULL;
     int i;
     size_t n = 0;
@@ -452 +453 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         /* BERLIOS : to be checked */
-        mr_asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
+        paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);

trunk/mondo/src/common/libmondo-files.c

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

trunk/mondo/src/common/libmondo-tools.c

@@ -431 +431 @@
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
     } else if (bkpinfo->compression_level != 0) {
         mr_allocstr(bkpinfo->zip_exe, "bzip2");
@@ -753 +759 @@
     mr_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -909 +917 @@
     }
     retval += whine_if_not_found("bzip2");
+    retval += whine_if_not_found("gzip");
     retval += whine_if_not_found("awk");
     retval += whine_if_not_found("md5sum");

trunk/mondo/src/common/libmondo-verify.c

@@ -238 +238 @@
         if (bkpinfo->use_lzo) {
             mr_asprintf(&sz_exe, "lzop");
+        else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
+        } else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
         } else {
             mr_asprintf(&sz_exe, "bzip2");
@@ -409 +413 @@
         mr_allocstr(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")
@@ -416 +429 @@
         mr_allocstr(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = FALSE;
     }
     unlink(outlog);

trunk/mondo/src/common/mondostructures.h

@@ -387 +387 @@
    */
     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;
+
+  /**
+   * A filename containing a list of extensions, one per line, to not
+   * compress. If this is set to "", afio will still exclude a set of well-known
+   * compressed files from compression, but biggiefiles that are compressed
+   * will be recompressed again.
+   */
+    char do_not_compress_these[MAX_STR_LEN / 2];
 
   /**