Changeset 1213


Ignore:
Timestamp:
Feb 26, 2007, 2:04:43 PM (13 years ago)
Author:
bruno
Message:

Removal of g_mondo_home useless and used MONDO_SHARE instead

Location:
branches/stable/mondo/src
Files:
8 edited

Legend:

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

    r1193 r1213  
    7777extern FILE *g_tape_stream;
    7878extern long long g_tape_posK;
    79 extern char *g_mondo_home;
    8079extern char *g_tmpfs_mountpt;
    8180extern bool g_cd_recovery;
     
    347346        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
    348347                 bkpinfo->compression_level);
    349         mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
     348        mr_asprintf(&tmp, "%s/do-not-compress-these", MONDO_SHARE);
    350349        if (does_file_exist(tmp)) {
    351350            mr_asprintf(&tmp1, " -E +%s", tmp);
     
    35863585    mr_free(cdno_fname);
    35873586
    3588     mr_asprintf(&tmp, "cp -f %s/autorun %s/", g_mondo_home,
     3587    mr_asprintf(&tmp, "cp -f %s/autorun %s/", MONDO_SHARE,
    35893588             bkpinfo->scratchdir);
    35903589    if (run_program_and_log_output(tmp, FALSE)) {
  • branches/stable/mondo/src/common/libmondo-files.c

    r1194 r1213  
    2929
    3030extern int g_currentY;
    31 extern char *g_mondo_home;
    3231
    3332/**
     
    951950
    952951    /* BERLIOS: Why do we need to do it here as well ? */
    953     mr_msg(4, "g_mondo_home='%s'", g_mondo_home);
    954     if (strlen(g_mondo_home) < 2) {
    955         find_and_store_mondoarchives_home(g_mondo_home);
    956     }
    957     mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
     952    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", MONDO_SHARE,
    958953            bkpinfo->scratchdir);
    959954
     
    970965    mr_free(command);
    971966
    972     mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
     967    mr_asprintf(&tmp, "%s/payload.tgz", MONDO_SHARE);
    973968    if (does_file_exist(tmp)) {
    974969        log_it("Untarring payload %s to scratchdir %s", tmp,
     
    12231218    }
    12241219
    1225     mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
     1220    mr_asprintf(&tmp, "%s/do-not-compress-these", MONDO_SHARE);
    12261221    if (!does_file_exist(tmp)) {
    12271222        mr_free(tmp);
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1184 r1213  
    4747 */
    4848static char *g_boot_mountpt = NULL;
    49 
    50 /**
    51  * The location of Mondo's home directory.
    52  */
    53 char *g_mondo_home = NULL;
    5449
    5550/**
     
    685680
    686681    run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
    687     if (find_and_store_mondoarchives_home(g_mondo_home)) {
    688         fprintf(stderr,
    689                 "Cannot find Mondo's homedir. I think you have >1 'mondo' directory on your hard disk. Please delete the superfluous 'mondo' directories and try again\n");
    690         res++;
    691         return (res);
    692682    }
    693683    res += some_basic_system_sanity_checks();
     
    12201210        iamhere("Malloc'ing globals");
    12211211        malloc_string(g_boot_mountpt);
    1222         malloc_string(g_mondo_home);
    12231212        malloc_string(g_tmpfs_mountpt);
    12241213        malloc_string(g_erase_tmpdir_and_scratchdir);
     
    12281217        iamhere("Freeing globals");
    12291218        mr_free(g_boot_mountpt);
    1230         mr_free(g_mondo_home);
    12311219        mr_free(g_tmpfs_mountpt);
    12321220        mr_free(g_erase_tmpdir_and_scratchdir);
  • branches/stable/mondo/src/common/newt-specific.c

    r1198 r1213  
    3737extern char *g_tmpfs_mountpt;
    3838extern char *g_boot_mountpt;
    39 extern char *g_mondo_home;
    4039extern char *ps_options;
    4140extern char *ps_proc_id;
  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1190 r1213  
    3838extern char *g_boot_mountpt;
    3939extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
    40 extern char *g_mondo_home;
    4140extern char *g_tmpfs_mountpt;
    4241extern char *g_erase_tmpdir_and_scratchdir;
  • branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

    r1200 r1213  
    2222extern char *g_mondo_cfg_file;
    2323extern char *g_mountlist_fname;
    24 extern char *g_mondo_home;
    2524
    2625
  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

    r1196 r1213  
    3838extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
    3939extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
    40 extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo
    4140
    4241extern t_bkptype g_backup_media_type;
     
    6463    mr_free(g_mondo_cfg_file);
    6564    mr_free(g_mountlist_fname);
    66     mr_free(g_mondo_home);
    6765    mr_free(g_tmpfs_mountpt);
    6866    mr_free(g_isodir_device);
     
    19381936    malloc_string(g_mondo_cfg_file);
    19391937    malloc_string(g_mountlist_fname);
    1940     malloc_string(g_mondo_home);
    19411938    malloc_string(g_tmpfs_mountpt);
    19421939    malloc_string(g_isodir_device);
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1212 r1213  
    27782778    malloc_libmondo_global_strings();
    27792779
    2780     strcpy(g_mondo_home,
    2781            call_program_and_get_last_line_of_output("which mondorestore"));
    27822780    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
    27832781    make_hole_for_dir(g_tmpfs_mountpt);
Note: See TracChangeset for help on using the changeset viewer.