Changeset 1107 in MondoRescue for branches/stable/mondo/src/common/libmondo-stream.c
- Timestamp:
- Feb 8, 2007, 12:09:34 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-stream.c
r1080 r1107 376 376 wrong_marker(BLK_STOP_EXAT_FILE, *pctrl_chr); 377 377 } 378 log_msg(1, "Got xattr");378 mr_msg(1, "Got xattr"); 379 379 } 380 380 // acl … … 396 396 wrong_marker(BLK_STOP_EXTENDED_ATTRIBUTES, *pctrl_chr); 397 397 } 398 log_msg(1, "Got acl");398 mr_msg(1, "Got acl"); 399 399 } 400 400 // tarball itself 401 401 res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr); 402 log_msg(1, "now looking for afioball");402 mr_msg(1, "now looking for afioball"); 403 403 return (retval); 404 404 } … … 590 590 591 591 if (strncmp(tapedev, "/dev/", 5)) { 592 log_msg(1,592 mr_msg(1, 593 593 "Not using 'mt setblk'. This isn't an actual /dev entry."); 594 594 return (0); … … 933 933 // crctt=crc16=0; 934 934 where_I_was_before_tape_change = size; 935 log_msg(4, "where_I_was_... = %lld",935 mr_msg(4, "where_I_was_... = %lld", 936 936 where_I_was_before_tape_change); 937 937 start_to_read_from_next_tape(bkpinfo); 938 log_msg(4, "Started reading from next tape.");938 mr_msg(4, "Started reading from next tape."); 939 939 skip_incoming_files_until_we_find_this_one(temp_fname); 940 log_msg(4, "Skipped irrelevant files OK.");940 mr_msg(4, "Skipped irrelevant files OK."); 941 941 for (size = orig_size; size > where_I_was_before_tape_change; 942 942 size -= bytes_to_write) { … … 944 944 fread(datablock, 1, bytes_to_read, g_tape_stream); 945 945 } 946 log_msg(4, "'size' is now %lld (should be %lld)", size,946 mr_msg(4, "'size' is now %lld (should be %lld)", size, 947 947 where_I_was_before_tape_change); 948 948 log_to_screen("Successfully re-sync'd tape"); … … 961 961 #endif 962 962 } 963 log_msg(6, "Total read from tape for this file = %lld",963 mr_msg(6, "Total read from tape for this file = %lld", 964 964 total_read_from_tape_for_this_file); 965 log_msg(6, ".......................... Should be %lld", orig_size);965 mr_msg(6, ".......................... Should be %lld", orig_size); 966 966 g_tape_posK += total_read_from_tape_for_this_file / 1024; 967 967 sprintf(actual_cksum, "%04x%04x", crc16, crctt); … … 1054 1054 } 1055 1055 tempblock[i] = '\0'; 1056 log_msg(6, "%s (fname=%s, size=%ld K)",1056 mr_msg(6, "%s (fname=%s, size=%ld K)", 1057 1057 marker_to_string(*pcontrol_char), tempblock + 1000, 1058 1058 (long) (*plen) >> 10); … … 1172 1172 pB = the_file_I_was_reading; 1173 1173 } 1174 log_msg(1, "skip_incoming_..(%s)", pB);1175 log_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE");1174 mr_msg(1, "skip_incoming_..(%s)", pB); 1175 mr_msg(2, "Looking for initial START_AN_AFIO_OR_SLICE"); 1176 1176 ctrl_chr = -1; 1177 1177 while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) { … … 1182 1182 break; 1183 1183 } 1184 log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);1184 mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr); 1185 1185 wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr); 1186 log_msg(3, "Still trying to re-sync w/ tape");1186 mr_msg(3, "Still trying to re-sync w/ tape"); 1187 1187 } 1188 1188 while (ctrl_chr != BLK_START_FILE) { … … 1193 1193 break; 1194 1194 } 1195 log_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr);1195 mr_msg(1, "%lld %s %c", temp_size, temp_fname, ctrl_chr); 1196 1196 wrong_marker(BLK_START_FILE, ctrl_chr); 1197 log_msg(3, "Still trying to re-sync w/ tape");1197 mr_msg(3, "Still trying to re-sync w/ tape"); 1198 1198 } 1199 1199 pA = strrchr(temp_fname, '/'); … … 1210 1210 } 1211 1211 while (strcmp(pA, pB)) { 1212 log_msg(6, "Skipping %s (it's not %s)", temp_fname,1212 mr_msg(6, "Skipping %s (it's not %s)", temp_fname, 1213 1213 the_file_I_was_reading); 1214 1214 for (size = temp_size; size > 0; size -= bytes_to_write) { … … 1255 1255 } 1256 1256 } 1257 log_msg(2, "Reading %s (it matches %s)", temp_fname,1257 mr_msg(2, "Reading %s (it matches %s)", temp_fname, 1258 1258 the_file_I_was_reading); 1259 1259 mr_free(temp_fname); … … 1303 1303 wrong_marker(BLK_START_OF_BACKUP, ctrlchr); 1304 1304 } else { 1305 log_msg(3, "Next tape opened OK. Whoopee!");1305 mr_msg(3, "Next tape opened OK. Whoopee!"); 1306 1306 } 1307 1307 mr_free(sz_msg); … … 1381 1381 char *fname; 1382 1382 1383 log_msg(2, "I am now writing back catalog to tape");1383 mr_msg(2, "I am now writing back catalog to tape"); 1384 1384 malloc_string(fname); 1385 1385 last = g_tapecatalog->entries - 1; … … 1388 1388 g_tapecatalog->el[i].fname); 1389 1389 if (!does_file_exist(fname)) { 1390 log_msg(6, "Can't write %s - it doesn't exist.", fname);1390 mr_msg(6, "Can't write %s - it doesn't exist.", fname); 1391 1391 } else { 1392 1392 write_header_block_to_stream(length_of_file(fname), 1393 1393 "start-backcatalog-afio-or-slice", 1394 1394 BLK_START_AN_AFIO_OR_SLICE); 1395 log_msg(2, "Writing %s", fname);1395 mr_msg(2, "Writing %s", fname); 1396 1396 if (write_file_to_stream_from_file(bkpinfo, fname)) { 1397 1397 res++; 1398 log_msg(2, "%s failed", fname);1398 mr_msg(2, "%s failed", fname); 1399 1399 } 1400 1400 if (i != last) { … … 1406 1406 } 1407 1407 mr_free(fname); 1408 log_msg(2, "Finished writing back catalog to tape");1408 mr_msg(2, "Finished writing back catalog to tape"); 1409 1409 return (res); 1410 1410 } … … 1646 1646 marker_to_string(control_char), p, 1647 1647 (long) length_of_incoming_file >> 10); 1648 log_msg(6, tmp);1648 mr_msg(6, tmp); 1649 1649 /* log_tape_pos(); */ 1650 1650 return (0);
Note:
See TracChangeset
for help on using the changeset viewer.