Changeset 1186 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Feb 19, 2007, 11:54:45 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Small typo fix for mondorestore man page (reported by petes-bugs_at_thegoldenear.org)
• mondo ChangeLog is now UTF-8
• New tests for mr_strip_spaces
• Some attempts to remove valgrind errors

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

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

@@ -345 +345 @@
 
     if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
-        //       -b %ld, TAPE_BLOCK_SIZE
         mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
                  bkpinfo->compression_level);
+        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
         if (does_file_exist(tmp)) {
-            mr_asprintf(&tmp1, "%s -E %s", zipparams, tmp);
-            mr_free(zipparams);
-            zipparams = tmp1;
+            mr_asprintf(&tmp1, " -E +%s", tmp);
+            mr_strcat(zipparams, tmp1);
+            mr_free(tmp1);
         } else {
             mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
@@ -1524 +1523 @@
     *p_next_set_to_archive = 0;
     log_to_screen("Archiving regular files");
-    mr_msg(5, "Go, Shorty. It's your birthday.");
     open_progress_form(_("Backing up filesystem"),
                        _("I am backing up your live filesystem now."),
@@ -1530 +1528 @@
                        _("Working..."),
                        get_last_filelist_number(bkpinfo) + 1);
-
-    mr_msg(5, "We're gonna party like it's your birthday.");
 
     srand((unsigned int) getpid());