Changeset 3900 in MondoRescue for branches

Timestamp:

Dec 17, 2024, 11:28:04 PM (6 months ago)

Author:

Bruno Cornec

Message:

Only one creation of MNT_CDROM

File:

• branches/3.3/mondo/src/mondorestore/mondorestore.c (modified) (8 diffs)

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -13 +13 @@
 #include "mr_mem.h"
 #include "mr_file.h"
+#include "mr_msg.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "mondorestore.h"
-#include "mr_msg.h"
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
@@ -167 +168 @@
  * @ingroup restoreUtilityGroup
  */
-bool
-partition_table_contains_Compaq_diagnostic_partition(struct mountlist_itself * mountlist) {
+bool partition_table_contains_Compaq_diagnostic_partition(struct mountlist_itself * mountlist) {
 
 int i;
@@ -905 +905 @@
  * @return 0 for success, or the number of filesets that failed.
  */
-int
-restore_all_tarballs_from_CD(struct s_node *filelist)
-{
+int restore_all_tarballs_from_CD(struct s_node *filelist) {
     int retval = 0;
     int res;
@@ -1802 +1800 @@
         closein_tape();
     } else {
-        mount_media(MNT_CDROM);
-        mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from CD/USB   ");
+        mvaddstr_and_log_it(g_currentY++, 0, "Restoring OS and data from CD/USB   ");
         resA = restore_all_tarballs_from_CD(filelist);
         resB = restore_all_biggiefiles_from_CD(filelist);
@@ -2563 +2559 @@
         exit(127);
     }
-    if (!
-        (bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
+    alloc_bkpinfo();
     reset_bkpinfo();
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
 
-/* Configure global variables */
+    /* Configure global variables */
     tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
     if (strstr(tmp, "textonly")) {
@@ -2595 +2588 @@
     tmp = call_program_and_get_last_line_of_output("which mondorestore");
     strcpy(g_mondo_home, tmp);
-        mr_free(tmp);
+    mr_free(tmp);
 
     g_current_media_number = 1; // precaution
-    run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
+    if (!does_file_exist(MNT_CDROM)) {
+        res = run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
+        if ( res != 0) {
+            fatal_error("Unable to create " MNT_CDROM);
+        }
+    }
 
     setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
@@ -2616 +2614 @@
             ("Serious error in malloc()'ing. Could be a bug in your glibc.");
     }
-    mkdir(MNT_CDROM, 0x770);
     make_hole_for_dir(MONDO_CACHE);
 
@@ -2781 +2778 @@
     /*  setup log level for new log system as well */
     mr_msg_init(MONDO_LOGFILE,g_loglevel,argc,argv);
+    log_msg(0, "Time started: %s", mr_date());
 
     // Handle params here first