Changeset 1585


Ignore:
Timestamp:
Jul 29, 2007, 8:53:23 PM (12 years ago)
Author:
bruno
Message:

Fix bug #187 (Scott Cummings rsc_at_usfamily.net)

Location:
branches/2.2.5/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-string.c

    r1236 r1585  
    944944        sev = 2;
    945945        sprintf(reason,
    946                 "It's in your /home partiton. Therefore, it is important.");
     946                "It's in your /home directory. Therefore, it is important.");
    947947    }
    948948    if (!strncmp(filename, "/usr/", 5)) {
  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c

    r1321 r1585  
    377377        log_OS_error(command);
    378378        sprintf(tmp, "Warning - afio returned error = %d", res);
     379        log_msg(2, tmp);
    379380    }
    380381    if (length_of_file(logfile) > 5) {
     
    536537    chdir(bkpinfo->restore_path);
    537538    getcwd(new, MAX_STR_LEN - 1);
    538     sprintf(tmp, "new path is %s", new);
    539539    insist_on_this_cd_number(bkpinfo, g_current_media_number);
    540540    unlink("/tmp/changed.txt");
     
    589589    long q;
    590590    char *tmp;
     591    char *new;
     592    char *cwd;
    591593
    592594    malloc_string(tmp);
     595    malloc_string(new);
     596    malloc_string(cwd);
    593597
    594598  /**************************************************************************
     
    632636                            "Warning - differences found during the compare phase");
    633637    }
    634 
    635     retval += unmount_all_devices(mountlist);
    636638
    637639    if (count_lines_in_file("/tmp/changed.txt") > 0) {
     
    657659
    658660            log_msg(2, "calling popup_changelist_from_file()");
     661            getcwd(cwd, MAX_STR_LEN - 1);
     662            chdir(bkpinfo->restore_path);
     663            getcwd(new, MAX_STR_LEN - 1);
    659664            popup_changelist_from_file("/tmp/changed.files");
     665            chdir(cwd);
    660666            log_msg(2, "Returning from popup_changelist_from_file()");
    661667        }
     
    664670            ("No significant differences were found. Your backup is perfect.");
    665671    }
     672    retval += unmount_all_devices(mountlist);
     673
    666674    kill_petris();
    667675    paranoid_free(tmp);
     676    paranoid_free(new);
     677    paranoid_free(cwd);
    668678    return (retval);
    669679}
Note: See TracChangeset for help on using the changeset viewer.