Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c
- Timestamp:
- Aug 18, 2009, 3:25:29 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-filelist.c
r2327 r2331 527 527 char *syscall_pout = NULL; 528 528 char *incoming; 529 char *current_subset_file, *current_master_file; 529 char *current_subset_file; 530 char *current_master_file = NULL; 530 531 char *masklist = NULL; 531 532 int retval = 0; … … 551 552 malloc_string(incoming); 552 553 malloc_string(current_subset_file); 553 malloc_string(current_master_file);554 554 mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir); 555 555 mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist); … … 558 558 559 559 sort_file(masklist); 560 current_subset_file[0] = current_master_file[0] ='\0';560 current_subset_file[0] = '\0'; 561 561 562 562 mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE); … … 594 594 (void)fgets(incoming, MAX_STR_LEN, pin); 595 595 while (!feof(pin) && !feof(faclin)) { 596 // printf("incoming = %s", incoming); 597 598 strcpy(current_master_file, incoming + 8); 596 mr_asprintf(current_master_file, "%s", incoming + 8); 599 597 600 598 p = current_subset_file; … … 635 633 log_msg(my_depth, "Copying master %s", q); 636 634 } 637 // if (!i) { printf("Match --- %s\n", q); }638 635 639 636 while (!feof(pin) && strncmp(incoming, "# file: ", 8)) { 640 637 if (!i) { 641 642 // printf("%s", incoming);643 644 638 fputs(incoming, pout); 645 639 } … … 649 643 (void)fgets(current_subset_file, MAX_STR_LEN, faclin); 650 644 } 645 mr_free(current_master_file); 651 646 } 652 647 while (!feof(pin)) { … … 663 658 664 659 paranoid_free(current_subset_file); 665 paranoid_free(current_master_file);666 660 paranoid_free(incoming); 667 661 return (retval); … … 669 663 670 664 671 int set_fattr_list(char *masklist, char *fattr_fname) 672 { 673 if (find_home_of_exe("setfattr")) { 665 int set_fattr_list(char *masklist, char *fattr_fname) { 666 667 char *tmp = NULL; 668 669 tmp = find_home_of_exe("setfattr"); 670 if (tmp) { 671 mr_free(tmp); 674 672 return (set_EXAT_list(masklist, fattr_fname, "setfattr")); 675 673 } else { 674 mr_free(tmp); 676 675 log_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist"); 677 676 return(0); … … 681 680 682 681 683 int set_acl_list(char *masklist, char *acl_fname) 684 { 685 if (find_home_of_exe("setfacl")) { 682 int set_acl_list(char *masklist, char *acl_fname) { 683 684 char *tmp = NULL; 685 686 tmp = find_home_of_exe("setfacl"); 687 if (tmp) { 688 mr_free(tmp); 686 689 return (set_EXAT_list(masklist, acl_fname, "setfacl")); 687 690 } else { 691 mr_free(tmp); 688 692 log_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist"); 689 693 return(0); … … 1770 1774 char *fname; 1771 1775 char *tmp; 1772 size_t len = 0; // Scrub's patch doesn't work without that 1773 1774 // log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE"); 1776 size_t len = 0; 1777 1775 1778 malloc_string(fname); 1776 1779 malloc_string(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.