Changeset 1161 in MondoRescue for trunk/mondo/src/common/libmondo-filelist.c
- Timestamp:
- Feb 14, 2007, 1:13:49 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-filelist.c
r1106 r1161 19 19 #include "mr_str.h" 20 20 #include "mr_mem.h" 21 #include "mr_msg.h" 21 22 22 23 #include <time.h> … … 332 333 then update_progress_form() won't show the "time taken / time remaining" 333 334 line. The bug only crops up AFTER the call to chop_filelist(). Weird. */ 334 #ifndef _XWIN335 335 if (!g_text_mode) { 336 336 open_progress_form("", "", "", "", 100); … … 339 339 newtPopWindow(); 340 340 } 341 #endif342 341 return (curr_set_no + 1); 343 342 } … … 386 385 } 387 386 filelist->ch = '\0'; 388 mr_free( (void *)filelist);387 mr_free(filelist); 389 388 depth--; 390 389 if (depth == 0) { … … 490 489 { 491 490 char *command = NULL; 492 char *tmp = NULL;493 491 int retval = 0; 494 492 … … 542 540 mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768), 543 541 (int) (random() % 32768)); 542 544 543 mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist); 545 544 run_program_and_log_output(command, 1); … … 752 751 return (add_string_at_node(node->right, string_to_add)); 753 752 } 753 754 754 // walk down tree if appropriate 755 755 if (node->down != NULL && node->ch == char_to_add) { … … 765 765 return (1); 766 766 } 767 767 768 // add here 768 769 newnode = (struct s_node *) mr_malloc(sizeof(struct s_node)); … … 1216 1217 long g_skeleton_entries = 0; 1217 1218 1218 1219 1219 /** 1220 1220 * Wrapper around mondo_makefilelist(). … … 1234 1234 /*@ int **************************************************** */ 1235 1235 int res = 0; 1236 /*@ buffers ************************************************ */1237 1236 1238 1237 assert(bkpinfo != NULL); … … 1343 1342 system(strtmp); 1344 1343 mr_free(strtmp); 1345 mr_free(tmp);1346 1347 1344 mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist); 1348 1345 tmp1 = call_program_and_get_last_line_of_output(tmp); … … 1522 1519 char *tmp1 = NULL; 1523 1520 char *tmp2 = NULL; 1524 char *sz_datefile ;1521 char *sz_datefile = NULL; 1525 1522 char *sz_filelist = NULL; 1526 1523 char *exclude_paths = NULL; … … 1734 1731 size_t len = 0; // Scrub's patch doesn't work without that 1735 1732 1736 // mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");1737 1733 mr_msg(5, "starting"); 1738 1734 mr_msg(5, "needles_list_fname = %s", needles_list_fname);
Note:
See TracChangeset
for help on using the changeset viewer.