Ignore:
Timestamp:
Sep 27, 2007, 12:21:18 PM (12 years ago)
Author:
Bruno Cornec
Message:
  • Fix bug #197 (based on an initial patch of Scott Cummings)
  • Fix a bug where df was using locale to print messages and wasn't filtered correctly
  • mkdtemp checked in configure
  • reset_bkpinfo called as early as possible by both main program.
  • It creates a tmpdir cleanly with mkdtemp in setup_tmpdir subfunction, which takes in account TMPIR and TMP env var. Remains to see what tmpfs does and tests
  • configure.in should also be filtered.
  • Remove g_bkpinfo_DONTUSETHIS
  • remove bkpinfo also from header files
  • Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
  • Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp or MINDI_CACHE when appropriate. Fix security issues in mondo. Thanks al ot Andree for catching all those issues.
  • /tmp => /var/log for mondorestore.log in mindi
  • Update linux terminfo to fix a color issue (Andree Leidenfrost)
  • Removes useless log file (Andree Leidenfrost)
  • replace vi with find_my_editor during restore (Andree Leidenfrost)
  • sync in bg in mindi (VMWare issue to look at)
  • mindi/mindi-busybox have a different version than mondo for pb
  • PB-SUF also added to spec file
  • Fix a bug for pb build (omission of PB-SUF declaration)

(merge -r1631:1662 $SVN_M/branches/2.2.5)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1639 r1663  
    4040extern char *MONDO_LOGFILE;
    4141
     42/* Reference to global bkpinfo */
     43extern struct s_bkpinfo *bkpinfo;
     44
    4245int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
    4346                       char *include_paths, char *excp, bool differential,
     
    8285 * @see chop_filelist
    8386 */
    84 int call_filelist_chopper(struct s_bkpinfo *bkpinfo)
     87int call_filelist_chopper()
    8588{
    8689    /*@ buffers *********************** */
     
    112115    mr_free(filelist);
    113116
    114     estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
     117    estimate_noof_media_required(noof_sets);    // for cosmetic purposes
    115118
    116119    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     
    155158
    156159    mr_msg(5, "Sorting file %s", orig_fname);
    157     mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
    158              (int) (random() % 32768), (int) (random() % 32768));
     160    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
    159161
    160162    if (!does_file_exist(orig_fname)) {
     
    547549        return (0);
    548550    }
    549     mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
    550              (int) (random() % 32768));
    551 
     551    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
    552552    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
    553553    run_program_and_log_output(command, 1);
     
    693693 * @note This function should only be called at restore-time.
    694694 */
    695 int get_last_filelist_number(struct s_bkpinfo *bkpinfo)
     695int get_last_filelist_number()
    696696{
    697697    /*@ buffers ***************************************************** */
     
    12391239 * @see mondo_makefilelist
    12401240 */
    1241 int prepare_filelist(struct s_bkpinfo *bkpinfo)
     1241int prepare_filelist()
    12421242{
    12431243
Note: See TracChangeset for help on using the changeset viewer.