Changeset 1186


Ignore:
Timestamp:
Feb 19, 2007, 11:54:45 AM (13 years ago)
Author:
bruno
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:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo-doc/mondorestore.8

    r569 r1186  
    3232.I mondorestore
    3333restores data previously backed up with
    34 .I mondoarchive
    35 \&. mondoarchive does not take any command line parameters.
     34.I mondoarchive.
     35.I mondorestore
     36does not take any command line parameters.
    3637.
    3738Note that mondorestore will usually automatically be called when booting a
  • branches/stable/mondo/distributions/conf/mondo.conf

    r1048 r1186  
    1414#
    1515mondo_iso_creation_cmd="/usr/bin/mkisofs"
    16 #iso_creation_cmd="/usr/bin/growisofs"
     16#mondo_iso_creation_cmd="/usr/bin/growisofs"
    1717
    1818#
     
    2121#
    2222mondo_iso_creation_options="-J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
    23 #iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
     23#mondo_iso_creation_options="-use-the-force-luke -v  -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
    2424
    2525#
  • branches/stable/mondo/src/common/libmondo-archive.c

    r1180 r1186  
    345345
    346346    if (bkpinfo->compression_level > 0) {
    347         mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
    348         //       -b %ld, TAPE_BLOCK_SIZE
    349347        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
    350348                 bkpinfo->compression_level);
     349        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
    351350        if (does_file_exist(tmp)) {
    352             mr_asprintf(&tmp1, "%s -E %s", zipparams, tmp);
    353             mr_free(zipparams);
    354             zipparams = tmp1;
     351            mr_asprintf(&tmp1, " -E +%s", tmp);
     352            mr_strcat(zipparams, tmp1);
     353            mr_free(tmp1);
    355354        } else {
    356355            mr_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
     
    15241523    *p_next_set_to_archive = 0;
    15251524    log_to_screen("Archiving regular files");
    1526     mr_msg(5, "Go, Shorty. It's your birthday.");
    15271525    open_progress_form(_("Backing up filesystem"),
    15281526                       _("I am backing up your live filesystem now."),
     
    15301528                       _("Working..."),
    15311529                       get_last_filelist_number(bkpinfo) + 1);
    1532 
    1533     mr_msg(5, "We're gonna party like it's your birthday.");
    15341530
    15351531    srand((unsigned int) getpid());
  • branches/stable/mondo/src/common/libmondo-files.c

    r1180 r1186  
    12231223        return (FALSE);
    12241224    }
     1225    /* BERLIOS: This is just plain WRONG !! */
    12251226    strcpy(do_not_compress_these,last_line_of_file(tmp));
    12261227    mr_free(tmp);
  • branches/stable/mondo/src/common/libmondo-fork.c

    r1173 r1186  
    237237    if (fin) {
    238238        for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
    239             /* patch by Heiko Schlittermann */
    240             p = incoming;
    241             while (p && *p) {
    242                 if ((p = strchr(p, '%'))) {
    243                     memmove(p, p + 1, strlen(p) + 1);
    244                     p += 2;
    245                 }
    246             }
    247             /* end of patch */
     239            /* Suppress % so they are not interpreted in mr_msg */
     240            while ((p = strchr(incoming, '%'))) {
     241                *p = ' ';
     242            }
    248243            mr_strip_spaces(incoming);
    249244            if ((res == 0 && log_if_success)
  • branches/stable/mondo/src/test/test-string.c

    r1140 r1186  
    2828    mr_free(string);
    2929
     30    mr_asprintf(&string, "   This is a chain with spaces before and behind      ");
     31    fprintf(stdout, "string=|%s|\n", string);
     32    mr_strip_spaces(string);
     33    fprintf(stdout, "string=|%s|\n", string);
     34    mr_free(string);
     35    mr_asprintf(&string, "This is a chain without spaces before and behind");
     36    fprintf(stdout, "string=|%s|\n", string);
     37    mr_strip_spaces(string);
     38    fprintf(stdout, "string=|%s|\n", string);
     39    mr_free(string);
     40
    3041    exit(0);
    3142}
  • branches/stable/mondo/src/test/test-string.res

    r1054 r1186  
    88token=|hda6[2]|, lastpos=45
    99token=|hda5[1]|, lastpos=53
     10string=|     This is a chain with spaces before and behind      |
     11string=|This is a chain with spaces before and behind|
     12string=|This is a chain without spaces before and behind|
     13string=|This is a chain without spaces before and behind|
Note: See TracChangeset for help on using the changeset viewer.