Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-filelist.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-filelist.c
r1075 r1080 18 18 #include "libmondo-tools-EXT.h" 19 19 #include "mr_str.h" 20 #include "mr_mem.h" 20 21 21 22 #include <time.h> … … 148 149 149 150 end_of_func: 150 paranoid_free(filelist);151 paranoid_free(tempfile);152 paranoid_free(cksumlist);153 paranoid_free(dev);154 paranoid_free(tmp);151 mr_free(filelist); 152 mr_free(tempfile); 153 mr_free(cksumlist); 154 mr_free(dev); 155 mr_free(tmp); 155 156 return (retval); 156 157 } … … 191 192 } 192 193 } 193 paranoid_free(tmp_fname);194 paranoid_free(command);194 mr_free(tmp_fname); 195 mr_free(command); 195 196 log_msg(1, "Finished sorting file %s", orig_fname); 196 197 return (retval); … … 243 244 malloc_string(outfname); 244 245 malloc_string(biggie_fname); 245 incoming = m alloc(MAX_STR_LEN * 2);246 incoming = mr_malloc(MAX_STR_LEN * 2); 246 247 malloc_string(tmp); 247 248 malloc_string(acl_fname); … … 364 365 #endif 365 366 end_of_func: 366 paranoid_free(outfname);367 paranoid_free(biggie_fname);368 paranoid_free(incoming);369 paranoid_free(tmp);370 paranoid_free(acl_fname);371 paranoid_free(xattr_fname);367 mr_free(outfname); 368 mr_free(biggie_fname); 369 mr_free(incoming); 370 mr_free(tmp); 371 mr_free(acl_fname); 372 mr_free(xattr_fname); 372 373 return (err ? 0 : curr_set_no + 1); 373 374 } … … 419 420 } 420 421 filelist->ch = '\0'; 421 paranoid_free(filelist);422 mr_free(filelist); 422 423 depth--; 423 424 if (depth == 0) { … … 448 449 } 449 450 paranoid_pclose(pattr); 450 paranoid_free(tmp);451 mr_free(tmp); 451 452 return (0); 452 453 } … … 474 475 log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname); 475 476 fclose(fin); 476 paranoid_free(pout_command);477 mr_free(pout_command); 477 478 return (4); 478 479 } … … 487 488 asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\')); 488 489 asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE); 489 paranoid_free(strtmp);490 mr_free(strtmp); 490 491 call_exe_and_pipe_output_to_fd(syscall, pout); 491 paranoid_free(syscall);492 mr_free(syscall); 492 493 } 493 494 paranoid_fclose(fin); 494 495 paranoid_pclose(pout); 495 paranoid_free(file_to_analyze);496 paranoid_free(pout_command);496 mr_free(file_to_analyze); 497 mr_free(pout_command); 497 498 return (0); 498 499 } … … 514 515 iamhere(command); 515 516 retval = system(command); 516 paranoid_free(command);517 mr_free(command); 517 518 } 518 519 return (retval); … … 529 530 sprintf(command, "touch %s", fattr_fname); 530 531 run_program_and_log_output(command, 8); 531 paranoid_free(command);532 mr_free(command); 532 533 // sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary 533 534 retval = … … 561 562 log_msg(1, "command = %s", command); 562 563 retval = system(command); 563 paranoid_free(command);564 mr_free(command); 564 565 log_msg(1, "Returning w/ retval=%d", retval); 565 566 return (retval); … … 569 570 "original_exat_fname %s is empty or missing, so no need to set EXAT list", 570 571 original_exat_fname); 571 paranoid_free(command);572 mr_free(command); 572 573 return (0); 573 574 } … … 679 680 680 681 unlink(masklist); 681 paranoid_free(current_subset_file);682 paranoid_free(current_master_file);683 paranoid_free(syscall_pout);684 paranoid_free(syscall_pin);685 paranoid_free(masklist);686 paranoid_free(incoming);687 paranoid_free(command);682 mr_free(current_subset_file); 683 mr_free(current_master_file); 684 mr_free(syscall_pout); 685 mr_free(syscall_pin); 686 mr_free(masklist); 687 mr_free(incoming); 688 mr_free(command); 688 689 return (retval); 689 690 } … … 805 806 806 807 /* add here */ 807 if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) { 808 log_to_screen("failed to malloc"); 809 depth--; 810 return (1); 811 } 808 newnode = (struct s_node *) mr_malloc(sizeof(struct s_node)); 812 809 if (char_to_add < node->ch) // add to the left of node 813 810 { … … 835 832 log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1); 836 833 for (i = 1; i < noof_chars; i++) { 837 if (! 838 (node->down = 839 (struct s_node *) malloc(sizeof(struct s_node)))) { 840 log_to_screen("%s - failed to malloc", string_to_add); 841 return (1); 834 node->down = (struct s_node *) mr_malloc(sizeof(struct s_node)); 842 835 } 843 836 node = node->down; … … 901 894 } 902 895 g_original_noof_lines_in_filelist = lines_in_filelist; 903 if (!(filelist = (struct s_node *) malloc(sizeof(struct s_node)))) { 904 return (NULL); 905 } 896 filelist = (struct s_node *) mr_malloc(sizeof(struct s_node)); 906 897 filelist->ch = '/'; 907 898 filelist->right = NULL; 908 filelist->down = m alloc(sizeof(struct s_node));899 filelist->down = mr_malloc(sizeof(struct s_node)); 909 900 filelist->expanded = filelist->selected = FALSE; 910 901 (filelist->down)->ch = '\0'; … … 1396 1387 while((token = mr_strtok (sth, delims, &lastpos))) { 1397 1388 asprintf(&strtmp,"%s", find_excludes); 1398 paranoid_free(find_excludes);1389 mr_free(find_excludes); 1399 1390 asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token); 1400 paranoid_free(strtmp);1401 paranoid_free(token);1391 mr_free(strtmp); 1392 mr_free(token); 1402 1393 } 1403 1394 #if linux … … 1412 1403 dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist); 1413 1404 #endif 1414 paranoid_free(find_excludes);1405 mr_free(find_excludes); 1415 1406 log_msg(5, "find command = %s", strtmp); 1416 1407 system(strtmp); 1417 paranoid_free(strtmp);1408 mr_free(strtmp); 1418 1409 sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist); 1419 1410 g_skeleton_entries = … … 1520 1511 if (!depth) { 1521 1512 close_evalcall_form(); 1522 paranoid_free(name_of_evalcall_form);1523 paranoid_free(find_skeleton_marker);1513 mr_free(name_of_evalcall_form); 1514 mr_free(find_skeleton_marker); 1524 1515 unlink(g_skeleton_filelist); 1525 1516 log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries); 1526 1517 } 1527 paranoid_free(tmp);1528 paranoid_free(sth_B);1529 paranoid_free(ith_B);1530 paranoid_free(new_with_spaces);1518 mr_free(tmp); 1519 mr_free(sth_B); 1520 mr_free(ith_B); 1521 mr_free(new_with_spaces); 1531 1522 return (0); 1532 1523 } … … 1593 1584 malloc_string(sz_filelist); 1594 1585 malloc_string(g_skeleton_filelist); 1595 if (!(exclude_paths = malloc(1000))) { 1596 fatal_error("Cannot malloc exclude_paths"); 1597 } 1586 exclude_paths = mr_malloc(1000); 1598 1587 log_msg(3, "Trying to write test string to exclude_paths"); 1599 1588 strcpy(exclude_paths, "/blah /froo"); … … 1688 1677 paranoid_system(command); 1689 1678 log_msg(2, "Freeing variables"); 1690 paranoid_free(sz_filelist);1691 paranoid_free(command);1692 paranoid_free(exclude_paths);1693 paranoid_free(tmp);1694 paranoid_free(g_skeleton_filelist);1679 mr_free(sz_filelist); 1680 mr_free(command); 1681 mr_free(exclude_paths); 1682 mr_free(tmp); 1683 mr_free(g_skeleton_filelist); 1695 1684 log_msg(2, "Exiting"); 1696 1685 return (0); … … 1838 1827 paranoid_fclose(fout); 1839 1828 paranoid_fclose(fin); 1840 paranoid_free(fname);1841 paranoid_free(tmp);1829 mr_free(fname); 1830 mr_free(tmp); 1842 1831 return (retval); 1843 1832 } … … 1895 1884 } 1896 1885 paranoid_fclose(fin); 1897 paranoid_free(tmp);1886 mr_free(tmp); 1898 1887 return (0); 1899 1888 }
Note:
See TracChangeset
for help on using the changeset viewer.