Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c
- Timestamp:
- Jan 28, 2007, 7:04:41 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-archive.c
r1075 r1080 267 267 } 268 268 269 paranoid_free(command);270 paranoid_free(zipparams);271 paranoid_free(tmp);269 mr_free(command); 270 mr_free(zipparams); 271 mr_free(tmp); 272 272 return (retval); 273 273 } … … 403 403 } 404 404 } 405 paranoid_free(command);406 paranoid_free(zipparams);407 paranoid_free(tmp);405 mr_free(command); 406 mr_free(zipparams); 407 mr_free(tmp); 408 408 return (retval); 409 409 } … … 496 496 sleep(2); 497 497 } 498 paranoid_free(tmp);498 mr_free(tmp); 499 499 return (retval); 500 500 } … … 565 565 566 566 assert(bkpinfo != NULL); 567 command = m alloc(1200);567 command = mr_malloc(1200); 568 568 malloc_string(tmp); 569 569 malloc_string(scratchdir); … … 814 814 815 815 if (g_getfattr) { 816 asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);816 mr_asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir); 817 817 if (write_one_liner_data_file(tmp1, "TRUE")) { 818 818 log_msg(1, "%ld: Unable to write one-liner XATTR", 819 819 __LINE__); 820 820 } 821 paranoid_free(tmp1);821 mr_free(tmp1); 822 822 } 823 823 if (g_getfacl) { 824 asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);824 mr_asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir); 825 825 if (write_one_liner_data_file(tmp1, "TRUE")) { 826 826 log_msg(1, "%ld: Unable to write one-liner ACL", 827 827 __LINE__); 828 828 } 829 paranoid_free(tmp1);829 mr_free(tmp1); 830 830 } 831 831 … … 849 849 850 850 if (bkpinfo->backup_media_type == usb) { 851 asprintf(&tmp2, "--usb %s", bkpinfo->media_device);851 mr_asprintf(&tmp2, "--usb %s", bkpinfo->media_device); 852 852 } else { 853 asprintf(&tmp2,"");853 mr_asprintf(&tmp2,""); 854 854 } 855 855 … … 935 935 } 936 936 } 937 paranoid_free(tmp);938 paranoid_free(use_lzo_sz);939 paranoid_free(use_gzip_sz);940 paranoid_free(scratchdir);941 paranoid_free(use_comp_sz);942 paranoid_free(bootldr_str);943 paranoid_free(tape_device);944 paranoid_free(last_filelist_number);945 paranoid_free(broken_bios_sz);946 paranoid_free(cd_recovery_sz);947 paranoid_free(tape_size_sz);948 paranoid_free(devs_to_exclude);949 paranoid_free(use_lilo_sz);950 paranoid_free(value);951 paranoid_free(bootdev);952 paranoid_free(command);953 paranoid_free(use_star_sz);937 mr_free(tmp); 938 mr_free(use_lzo_sz); 939 mr_free(use_gzip_sz); 940 mr_free(scratchdir); 941 mr_free(use_comp_sz); 942 mr_free(bootldr_str); 943 mr_free(tape_device); 944 mr_free(last_filelist_number); 945 mr_free(broken_bios_sz); 946 mr_free(cd_recovery_sz); 947 mr_free(tape_size_sz); 948 mr_free(devs_to_exclude); 949 mr_free(use_lilo_sz); 950 mr_free(value); 951 mr_free(bootdev); 952 mr_free(command); 953 mr_free(use_star_sz); 954 954 return (res); 955 955 } … … 1122 1122 log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(), 1123 1123 this_thread_no); 1124 paranoid_free(archiving_filelist_fname);1125 paranoid_free(archiving_afioball_fname);1126 paranoid_free(curr_xattr_list_fname);1127 paranoid_free(curr_acl_list_fname);1128 paranoid_free(tmp);1124 mr_free(archiving_filelist_fname); 1125 mr_free(archiving_afioball_fname); 1126 mr_free(curr_xattr_list_fname); 1127 mr_free(curr_acl_list_fname); 1128 mr_free(tmp); 1129 1129 pthread_exit(NULL); 1130 1130 } … … 1259 1259 BLK_START_OF_BACKUP); 1260 1260 } 1261 paranoid_free(command);1262 paranoid_free(tmpfile);1263 paranoid_free(data_disks_file);1261 mr_free(command); 1262 mr_free(tmpfile); 1263 mr_free(data_disks_file); 1264 1264 return (retval); 1265 1265 } … … 1350 1350 } 1351 1351 unlink(tempfile); 1352 paranoid_free(command);1353 paranoid_free(tempfile);1352 mr_free(command); 1353 mr_free(tempfile); 1354 1354 return (res); 1355 1355 } … … 1379 1379 assert_string_is_neither_NULL_nor_zerolength(device); 1380 1380 malloc_string(title); 1381 command = m alloc(1000);1381 command = mr_malloc(1000); 1382 1382 if (!system("which superformat > /dev/null 2> /dev/null")) { 1383 1383 sprintf(command, "superformat %s", device); … … 1395 1395 } 1396 1396 } 1397 paranoid_free(title);1398 paranoid_free(command);1397 mr_free(title); 1398 mr_free(command); 1399 1399 return (res); 1400 1400 } … … 1485 1485 log_msg(8, "here"); 1486 1486 assert(bkpinfo != NULL); 1487 tmp = m alloc(MAX_STR_LEN * 2);1487 tmp = mr_malloc(MAX_STR_LEN * 2); 1488 1488 malloc_string(result_str); 1489 1489 malloc_string(curr_xattr_list_fname); … … 1493 1493 malloc_string(storing_afioball_fname); 1494 1494 transfer_block = 1495 m alloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);1495 mr_malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64); 1496 1496 memset((void *) transfer_block, 0, 1497 1497 sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64); … … 1654 1654 } 1655 1655 log_to_screen(tmp); 1656 paranoid_free(transfer_block);1657 paranoid_free(result_str);1658 paranoid_free(storing_filelist_fname);1659 paranoid_free(media_usage_comment);1660 paranoid_free(storing_afioball_fname);1661 paranoid_free(curr_xattr_list_fname);1662 paranoid_free(curr_acl_list_fname);1656 mr_free(transfer_block); 1657 mr_free(result_str); 1658 mr_free(storing_filelist_fname); 1659 mr_free(media_usage_comment); 1660 mr_free(storing_afioball_fname); 1661 mr_free(curr_xattr_list_fname); 1662 mr_free(curr_acl_list_fname); 1663 1663 return (retval); 1664 1664 } … … 1718 1718 malloc_string(sz_blank_disk); 1719 1719 malloc_string(fnam); 1720 tmp = m alloc(1200);1721 tmp2 = m alloc(1200);1722 tmp3 = m alloc(1200);1720 tmp = mr_malloc(1200); 1721 tmp2 = mr_malloc(1200); 1722 tmp3 = mr_malloc(1200); 1723 1723 assert(bkpinfo != NULL); 1724 1724 assert_string_is_neither_NULL_nor_zerolength(destfile); … … 1754 1754 } 1755 1755 */ 1756 free(tmp2); 1757 free(tmp3); 1758 tmp2 = NULL; 1759 tmp3 = NULL; 1756 mr_free(tmp2); 1757 mr_free(tmp3); 1760 1758 if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) { 1761 1759 popup_and_OK("Please insert new media and press Enter."); … … 2007 2005 log_msg(1, "WARNING - make_iso_fs returned an error"); 2008 2006 } 2009 paranoid_free(old_pwd);2010 paranoid_free(result_sz);2011 paranoid_free(message_to_screen);2012 paranoid_free(sz_blank_disk);2013 paranoid_free(fnam);2014 paranoid_free(tmp);2007 mr_free(old_pwd); 2008 mr_free(result_sz); 2009 mr_free(message_to_screen); 2010 mr_free(sz_blank_disk); 2011 mr_free(fnam); 2012 mr_free(tmp); 2015 2013 return (retval); 2016 2014 } … … 2220 2218 close_progress_form(); 2221 2219 paranoid_fclose(fin); 2222 paranoid_free(tmp);2223 paranoid_free(bigfile_fname);2224 paranoid_free(sz_devfile);2220 mr_free(tmp); 2221 mr_free(bigfile_fname); 2222 mr_free(sz_devfile); 2225 2223 return (retval); 2226 2224 } … … 2255 2253 malloc_string(curr_acl_list_fname); 2256 2254 2257 tmp = m alloc(MAX_STR_LEN * 2);2255 tmp = mr_malloc(MAX_STR_LEN * 2); 2258 2256 2259 2257 sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir); … … 2360 2358 } 2361 2359 log_to_screen(tmp); 2362 paranoid_free(tmp);2363 paranoid_free(curr_filelist_fname);2364 paranoid_free(curr_afioball_fname);2365 paranoid_free(media_usage_comment);2366 paranoid_free(curr_xattr_list_fname);2367 paranoid_free(curr_acl_list_fname);2360 mr_free(tmp); 2361 mr_free(curr_filelist_fname); 2362 mr_free(curr_afioball_fname); 2363 mr_free(media_usage_comment); 2364 mr_free(curr_xattr_list_fname); 2365 mr_free(curr_acl_list_fname); 2368 2366 return (retval); 2369 2367 } … … 2446 2444 malloc_string(xattr_fname); 2447 2445 malloc_string(acl_fname); 2448 command = m alloc(1200);2446 command = mr_malloc(1200); 2449 2447 mvaddstr_and_log_it(g_currentY, 0, 2450 2448 "Archiving large files to media "); … … 2496 2494 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 2497 2495 } 2498 paranoid_free(blah);2499 paranoid_free(biggielist);2500 paranoid_free(command);2501 paranoid_free(xattr_fname);2502 paranoid_free(acl_fname);2496 mr_free(blah); 2497 mr_free(biggielist); 2498 mr_free(command); 2499 mr_free(xattr_fname); 2500 mr_free(acl_fname); 2503 2501 return (retval); 2504 2502 } … … 2552 2550 assert(bkpinfo != NULL); 2553 2551 malloc_string(curr_file); 2554 tmp = m alloc(1200);2552 tmp = mr_malloc(1200); 2555 2553 would_occupy = space_occupied_by_cd(bkpinfo->scratchdir); 2556 2554 va_start(ap, files_to_add); // initialize the variable arguments … … 2606 2604 "Warning - errors occurred while I was adding files to CD dir"); 2607 2605 } 2608 paranoid_free(tmp);2609 paranoid_free(curr_file);2606 mr_free(tmp); 2607 mr_free(curr_file); 2610 2608 return (retval); 2611 2609 } … … 2768 2766 } 2769 2767 } 2770 paranoid_free(tmp);2771 paranoid_free(comment);2772 paranoid_free(bootdisk_dev);2773 paranoid_free(datadisk_dev);2768 mr_free(tmp); 2769 mr_free(comment); 2770 mr_free(bootdisk_dev); 2771 mr_free(datadisk_dev); 2774 2772 return (res); 2775 2773 } … … 2913 2911 "Warning - errors occurred while I was adding file to tape"); 2914 2912 } 2915 paranoid_free(curr_file);2913 mr_free(curr_file); 2916 2914 return (retval); 2917 2915 } … … 2973 2971 } 2974 2972 // retract_CD_tray_and_defeat_autorun(); 2975 paranoid_free(tmp);2976 paranoid_free(cdrecord);2977 paranoid_free(bkp);2973 mr_free(tmp); 2974 mr_free(cdrecord); 2975 mr_free(bkp); 2978 2976 return (res); 2979 2977 } … … 3136 3134 log_to_screen("Proceeding w/ %s in drive.", 3137 3135 media_descriptor_string(g_backup_media_type)); 3138 paranoid_free(tmp);3139 paranoid_free(szmsg);3140 paranoid_free(cdrom_dev);3141 paranoid_free(cdrw_dev);3142 paranoid_free(mtpt);3143 paranoid_free(szcdno);3144 paranoid_free(szserfname);3145 paranoid_free(our_serial_str);3146 paranoid_free(szunmount);3136 mr_free(tmp); 3137 mr_free(szmsg); 3138 mr_free(cdrom_dev); 3139 mr_free(cdrw_dev); 3140 mr_free(mtpt); 3141 mr_free(szcdno); 3142 mr_free(szserfname); 3143 mr_free(our_serial_str); 3144 mr_free(szunmount); 3147 3145 if (pmountable) { 3148 3146 if (attempt_to_mount_returned_this) { … … 3265 3263 malloc_string(file_to_archive); 3266 3264 malloc_string(suffix); 3267 command = m alloc(MAX_STR_LEN * 8);3265 command = mr_malloc(MAX_STR_LEN * 8); 3268 3266 3269 3267 biggiestruct.for_backward_compatibility = '\n'; 3270 3268 biggiestruct.use_ntfsprog = use_ntfsprog; 3271 if (!(tempblock = (char *) malloc(256 * 1024))) { 3272 fatal_error("malloc error 256*1024"); 3273 } 3269 tempblock = (char *) mr_malloc(256 * 1024); 3274 3270 optimal_set_size = bkpinfo->optimal_set_size; 3275 3271 if (is_this_file_compressed(biggie_filename) … … 3338 3334 biggie_filename); 3339 3335 log_to_screen(tmp); 3340 paranoid_free(tempblock);3341 paranoid_free(tmp);3342 paranoid_free(checksum_line);3343 paranoid_free(command);3336 mr_free(tempblock); 3337 mr_free(tmp); 3338 mr_free(checksum_line); 3339 mr_free(command); 3344 3340 return (1); 3345 3341 } … … 3473 3469 } 3474 3470 log_msg(1, tmp); 3475 paranoid_free(tempblock);3476 paranoid_free(tmp);3477 paranoid_free(checksum_line);3478 paranoid_free(command);3479 paranoid_free(curr_slice_fname_uncompressed);3480 paranoid_free(curr_slice_fname_compressed);3481 paranoid_free(file_to_archive);3482 paranoid_free(suffix);3471 mr_free(tempblock); 3472 mr_free(tmp); 3473 mr_free(checksum_line); 3474 mr_free(command); 3475 mr_free(curr_slice_fname_uncompressed); 3476 mr_free(curr_slice_fname_compressed); 3477 mr_free(file_to_archive); 3478 mr_free(suffix); 3483 3479 return (retval); 3484 3480 } … … 3525 3521 sprintf(tmp, "ls -l %s", dir); 3526 3522 run_program_and_log_output(tmp, FALSE); 3527 paranoid_free(tmp);3528 paranoid_free(dir);3523 mr_free(tmp); 3524 mr_free(dir); 3529 3525 } 3530 3526 … … 3573 3569 #endif 3574 3570 log_msg(2, "Returning from writing final ISO (res=%d)", res); 3575 paranoid_free(tmp);3571 mr_free(tmp); 3576 3572 return (res); 3577 3573 } … … 3740 3736 3741 3737 bkpinfo->verify_data = orig_vfy_flag_val; 3742 paranoid_free(tmp);3743 paranoid_free(cdno_fname);3744 paranoid_free(lastcd_fname);3745 paranoid_free(isofile);3738 mr_free(tmp); 3739 mr_free(cdno_fname); 3740 mr_free(lastcd_fname); 3741 mr_free(isofile); 3746 3742 return (0); 3747 3743 } … … 3843 3839 } 3844 3840 } 3845 paranoid_free(tmp);3841 mr_free(tmp); 3846 3842 return (retval); 3847 3843 } … … 3931 3927 paranoid_fclose(fin); 3932 3928 paranoid_fclose(fout); 3933 paranoid_free(tmp);3934 paranoid_free(title);3929 mr_free(tmp); 3930 mr_free(title); 3935 3931 close_evalcall_form(); 3936 3932 return (res);
Note:
See TracChangeset
for help on using the changeset viewer.