Changeset 1086 in MondoRescue for trunk/mondo/src/common/libmondo-stream.c
- Timestamp:
- Feb 2, 2007, 11:21:27 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-stream.c
r1081 r1086 363 363 wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr); 364 364 } 365 log_msg(1, "Got xattr");365 mr_msg(1, "Got xattr"); 366 366 } 367 367 mr_free(fname); … … 390 390 wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr); 391 391 } 392 log_msg(1, "Got acl");392 mr_msg(1, "Got acl"); 393 393 } 394 394 mr_free(fname); … … 408 408 // tarball itself 409 409 res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr); 410 log_msg(1, "now looking for afioball");410 mr_msg(1, "now looking for afioball"); 411 411 return (retval); 412 412 } … … 580 580 581 581 if (strncmp(tapedev, "/dev/", 5)) { 582 log_msg(1,582 mr_msg(1, 583 583 "Not using 'mt setblk'. This isn't an actual /dev entry."); 584 584 return (0); … … 910 910 // crctt=crc16=0; 911 911 where_I_was_before_tape_change = size; 912 log_msg(4, "where_I_was_... = %lld",912 mr_msg(4, "where_I_was_... = %lld", 913 913 where_I_was_before_tape_change); 914 914 start_to_read_from_next_tape(bkpinfo); 915 log_msg(4, "Started reading from next tape.");915 mr_msg(4, "Started reading from next tape."); 916 916 skip_incoming_files_until_we_find_this_one(temp_fname); 917 log_msg(4, "Skipped irrelevant files OK.");917 mr_msg(4, "Skipped irrelevant files OK."); 918 918 for (size = orig_size; size > where_I_was_before_tape_change; 919 919 size -= bytes_to_write) { … … 921 921 fread(datablock, 1, bytes_to_read, g_tape_stream); 922 922 } 923 log_msg(4, "'size' is now %lld (should be %lld)", size,923 mr_msg(4, "'size' is now %lld (should be %lld)", size, 924 924 where_I_was_before_tape_change); 925 925 log_to_screen("Successfully re-sync'd tape"); … … 938 938 #endif 939 939 } 940 log_msg(6, "Total read from tape for this file = %lld",940 mr_msg(6, "Total read from tape for this file = %lld", 941 941 total_read_from_tape_for_this_file); 942 log_msg(6, ".......................... Should be %lld", orig_size);942 mr_msg(6, ".......................... Should be %lld", orig_size); 943 943 g_tape_posK += total_read_from_tape_for_this_file / 1024; 944 944 mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt); … … 1027 1027 } 1028 1028 tempblock[i] = '\0'; 1029 log_msg(6, "%s (fname=%s, size=%ld K)",1029 mr_msg(6, "%s (fname=%s, size=%ld K)", 1030 1030 marker_to_string(*pcontrol_char), tempblock + 1000, 1031 1031 (long) (*plen) >> 10); … … 1141 1141 pB = the_file_I_was_reading; 1142 1142 } 1143 log_msg(1, "skip_incoming_..(%s)", pB);1144 log_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");1143 mr_msg(1, "skip_incoming_..(%s)", pB); 1144 mr_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE"); 1145 1145 ctrl_chr = -1; 1146 1146 while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) { … … 1151 1151 break; 1152 1152 } 1153 log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);1153 mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr); 1154 1154 wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr); 1155 log_msg(3, "Still trying to re-sync w/ tape");1155 mr_msg(3, "Still trying to re-sync w/ tape"); 1156 1156 mr_free(temp_fname); 1157 1157 temp_fname = (char *)&res; … … 1164 1164 break; 1165 1165 } 1166 log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);1166 mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr); 1167 1167 wrong_marker(BLK_START_FILE, ctrl_chr); 1168 log_msg(3, "Still trying to re-sync w/ tape");1168 mr_msg(3, "Still trying to re-sync w/ tape"); 1169 1169 /* Do not desallocate when the while condition is met */ 1170 1170 if (ctrl_chr != BLK_START_FILE) { … … 1186 1186 } 1187 1187 while (strcmp(pA, pB)) { 1188 log_msg(6, "Skipping %s (it's not %s)", temp_fname,1188 mr_msg(6, "Skipping %s (it's not %s)", temp_fname, 1189 1189 the_file_I_was_reading); 1190 1190 for (size = temp_size; size > 0; size -= bytes_to_write) { … … 1230 1230 */ 1231 1231 } 1232 log_msg(2, "Reading %s (it matches %s)", temp_fname,1232 mr_msg(2, "Reading %s (it matches %s)", temp_fname, 1233 1233 the_file_I_was_reading); 1234 1234 mr_free(temp_fname); … … 1275 1275 wrong_marker(BLK_START_OF_BACKUP, ctrlchr); 1276 1276 } else { 1277 log_msg(3, "Next tape opened OK. Whoopee!");1277 mr_msg(3, "Next tape opened OK. Whoopee!"); 1278 1278 } 1279 1279 return (res); … … 1350 1350 char *fname; 1351 1351 1352 log_msg(2, "I am now writing back catalog to tape");1352 mr_msg(2, "I am now writing back catalog to tape"); 1353 1353 last = g_tapecatalog->entries - 1; 1354 1354 for (i = 0; i <= last; i++) { … … 1356 1356 g_tapecatalog->el[i].fname); 1357 1357 if (!does_file_exist(fname)) { 1358 log_msg(6, "Can't write %s - it doesn't exist.", fname);1358 mr_msg(6, "Can't write %s - it doesn't exist.", fname); 1359 1359 } else { 1360 1360 write_header_block_to_stream(length_of_file(fname), 1361 1361 "start-backcatalog-afio-or-slice", 1362 1362 BLK_START_AN_AFIO_OR_SLICE); 1363 log_msg(2, "Writing %s", fname);1363 mr_msg(2, "Writing %s", fname); 1364 1364 if (write_file_to_stream_from_file(bkpinfo, fname)) { 1365 1365 res++; 1366 log_msg(2, "%s failed", fname);1366 mr_msg(2, "%s failed", fname); 1367 1367 } 1368 1368 if (i != last) { … … 1374 1374 mr_free(fname); 1375 1375 } 1376 log_msg(2, "Finished writing back catalog to tape");1376 mr_msg(2, "Finished writing back catalog to tape"); 1377 1377 return (res); 1378 1378 } … … 1606 1606 marker_to_string(control_char), p, 1607 1607 (long) length_of_incoming_file >> 10); 1608 log_msg(6, tmp);1608 mr_msg(6, tmp); 1609 1609 mr_free(tmp); 1610 1610 return (0);
Note:
See TracChangeset
for help on using the changeset viewer.