Ignore:
Timestamp:
Sep 25, 2007, 12:54:32 AM (12 years ago)
Author:
Bruno Cornec
Message:

Fix a bug where df was using locale to print messages and wasn't filtered correctly
Improve setup of tmpdir again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-tools.c

    r1654 r1655  
    617617    }
    618618    make_hole_for_dir(bkpinfo->scratchdir);
    619     make_hole_for_dir(bkpinfo->tmpdir);
    620619    if (bkpinfo->backup_media_type == iso)
    621620        make_hole_for_dir(bkpinfo->isodir);
     
    902901    }
    903902    chmod(bkpinfo->scratchdir, 0700);
    904     chmod(bkpinfo->tmpdir, 0700);
    905903    g_backup_media_type = bkpinfo->backup_media_type;
    906904    paranoid_free(mtpt);
     
    963961}
    964962
    965 void setup_tmpdir() {
     963void setup_tmpdir(char *path) {
    966964   
    967965    char *tmp = NULL;
    968966    char *p = NULL;
    969967
     968    if (bkpinfo->tmpdir != NULL) {
     969        /* purging a potential old tmpdir */
     970        asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);
     971        run_program_and_log_output(tmp, FALSE);
     972        paranoid_free(tmp);
     973    }
     974       
    970975    if (getenv("TMPDIR")) {
    971976        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));
    972977    } else if (getenv("TMP")) {
    973978        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));
     979    } else if (path != NULL) {
     980        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
    974981    } else {
    975982        asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
Note: See TracChangeset for help on using the changeset viewer.