Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c
- Timestamp:
- Aug 18, 2009, 3:13:54 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-filelist.c
r2323 r2324 159 159 160 160 mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir); 161 162 161 mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE); 163 162 retval = system(command); … … 334 333 335 334 if (curr_set_no == 0) { 336 mr_asprintf(tmp, "Only one fileset. Fine.");335 log_msg(1, "Only one fileset. Fine."); 337 336 } else { 338 mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1); 339 } 340 log_msg(1, tmp); 341 mr_free(tmp); 337 log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1); 338 } 342 339 close_evalcall_form(); 343 340 /* This is to work around an obscure bug in Newt; open a form, close it, … … 474 471 paranoid_free(tmp); 475 472 mr_asprintf(syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE); 476 paranoid_free(strtmp);473 mr_free(strtmp); 477 474 call_exe_and_pipe_output_to_fd(syscall, pout); 478 paranoid_free(syscall);475 mr_free(syscall); 479 476 } 480 477 paranoid_fclose(fin); … … 1416 1413 mr_asprintf(tmp, "Reading %-68s", dir); 1417 1414 newtDrawRootText(0, g_noof_rows - 3, tmp); 1418 paranoid_free(tmp);1415 mr_free(tmp); 1419 1416 } 1420 1417 #endif … … 1436 1433 mr_asprintf(tmp,"opendir %s", dir); 1437 1434 log_OS_error(tmp); 1438 paranoid_free(tmp);1435 mr_free(tmp); 1439 1436 } else if (strstr(skip_these, new_with_spaces)) { 1440 1437 fprintf(fout, "%s\n", dir); // if excluded dir then print dir ONLY … … 1452 1449 if (strstr(skip_these, new_with_spaces)) { 1453 1450 fprintf(fout, "%s\n", new); 1454 paranoid_free(new_with_spaces);1451 mr_free(new_with_spaces); 1455 1452 } else { 1456 paranoid_free(new_with_spaces);1453 mr_free(new_with_spaces); 1457 1454 if (!lstat(new, &statbuf)) { 1458 1455 if (!S_ISLNK(statbuf.st_mode) … … 1471 1468 #ifndef _XWIN 1472 1469 if (!g_text_mode) { 1473 newtDrawRootText(77, g_noof_rows - 3, 1474 tmp); 1470 newtDrawRootText(77, g_noof_rows - 3, tmp); 1475 1471 newtRefresh(); 1476 1472 } 1477 1473 #endif 1478 paranoid_free(tmp);1474 mr_free(tmp); 1479 1475 } 1480 1476 } … … 1565 1561 mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0); 1566 1562 if (!include_paths && !userdef_filelist) { 1567 fatal_error 1568 ("Please supply either include_paths or userdef_filelist"); 1563 fatal_error("Please supply either include_paths or userdef_filelist"); 1569 1564 } 1570 1565 // make hole for filelist … … 1584 1579 // backup last known good datefile just in case :) 1585 1580 if (does_file_exist(sz_datefile)) { 1586 mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, 1587 sz_datefile); 1581 mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile); 1588 1582 paranoid_system(command); 1589 1583 mr_free(command); … … 1626 1620 log_msg(2, "Found windows FS: %s",tmp2); 1627 1621 mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2); 1628 paranoid_free(tmp2);1622 mr_free(tmp2); 1629 1623 mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1)); 1630 1624 log_msg(2, "Found windows files: %s",tmp2);
Note:
See TracChangeset
for help on using the changeset viewer.