Changeset 2206 in MondoRescue for branches/2.2.9/mondo/src/common
- Timestamp:
- May 14, 2009, 4:23:28 AM (16 years ago)
- Location:
- branches/2.2.9/mondo/src/common
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-filelist.c
r2203 r2206 483 483 } 484 484 log_msg(8, "Analyzing %s", file_to_analyze); 485 tmp = mr_stresc(file_to_analyze, "`$\\\"() '|!#~", '\\');485 tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\'); 486 486 (void)asprintf(&strtmp, syscall_sprintf, tmp); 487 487 paranoid_free(tmp); … … 1378 1378 time_t this_time; 1379 1379 1380 dir = mr_stresc(dir1, "`$\\\"() '|!#~", '\\');1380 dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\'); 1381 1381 p = strrchr(dir, '/'); 1382 1382 if (p) { -
branches/2.2.9/mondo/src/common/libmondo-mountlist.c
r2205 r2206 673 673 674 674 (void) truncate_to_drive_name(drive); 675 log_msg(8, "drive truncated to %s", drive); 676 675 677 for (j = 0; 676 678 j < noof_drives 677 679 && strcmp(drivelist->el[j].device, drive) != 0; j++) { 678 paranoid_free(drive);679 680 continue; 680 681 } 681 682 if (j == noof_drives) { 682 str cpy(drivelist->el[noof_drives++].device, drive);683 strncpy(drivelist->el[noof_drives++].device, drive, 63); 683 684 } 684 685 paranoid_free(drive); … … 817 818 if (res < 5) { 818 819 /* no label found */ 819 asprintf(&tmp, "%s", "");820 mountlist->el[items].label = tmp;820 log_msg(4, "no label found for %s",mountlist->el[items].device); 821 strcpy(mountlist->el[items].label,""); 821 822 } 822 823 #elif __FreeBSD__ … … 826 827 mountlist->el[items].mountpoint, 827 828 mountlist->el[items].format, siz); 828 asprintf(&tmp, "%s", ""); 829 mountlist->el[items].label = tmp; 829 strcpy(mountlist->el[items].label,""); 830 830 #endif 831 831 … … 846 846 if (mountlist->el[items].device[0] != '\0' 847 847 && mountlist->el[items].device[0] != '#') { 848 if (items >= ARBITRARY_MAXIMUM) {849 log_to_screen("Too many lines in mountlist.. ABORTING");850 finish(1);851 }852 848 for (j = 0; 853 849 j < items … … 884 880 mountlist->el[items].label); 885 881 items++; 882 if (items >= MAX_MOUNTLIST_ENTRIES) { 883 log_to_screen("Too many lines in mountlist.. ABORTING"); 884 finish(1); 885 } 886 886 } 887 887 (void) fgets(incoming, MAX_STR_LEN - 1, fin);
Note:
See TracChangeset
for help on using the changeset viewer.