Changeset 1365 in MondoRescue
- Timestamp:
- Apr 30, 2007, 1:50:20 AM (18 years ago)
- Location:
- branches/stable/mondo/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-archive.c
r1326 r1365 600 600 601 601 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 602 mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size [1]);602 mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size); 603 603 mr_asprintf(&tape_device, bkpinfo->media_device); 604 604 } else { … … 843 843 mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device); 844 844 mr_fprintf(fd1, "media-dev=%s\n", bkpinfo->media_device); 845 mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size [1]);845 mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size); 846 846 } 847 847 if (bkpinfo->compression_level > 0) { … … 2540 2540 va_end(ap); 2541 2541 2542 if (bkpinfo->media_size [g_current_media_number] <= 0) {2542 if (bkpinfo->media_size <= 0L) { 2543 2543 fatal_error("move_files_to_cd() - unknown media size"); 2544 2544 } 2545 if (would_occupy / 1024 > bkpinfo->media_size [g_current_media_number]) {2545 if (would_occupy / 1024 > bkpinfo->media_size) { 2546 2546 /* FALSE because this is not the last CD we'll write */ 2547 2547 res = write_iso_and_go_on(bkpinfo, FALSE); … … 3570 3570 assert(bkpinfo != NULL); 3571 3571 orig_vfy_flag_val = bkpinfo->verify_data; 3572 if (bkpinfo->media_size [g_current_media_number] <= 0) {3572 if (bkpinfo->media_size <= 0L) { 3573 3573 fatal_error("write_iso_and_go_on() - unknown media size"); 3574 3574 } … … 3614 3614 mr_free(lastcd_fname); 3615 3615 3616 if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > 3617 bkpinfo->media_size[g_current_media_number]) { 3616 if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) { 3618 3617 mr_asprintf(&tmp, 3619 3618 "Warning! %s is too big. It occupies %ld KB, which is more than the %ld KB allowed.", 3620 3619 media_descriptor_string(bkpinfo->backup_media_type), 3621 3620 (long) space_occupied_by_cd(bkpinfo->scratchdir), 3622 (long) bkpinfo->media_size[g_current_media_number]);3621 bkpinfo->media_size); 3623 3622 log_to_screen(tmp); 3624 3623 mr_free(tmp); … … 3679 3678 3680 3679 g_current_media_number++; 3681 if (g_current_media_number > MAX_NOOF_MEDIA) {3682 fatal_error("Too many CD-R(W)'s. Use tape or net.");3683 }3684 3680 wipe_archives(bkpinfo->scratchdir); 3685 3681 mr_asprintf(&tmp, "rm -Rf %s/images/*gz %s/images/*data*img", -
branches/stable/mondo/src/common/libmondo-devices.c
r1344 r1365 1526 1526 mr_free(comment); 1527 1527 1528 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1529 bkpinfo->media_size[i] = atoi(sz_size); 1530 } 1528 bkpinfo->media_size = atol(sz_size); 1531 1529 mr_free(sz_size); 1532 1530 1533 if (bkpinfo->media_size [0] <= 0) {1531 if (bkpinfo->media_size <= 0L) { 1534 1532 log_to_screen(_("User has chosen not to backup the PC")); 1535 1533 finish(1); … … 1597 1595 } 1598 1596 if (bkpinfo->backup_media_type == cdstream) { 1599 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1600 bkpinfo->media_size[i] = 650; 1601 } 1597 bkpinfo->media_size = (long)650; 1602 1598 } 1603 1599 break; … … 1652 1648 mr_msg(4, "sz_size = %s", sz_size); 1653 1649 mr_free(sz_size); 1654 bkpinfo->media_size[0] = 0; 1655 mr_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]); 1656 if (bkpinfo->media_size[0] <= 0) { 1657 bkpinfo->media_size[0] = 0; 1658 } 1659 for (i = 1; i <= MAX_NOOF_MEDIA; i++) { 1660 bkpinfo->media_size[i] = bkpinfo->media_size[0]; 1650 bkpinfo->media_size = 0L; 1651 mr_msg(4, "media_size = %ld", bkpinfo->media_size); 1652 if (bkpinfo->media_size <= 0L) { 1653 bkpinfo->media_size = 0L; 1661 1654 } 1662 1655 if (archiving_to_media) { … … 1715 1708 } 1716 1709 mr_free(comment); 1717 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1718 bkpinfo->media_size[i] = atoi(sz_size); 1719 } 1720 if (bkpinfo->media_size[0] <= 0) { 1710 bkpinfo->media_size = atol(sz_size); 1711 if (bkpinfo->media_size <= 0L) { 1721 1712 log_to_screen(_("User has chosen not to backup the PC")); 1722 1713 finish(1); … … 1796 1787 mr_msg(3, "prefix set to %s", bkpinfo->prefix); 1797 1788 1798 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1799 bkpinfo->media_size[i] = 650; 1800 } 1789 bkpinfo->media_size = (long)650; 1801 1790 mr_msg(3, "Just set nfs_remote_dir to %s", 1802 1791 bkpinfo->nfs_remote_dir); … … 1826 1815 finish(1); 1827 1816 } 1828 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1829 bkpinfo->media_size[i] = atoi(sz_size); 1830 } 1817 bkpinfo->media_size = atol(sz_size); 1831 1818 } else { 1832 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1833 bkpinfo->media_size[i] = 650; 1834 } 1819 bkpinfo->media_size = (long)650; 1835 1820 } 1836 1821 } … … 1986 1971 1987 1972 log_it("media device = %s", bkpinfo->media_device); 1988 log_it("media size = %ld", bkpinfo->media_size [1]);1973 log_it("media size = %ld", bkpinfo->media_size); 1989 1974 log_it("media type = %s", bkpinfo->backup_media_string); 1990 1975 log_it("prefix = %s", bkpinfo->prefix); … … 1996 1981 log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, 1997 1982 bkpinfo->boot_loader); 1998 if (bkpinfo->media_size [0] < 0) {1983 if (bkpinfo->media_size < 0L) { 1999 1984 if (archiving_to_media) { 2000 1985 fatal_error("Media size is less than zero."); 2001 1986 } else { 2002 1987 mr_msg(2, "Warning - media size is less than zero."); 2003 bkpinfo->media_size [0] = 0;1988 bkpinfo->media_size = 0L; 2004 1989 } 2005 1990 } -
branches/stable/mondo/src/common/libmondo-files.c
r1213 r1365 1163 1163 long long scratchLL; 1164 1164 1165 if (bkpinfo->media_size [1] <= 0|| bkpinfo->backup_media_type == nfs) {1165 if (bkpinfo->media_size <= 0L || bkpinfo->backup_media_type == nfs) { 1166 1166 log_to_screen("Number of media required: UNKNOWN"); 1167 1167 return; … … 1172 1172 (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size) 1173 1173 + (long long) (size_of_all_biggiefiles_K(bkpinfo)); 1174 scratchLL = (scratchLL / 1024) / bkpinfo->media_size [1];1174 scratchLL = (scratchLL / 1024) / bkpinfo->media_size; 1175 1175 scratchLL++; 1176 1176 if (bkpinfo->use_lzo) { -
branches/stable/mondo/src/common/libmondo-stream.c
r1362 r1365 219 219 (void) fwrite(blk, 1, 256 * 1024, g_tape_stream); 220 220 if (should_we_write_to_next_tape 221 (bkpinfo->media_size [g_current_media_number], (off_t)256 * 1024)) {221 (bkpinfo->media_size, (off_t)256 * 1024)) { 222 222 start_to_write_to_next_tape(bkpinfo); 223 223 } … … 1306 1306 log_it("New tape requested."); 1307 1307 insist_on_this_tape_number(g_current_media_number + 1); // will increment g_current_media, too 1308 if (g_current_media_number > MAX_NOOF_MEDIA) {1309 res++;1310 log_to_screen(_("Too many tapes. Man, you need to use nfs!"));1311 }1312 1308 if (bkpinfo->backup_media_type == cdstream) { 1313 1309 mr_asprintf(&command, … … 1502 1498 filesize = length_of_file(infile); 1503 1499 if (should_we_write_to_next_tape 1504 (bkpinfo->media_size [g_current_media_number], filesize)) {1500 (bkpinfo->media_size, filesize)) { 1505 1501 start_to_write_to_next_tape(bkpinfo); 1506 1502 write_backcatalog_to_tape(bkpinfo); -
branches/stable/mondo/src/common/libmondo-string.c
r1241 r1365 875 875 assert(bkpinfo != NULL); 876 876 877 if (bkpinfo->media_size [g_current_media_number] <= 0) {877 if (bkpinfo->media_size <= 0L) { 878 878 sprintf(outstr, _("Volume %d: %'lld kilobytes archived so far"), 879 879 g_current_media_number, g_tape_posK); … … 885 885 percentage = 886 886 (int) (g_tape_posK / 10 / 887 bkpinfo->media_size [g_current_media_number]);887 bkpinfo->media_size); 888 888 if (percentage > 100) { 889 889 percentage = 100; … … 893 893 percentage = 894 894 (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / 895 bkpinfo->media_size [g_current_media_number]);895 bkpinfo->media_size); 896 896 sprintf(outstr, "%s %d: [", 897 897 bkpinfo->backup_media_string, -
branches/stable/mondo/src/common/libmondo-tools.c
r1344 r1365 709 709 bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE; 710 710 bkpinfo->media_device[0] = '\0'; 711 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 712 bkpinfo->media_size[i] = -1; 713 } 711 bkpinfo->media_size = 0L; 714 712 bkpinfo->boot_loader = '\0'; 715 713 bkpinfo->boot_device[0] = '\0'; -
branches/stable/mondo/src/common/mondostructures.h
r1364 r1365 6 6 */ 7 7 8 9 /* @def MAX_NOOF_MEDIA The maximum number of media that can be used in any one backup. */10 11 /* So we can override it in config.h: */12 //#ifndef MAX_NOOF_MEDIA13 #define MAX_NOOF_MEDIA 5014 //#endif15 8 16 9 /** … … 318 311 319 312 /** 320 * An array containing the sizes of each media in our backup set, in MB. 321 * For example, media 1's size would be stored in media_size[1]. 322 * Element 0 is unused. 313 * 314 * The size of the media in our backup set, in MB. 323 315 * If the size should be autodetected, make it -1 (preferable) or 0. 324 * @bug This should probably be only one variable, not an array.325 */ 326 long media_size [MAX_NOOF_MEDIA + 1];316 * 317 */ 318 long media_size; 327 319 328 320 /** -
branches/stable/mondo/src/mondoarchive/mondo-cli.c
r1264 r1365 92 92 flag_set[i] = FALSE; 93 93 } 94 for (j = 1; j <= MAX_NOOF_MEDIA; j++) { 95 bkpinfo->media_size[j] = 650; 96 } /* default */ 94 bkpinfo->media_size = (long)650; 97 95 res = 98 96 retrieve_switches_from_command_line(argc, argv, flag_val, … … 155 153 assert(value != NULL); 156 154 157 bkpinfo->media_size[0] = -1; /* dummy value */ 158 for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ','); 159 j++, p = strchr(p, ',') + 1) { 155 bkpinfo->media_size = 0L; /* dummy value */ 156 for ( p = value; strchr(p, ','); p = strchr(p, ',') + 1) { 160 157 mr_asprintf(&tmp, p); 161 158 q = strchr(tmp, ','); … … 163 160 *q = '\0'; 164 161 } 165 bkpinfo->media_size [j]= friendly_sizestr_to_sizelong(tmp);162 bkpinfo->media_size = friendly_sizestr_to_sizelong(tmp); 166 163 mr_free(tmp); 167 164 168 mr_msg(3, "media_size[%d] = %ld", j, 169 bkpinfo->media_size[j]); 170 } 171 for (; j <= MAX_NOOF_MEDIA; j++) { 172 bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p); 173 } 174 for (j = 1; j <= MAX_NOOF_MEDIA; j++) { 175 if (bkpinfo->media_size[j] <= 0) { 176 mr_msg(1, "You gave media #%d an invalid size\n", j); 177 return (-1); 178 } 165 mr_msg(3, "media_size = %ld", bkpinfo->media_size); 166 } 167 if (bkpinfo->media_size <= 0L) { 168 mr_msg(1, "You gave media an invalid size\n"); 169 return (-1); 179 170 } 180 171 return (0); … … 469 460 } 470 461 } else if (flag_set['u'] || flag_set['t']) { 471 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 472 bkpinfo->media_size[i] = 0; 473 } 462 bkpinfo->media_size = 0L; 474 463 } else { 475 464 retval++;
Note:
See TracChangeset
for help on using the changeset viewer.