Changeset 3273 in MondoRescue for branches/3.2

Timestamp:

Apr 29, 2014, 9:27:05 PM (10 years ago)

Author:

Bruno Cornec

Message:

• rename mondo-restore-EXT.h into mondorestore-EXT.h and removes the now useless mondo-restore.h (continue homogeneization)

Location:

branches/3.2/mondo/src

Files:

• common/mondostructures.h (modified) (1 diff)
• mondorestore/Makefile.am (modified) (1 diff)
• mondorestore/mondo-restore.h (deleted)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondorestore-EXT.h (moved) (moved from branches/3.2/mondo/src/mondorestore/mondo-restore-EXT.h ) (1 diff)
• mondorestore/mondorestore.c (modified) (6 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

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

@@ -365 +365 @@
   /**
    * The compression program to use. Currently supported
-   * choices are lzop and bzip2; gzip may also work. This is ignored if
+   * choices are lzop, bzip2, gzip or lzma. This is ignored if
    * compression_level is 0.
    */

branches/3.2/mondo/src/mondorestore/Makefile.am

@@ -6 +6 @@
 
 ## Headers
-noinst_HEADERS        = mondo-restore.h mondo-rstr-compare.h mondo-rstr-newt.h mondo-rstr-tools.h \
-                        mondo-restore-EXT.h mr-externs.h \
+noinst_HEADERS        = mondorestore.h mondo-rstr-compare.h mondo-rstr-newt.h mondo-rstr-tools.h \
+                        mondorestore-EXT.h mr-externs.h \
                         mondo-rstr-compare-EXT.h mondo-rstr-tools-EXT.h mondoprep.h
                         mondorestore.h

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

@@ -11 +11 @@
 #include "mr-externs.h"
 #include "mondo-rstr-compare.h"
-#include "mondo-restore-EXT.h"
+#include "mondorestore-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
 

branches/3.2/mondo/src/mondorestore/mondorestore-EXT.h

@@ -1 @@
-/* mondo-restore-EXT.h */
+/* mondorestore-EXT.h */
 
 #ifdef __FreeBSD__

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -14 +14 @@
 #include "../common/libmondo.h"
 #include "mr-externs.h"
-#include "mondo-restore.h"
 #include "mondorestore.h"
 #include "mondo-rstr-compare-EXT.h"
@@ -96 +95 @@
 
 /**
- * The location of 'mondo-restore.cfg', containing the metadata
+ * The location of 'mondorestore.cfg', containing the metadata
  * information for this backup.
  */
@@ -122 +121 @@
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
                                  char direction);
-
 
 
@@ -1533 +1531 @@
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    assert(bkpinfo != NULL);
 
     log_msg(5, "Entering");
@@ -1589 +1588 @@
             mr_asprintf(executable, "lzop");
         }
-        if (executable) {
-            mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
-            res = run_program_and_log_output(tmp, FALSE);
-            mr_free(tmp);
-
-            if (res) {
-                log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
-                paranoid_MR_finish(1);
-            }
-            tmp = executable;
-            mr_asprintf(executable, "-P %s -Z", tmp);
-            mr_free(tmp);
+        if (bkpinfo->compression_level == 0) {
+            mr_asprintf(executable, "%s", "");
+        } else {
+            if (executable) {
+                mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+                res = run_program_and_log_output(tmp, FALSE);
+                mr_free(tmp);
+    
+                if (res) {
+                    log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
+                    paranoid_MR_finish(1);
+                }
+                tmp = executable;
+                mr_asprintf(executable, "-P %s -Z", tmp);
+                mr_free(tmp);
+            }
         }
 #ifdef __FreeBSD__
@@ -1615 +1618 @@
         } else {
             if (! executable) {
-                log_msg(2, "Mo executable, this shouldn't happen !");
+                log_msg(2, "No executable, this shouldn't happen !");
             } else {
                 if (filelist_subset_fname != NULL) {

branches/3.2/mondo/src/mondorestore/mr-externs.h

@@ -2 +2 @@
  * $Id$
  *
- * mondo-restore.c's externs
+ * mondorestore.c's externs
  *
  */