Changeset 1213 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Feb 26, 2007, 2:04:43 PM (18 years ago)

Author:

Bruno Cornec

Message:

Removal of g_mondo_home useless and used MONDO_SHARE instead

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (3 diffs)
• libmondo-files.c (modified) (4 diffs)
• libmondo-tools.c (modified) (4 diffs)
• newt-specific.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -77 +77 @@
 extern FILE *g_tape_stream;
 extern long long g_tape_posK;
-extern char *g_mondo_home;
 extern char *g_tmpfs_mountpt;
 extern bool g_cd_recovery;
@@ -347 +346 @@
         mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
                  bkpinfo->compression_level);
-        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
+        mr_asprintf(&tmp, "%s/do-not-compress-these", MONDO_SHARE);
         if (does_file_exist(tmp)) {
             mr_asprintf(&tmp1, " -E +%s", tmp);
@@ -3586 +3585 @@
     mr_free(cdno_fname);
 
-    mr_asprintf(&tmp, "cp -f %s/autorun %s/", g_mondo_home,
+    mr_asprintf(&tmp, "cp -f %s/autorun %s/", MONDO_SHARE,
              bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, FALSE)) {

branches/stable/mondo/src/common/libmondo-files.c

@@ -29 +29 @@
 
 extern int g_currentY;
-extern char *g_mondo_home;
 
 /**
@@ -951 +950 @@
 
     /* BERLIOS: Why do we need to do it here as well ? */
-    mr_msg(4, "g_mondo_home='%s'", g_mondo_home);
-    if (strlen(g_mondo_home) < 2) {
-        find_and_store_mondoarchives_home(g_mondo_home);
-    }
-    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
+    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", MONDO_SHARE,
             bkpinfo->scratchdir);
 
@@ -970 +965 @@
     mr_free(command);
 
-    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
+    mr_asprintf(&tmp, "%s/payload.tgz", MONDO_SHARE);
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp,
@@ -1223 +1218 @@
     }
 
-    mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
+    mr_asprintf(&tmp, "%s/do-not-compress-these", MONDO_SHARE);
     if (!does_file_exist(tmp)) {
         mr_free(tmp);

branches/stable/mondo/src/common/libmondo-tools.c

@@ -47 +47 @@
  */
 static char *g_boot_mountpt = NULL;
-
-/**
- * The location of Mondo's home directory.
- */
-char *g_mondo_home = NULL;
 
 /**
@@ -685 +680 @@
 
     run_program_and_log_output("rm -Rf /tmp/changed.files*", FALSE);
-    if (find_and_store_mondoarchives_home(g_mondo_home)) {
-        fprintf(stderr,
-                "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");
-        res++;
-        return (res);
     }
     res += some_basic_system_sanity_checks();
@@ -1220 +1210 @@
         iamhere("Malloc'ing globals");
         malloc_string(g_boot_mountpt);
-        malloc_string(g_mondo_home);
         malloc_string(g_tmpfs_mountpt);
         malloc_string(g_erase_tmpdir_and_scratchdir);
@@ -1228 +1217 @@
         iamhere("Freeing globals");
         mr_free(g_boot_mountpt);
-        mr_free(g_mondo_home);
         mr_free(g_tmpfs_mountpt);
         mr_free(g_erase_tmpdir_and_scratchdir);

branches/stable/mondo/src/common/newt-specific.c

@@ -37 +37 @@
 extern char *g_tmpfs_mountpt;
 extern char *g_boot_mountpt;
-extern char *g_mondo_home;
 extern char *ps_options;
 extern char *ps_proc_id;