Changeset 3150 in MondoRescue for branches/3.0/mondo/src/common/libmondo-devices.c
- Timestamp:
- Jun 21, 2013, 6:48:23 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/mondo/src/common/libmondo-devices.c
r3111 r3150 2277 2277 finish(1); 2278 2278 } 2279 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 2280 bkpinfo->media_size[i] = atoi(sz_size); 2281 } 2282 if (bkpinfo->media_size[0] <= 0) { 2279 bkpinfo->media_size = atoi(sz_size); 2280 if (bkpinfo->media_size <= 0) { 2283 2281 log_to_screen("User has chosen not to backup the PC"); 2284 2282 finish(1); … … 2357 2355 2358 2356 if (bkpinfo->backup_media_type == cdstream) { 2359 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 2360 bkpinfo->media_size[i] = 650; 2361 } 2357 bkpinfo->media_size = 650; 2362 2358 } 2363 2359 break; … … 2415 2411 2416 2412 if (sz_size[0] == '\0') { 2417 bkpinfo->media_size [0]= 0;2413 bkpinfo->media_size = 0; 2418 2414 } else { 2419 bkpinfo->media_size[0] = 2420 friendly_sizestr_to_sizelong(sz_size) / 2 - 50; 2421 } 2422 log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]); 2423 if (bkpinfo->media_size[0] <= 0) { 2424 bkpinfo->media_size[0] = 0; 2425 } 2426 for (i = 1; i <= MAX_NOOF_MEDIA; i++) { 2427 bkpinfo->media_size[i] = bkpinfo->media_size[0]; 2415 bkpinfo->media_size = friendly_sizestr_to_sizelong(sz_size) / 2 - 50; 2416 } 2417 log_msg(4, "media_size = %ld", bkpinfo->media_size); 2418 if (bkpinfo->media_size <= 0) { 2419 bkpinfo->media_size = 0; 2428 2420 } 2429 2421 bkpinfo->use_obdr = ask_me_yes_or_no … … 2511 2503 strcpy(sz_size, "0"); 2512 2504 } 2513 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 2514 bkpinfo->media_size[i] = atoi(sz_size); 2515 } 2516 if (bkpinfo->media_size[0] < 0) { 2505 bkpinfo->media_size = atoi(sz_size); 2506 if (bkpinfo->media_size < 0) { 2517 2507 log_to_screen("User has chosen not to backup the PC"); 2518 2508 finish(1); … … 2658 2648 finish(1); 2659 2649 } 2660 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 2661 bkpinfo->media_size[i] = atoi(sz_size); 2662 } 2650 bkpinfo->media_size = atoi(sz_size); 2663 2651 } else { 2664 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 2665 bkpinfo->media_size[i] = 650; 2666 } 2652 bkpinfo->media_size = 650; 2667 2653 } 2668 2654 } … … 2870 2856 2871 2857 log_it("media device = %s", bkpinfo->media_device); 2872 log_it("media size = %ld", bkpinfo->media_size [1]);2858 log_it("media size = %ld", bkpinfo->media_size); 2873 2859 log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type)); 2874 2860 log_it("prefix = %s", bkpinfo->prefix); … … 2888 2874 log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, 2889 2875 bkpinfo->boot_loader); 2890 if (bkpinfo->media_size [0]< 0) {2876 if (bkpinfo->media_size < 0) { 2891 2877 if (archiving_to_media) { 2892 2878 fatal_error("Media size is less than zero."); 2893 2879 } else { 2894 2880 log_msg(2, "Warning - media size is less than zero."); 2895 bkpinfo->media_size [0]= 0;2881 bkpinfo->media_size = 0; 2896 2882 } 2897 2883 }
Note:
See TracChangeset
for help on using the changeset viewer.