Changeset 3827 in MondoRescue for branches/3.3/mondo/src/common
- Timestamp:
- Mar 4, 2024, 1:33:29 PM (5 months ago)
- Location:
- branches/3.3/mondo/src/common
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/mondo/src/common/libmondo-archive.c
r3826 r3827 1605 1605 } 1606 1606 1607 if (bkpinfo->call_make_iso [0] != '\0') {1607 if (bkpinfo->call_make_iso != NULL) { 1608 1608 log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso); 1609 1609 mds = media_descriptor_string(bkpinfo->backup_media_type); … … 1779 1779 } 1780 1780 1781 if (bkpinfo->call_burn_iso [0] != '\0') {1781 if (bkpinfo->call_burn_iso != NULL) { 1782 1782 log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso); 1783 1783 mds = media_descriptor_string(bkpinfo->backup_media_type); … … 1797 1797 } 1798 1798 1799 if (bkpinfo->call_after_iso [0] != '\0') {1799 if (bkpinfo->call_after_iso != NULL) { 1800 1800 mds = media_descriptor_string(bkpinfo->backup_media_type); 1801 1801 mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number); -
branches/3.3/mondo/src/common/libmondo-cli.c
r3826 r3827 792 792 793 793 if ((flag_set['A']) && (! bkpinfo->restore_data)) { 794 strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);794 mr_asprintf(bkpinfo->call_after_iso, "%s", flag_val['A']); 795 795 } 796 796 -
branches/3.3/mondo/src/common/libmondo-tools.c
r3826 r3827 470 470 // -m isn't supported by growisofs, BTW... 471 471 } else { 472 sprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);472 mr_asprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device); 473 473 } 474 474 mr_free(mondo_mkisofs_sz); … … 546 546 } 547 547 log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso); 548 sprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir);548 mr_asprintf(bkpinfo->call_make_iso, "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed, bkpinfo->tmpdir); 549 549 } else { 550 sprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed);550 mr_asprintf(bkpinfo->call_make_iso, "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -", mondo_mkisofs_sz, cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject", extra_cdrom_params, bkpinfo->media_device, bkpinfo->cdrw_speed); 551 551 } 552 552 mr_free(cdr_exe); … … 852 852 bkpinfo->restore_path[0] = '\0'; 853 853 bkpinfo->call_before_iso = NULL; 854 bkpinfo->call_make_iso [0] = '\0';855 bkpinfo->call_burn_iso [0] = '\0';856 bkpinfo->call_after_iso [0] = '\0';854 bkpinfo->call_make_iso = NULL; 855 bkpinfo->call_burn_iso = NULL; 856 bkpinfo->call_after_iso = NULL; 857 857 bkpinfo->kernel_path[0] = '\0'; 858 858 bkpinfo->netfs_mount = NULL; -
branches/3.3/mondo/src/common/mondostructures.h
r3826 r3827 545 545 * A command to call to make an ISO image. 546 546 */ 547 char call_make_iso[MAX_STR_LEN];547 char *call_make_iso; 548 548 549 549 /** 550 550 * A command to call to burn the ISO image. 551 551 */ 552 char call_burn_iso[MAX_STR_LEN];552 char *call_burn_iso; 553 553 554 554 /** 555 555 * A command to call AFTER making an ISO image. 556 556 */ 557 char call_after_iso[MAX_STR_LEN];557 char *call_after_iso; 558 558 559 559 /** -
branches/3.3/mondo/src/common/newt-specific.c
r3826 r3827 431 431 mr_free(bkpinfo->media_device); 432 432 mr_free(bkpinfo->postnuke_tarball); 433 mr_free(bkpinfo->call_burn_iso); 434 mr_free(bkpinfo->call_make_iso); 435 mr_free(bkpinfo->call_after_iso); 436 mr_free(bkpinfo->call_before_iso); 433 437 /* Then free the structure */ 434 438 paranoid_free(bkpinfo);
Note:
See TracChangeset
for help on using the changeset viewer.