Changeset 3273 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c
- Timestamp:
- Apr 29, 2014, 9:27:05 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/mondorestore/mondorestore.c
r3263 r3273 14 14 #include "../common/libmondo.h" 15 15 #include "mr-externs.h" 16 #include "mondo-restore.h"17 16 #include "mondorestore.h" 18 17 #include "mondo-rstr-compare-EXT.h" … … 96 95 97 96 /** 98 * The location of 'mondo -restore.cfg', containing the metadata97 * The location of 'mondorestore.cfg', containing the metadata 99 98 * information for this backup. 100 99 */ … … 122 121 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived, 123 122 char direction); 124 125 123 126 124 … … 1533 1531 1534 1532 assert_string_is_neither_NULL_nor_zerolength(tarball_fname); 1533 assert(bkpinfo != NULL); 1535 1534 1536 1535 log_msg(5, "Entering"); … … 1589 1588 mr_asprintf(executable, "lzop"); 1590 1589 } 1591 if (executable) { 1592 mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable); 1593 res = run_program_and_log_output(tmp, FALSE); 1594 mr_free(tmp); 1595 1596 if (res) { 1597 log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable); 1598 paranoid_MR_finish(1); 1599 } 1600 tmp = executable; 1601 mr_asprintf(executable, "-P %s -Z", tmp); 1602 mr_free(tmp); 1590 if (bkpinfo->compression_level == 0) { 1591 mr_asprintf(executable, "%s", ""); 1592 } else { 1593 if (executable) { 1594 mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable); 1595 res = run_program_and_log_output(tmp, FALSE); 1596 mr_free(tmp); 1597 1598 if (res) { 1599 log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable); 1600 paranoid_MR_finish(1); 1601 } 1602 tmp = executable; 1603 mr_asprintf(executable, "-P %s -Z", tmp); 1604 mr_free(tmp); 1605 } 1603 1606 } 1604 1607 #ifdef __FreeBSD__ … … 1615 1618 } else { 1616 1619 if (! executable) { 1617 log_msg(2, " Mo executable, this shouldn't happen !");1620 log_msg(2, "No executable, this shouldn't happen !"); 1618 1621 } else { 1619 1622 if (filelist_subset_fname != NULL) {
Note:
See TracChangeset
for help on using the changeset viewer.