Changeset 1186 in MondoRescue

Timestamp:

Feb 19, 2007, 11:54:45 AM (18 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

Location:

branches/stable

Files:

• mondo-doc/mondorestore.8 (modified) (1 diff)
• mondo/distributions/conf/mondo.conf (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (3 diffs)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/test/test-string.c (modified) (1 diff)
• mondo/src/test/test-string.res (modified) (1 diff)

branches/stable/mondo-doc/mondorestore.8

@@ -32 +32 @@
 .I mondorestore
 restores data previously backed up with 
-.I mondoarchive
-\&. mondoarchive does not take any command line parameters.
+.I mondoarchive.
+.I mondorestore 
+does not take any command line parameters.
 .
 Note that mondorestore will usually automatically be called when booting a 

branches/stable/mondo/distributions/conf/mondo.conf

@@ -14 +14 @@
 #
 mondo_iso_creation_cmd="/usr/bin/mkisofs"
-#iso_creation_cmd="/usr/bin/growisofs"
+#mondo_iso_creation_cmd="/usr/bin/growisofs"
 
 #
@@ -21 +21 @@
 #
 mondo_iso_creation_options="-J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
-#iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#mondo_iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
 
 #

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());

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

@@ -1223 +1223 @@
         return (FALSE);
     }
+    /* BERLIOS: This is just plain WRONG !! */
     strcpy(do_not_compress_these,last_line_of_file(tmp));
     mr_free(tmp);

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

@@ -237 +237 @@
     if (fin) {
         for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
-            /* patch by Heiko Schlittermann */
-            p = incoming;
-            while (p && *p) {
-                if ((p = strchr(p, '%'))) {
-                    memmove(p, p + 1, strlen(p) + 1);
-                    p += 2;
-                }
-            }
-            /* end of patch */
+            /* Suppress % so they are not interpreted in mr_msg */
+            while ((p = strchr(incoming, '%'))) {
+                *p = ' ';
+            }
             mr_strip_spaces(incoming);
             if ((res == 0 && log_if_success)

branches/stable/mondo/src/test/test-string.c

@@ -28 +28 @@
     mr_free(string);
 
+    mr_asprintf(&string, "   This is a chain with spaces before and behind      ");
+    fprintf(stdout, "string=|%s|\n", string);
+    mr_strip_spaces(string);
+    fprintf(stdout, "string=|%s|\n", string);
+    mr_free(string);
+    mr_asprintf(&string, "This is a chain without spaces before and behind");
+    fprintf(stdout, "string=|%s|\n", string);
+    mr_strip_spaces(string);
+    fprintf(stdout, "string=|%s|\n", string);
+    mr_free(string);
+
     exit(0);
 }

branches/stable/mondo/src/test/test-string.res

@@ -8 +8 @@
 token=|hda6[2]|, lastpos=45
 token=|hda5[1]|, lastpos=53
+string=|     This is a chain with spaces before and behind      |
+string=|This is a chain with spaces before and behind|
+string=|This is a chain without spaces before and behind|
+string=|This is a chain without spaces before and behind|