Ignore:
Timestamp:
Sep 27, 2007, 12:21:18 PM (13 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/newt-specific.c

    r1627 r1663  
    12821282                                 char *source_file) {
    12831283    int i;
     1284    int j = 0;
    12841285    bool done;
    12851286    char *tmp = NULL;
     1287    char *tmp1 = NULL;
    12861288    size_t n = 0;
    12871289    FILE *fin = NULL;
     
    12981300        return (1);
    12991301    }
     1302
     1303    asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
     1304    if (!(fout = fopen(tmp1, "a"))) {
     1305        mr_msg(2, "Can't write to %s", tmp1);
     1306        return(1);
     1307    }
     1308
    13001309    mr_msg(2, "Loading %s", source_file);
    13011310    for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
     
    13161325            goto god_i_hate_gotos;
    13171326        }
    1318         if (!does_file_exist(tmp)) {
     1327        if (!does_file_exist(tmp) && !feof(fin)) {
     1328            fprintf(fout, "%s\n", tmp);
     1329            j++;
    13191330            goto god_i_hate_gotos;
    13201331        }
     
    13291340
    13301341    paranoid_fclose(fin);
     1342    paranoid_fclose(fout);
     1343
     1344    if (j > 0) {
     1345        log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
     1346    }
     1347    mr_free(tmp1);
     1348
    13311349    if (filelist->entries >= ARBITRARY_MAXIMUM) {
    13321350        log_to_screen(_("Arbitrary limits suck, man!"));
Note: See TracChangeset for help on using the changeset viewer.