Changeset 3879 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondorestore.c

Timestamp:

Mar 9, 2024, 3:10:04 AM (2 months ago)

Author:

Bruno Cornec

Message:

Fix all remaining compiler errors

File:

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

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

@@ -13 +13 @@
 #include "mr_mem.h"
 #include "mr_file.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
-#include "mr-externs.h"
+#include "mondostructures.h"
 #include "mondorestore.h"
 #include "mr_msg.h"
@@ -21 +19 @@
 #include "mondo-rstr-tools-EXT.h"
 #include "libmondo-mountlist-EXT.h"
+#include "libmondo-tools-EXT.h"
+#include "libmondo-gui-EXT.h"
+#include "libmondo-devices-EXT.h"
+#include "libmondo-fork-EXT.h"
+#include "libmondo-string-EXT.h"
+#include "libmondo-archive-EXT.h"
+#include "libmondo-raid-EXT.h"
+#include "libmondo-filelist-EXT.h"
+#include "libmondo-files-EXT.h"
+#include "libmondo-stream-EXT.h"
+#include "libmondo-cli-EXT.h"
 #include "newt-specific-EXT.h"
 
 extern void wait_until_software_raids_are_prepped(char *, int);
 extern void twenty_seconds_til_yikes(void);
+// in mondo-prep.c
+extern void resize_mountlist_proportionately_to_suit_new_drives(struct mountlist_itself *);
+extern int format_everything(struct mountlist_itself *, bool , struct raidlist_itself *);
+extern int partition_everything(struct mountlist_itself *);
+extern int fput_string_one_char_at_a_time(FILE *, char *);
+extern int do_my_funky_lvm_stuff(bool, bool );
+extern int stop_all_raid_devices(struct mountlist_itself *);
+
+// in mondo-rstr-newt.c
+extern int edit_mountlist(char *, struct mountlist_itself *, struct raidlist_itself *);
+
+// from libmondo-devices.c
+extern bool g_restoring_live_from_cd;
+extern bool g_restoring_live_from_netfs;
+
+extern int g_currentY;
 
 /* We don't have a cleanup function yet */
@@ -53 +78 @@
 extern int g_partition_table_locked_up;
 extern int g_noof_rows;
-
-extern int partition_everything(struct mountlist_itself *mountlist);
-extern int handle_incoming_parameters(int argc, char *argv[]);
+extern int g_current_media_number;
 
 /**
@@ -121 +144 @@
 char *g_getfattr;
 
+extern long g_current_progress;
+extern int g_currentY;
+extern int g_current_media_number;
+
+
 /* @} - end of "Restore-Time Globals" in globalGroup */
 
-
-
-extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
-                                 char direction);
 
 
@@ -580 +604 @@
                 just_changed_cds = FALSE;
                 log_msg(3, "I'll continue to scan this CD for bigfiles to be restored.");
-            } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
+            } else if (does_file_exist(ARCHIVES_PATH "/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
                 log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
@@ -691 +715 @@
     paranoid_free(command);
 
-    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
+    mr_asprintf(filelist_name, ARCHIVES_PATH "/filelist.%ld", current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
         log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
@@ -726 +750 @@
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, ARCHIVES_PATH, current_tarball_number);
         }
         if (g_getfacl) {
-            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, ARCHIVES_PATH, current_tarball_number);
         }
         if (strstr(tarball_fname, ".bz2")) {
@@ -922 +946 @@
         mr_free(progress_str);
 
-        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
+        mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.afio.bz2", current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%ld.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -954 +978 @@
                 return (0);
             }
-            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")
-                || system("find " MNT_CDROM
-                          "/archives/slice* > /dev/null 2> /dev/null") ==
+            if (!does_file_exist(ARCHIVES_PATH "/NOT-THE-LAST")
+                || system("find " ARCHIVES_PATH "/slice* > /dev/null 2> /dev/null") ==
                 0) {
                 break;