Changeset 2330 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c
- Timestamp:
- Aug 18, 2009, 3:20:49 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-archive.c
r2328 r2330 2559 2559 * @return 0 (there was an OK CD in the drive) or 1 (there wasn't). 2560 2560 */ 2561 int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, 2562 bool keep_looping) 2563 { 2561 int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, bool keep_looping) { 2564 2562 int res = 0; 2565 2563 char *bkp = NULL; … … 2823 2821 /*@ buffers ************************************************** */ 2824 2822 char *tmp = NULL; 2825 char *checksum_line, *command; 2823 char *checksum_line = NULL; 2824 char *command; 2826 2825 char *tempblock; 2827 2826 char *curr_slice_fname_uncompressed = NULL; … … 2859 2858 assert(bkpinfo != NULL); 2860 2859 assert_string_is_neither_NULL_nor_zerolength(biggie_filename); 2861 malloc_string(checksum_line);2862 2860 2863 2861 biggiestruct.for_backward_compatibility = '\n'; … … 2877 2875 if (ntfsprog_fifo) { 2878 2876 file_to_openin = ntfsprog_fifo; 2879 strcpy(checksum_line, "IGNORE"); 2880 log_msg(2, 2881 "Not calculating checksum for %s: it would take too long", 2882 biggie_filename); 2877 mr_asprintf(checksum_line, "IGNORE"); 2878 log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename); 2883 2879 if ( !find_home_of_exe("ntfsresize")) { 2884 2880 fatal_error("ntfsresize not found"); … … 2904 2900 } 2905 2901 mr_free(command); 2906 (void) fgets(checksum_line, MAX_STR_LEN, fin);2902 mr_getline(checksum_line, fin); 2907 2903 pclose(fin); 2908 2904 totallength = length_of_file (biggie_filename); … … 2918 2914 } 2919 2915 strcpy(biggiestruct.checksum, checksum_line); 2916 mr_free(checksum_line); 2920 2917 2921 2918 mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, "")); … … 2940 2937 log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename); 2941 2938 2942 paranoid_free(checksum_line);2943 2939 mr_free(suffix); 2944 2940 return (1); … … 3074 3070 mr_free(tmp); 3075 3071 3076 paranoid_free(checksum_line);3077 3072 return (retval); 3078 3073 }
Note:
See TracChangeset
for help on using the changeset viewer.