Changeset 2321 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 18, 2009, 2:37:55 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3332@localhost: bruno | 2009-08-07 23:59:34 +0200

• bkpinfo->tmpchdir is now dynamically allocated
• reorganize how tmpdir and scratchdir are initialized and the startup of the main sections
• change of interface for maintain_collection_of_recent_archives, mondo_makefilelist, chop_filelist
• sensibly_set_tmpdir_and_scratchdir => sensibly_set_scratchdir
• reset_bkpinfo => init_bkpinfo
• add function mr_free_bkpinfo
• Fix a bug in mr_strtok
• mondoarchive seems to globally work. Newt stuff needs more testing

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1841 +1841 @@
 void setup_MR_global_filenames()
 {
-    char *temppath;
-
     assert(bkpinfo != NULL);
 
@@ -1854 +1852 @@
     malloc_string(g_isodir_device);
 
-    temppath = bkpinfo->tmpdir;
-
-    sprintf(g_biggielist_txt, "%s/%s", temppath, BIGGIELIST_TXT_STUB);
-    sprintf(g_filelist_full, "%s/%s", temppath, FILELIST_FULL_STUB);
-    sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", temppath);
-    sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", temppath);
+    sprintf(g_biggielist_txt, "%s/%s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB);
+    sprintf(g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
+    sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", bkpinfo->tmpdir);
+    sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", bkpinfo->tmpdir);
     if (bkpinfo->disaster_recovery) {
         sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
         sprintf(g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
     } else {
-        sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
-        sprintf(g_mountlist_fname, "%s/%s", temppath, MOUNTLIST_FNAME_STUB);
+        sprintf(g_mondo_cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+        sprintf(g_mountlist_fname, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     }
 }