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

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix all remaining compiler errors

File:

• branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (6 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -7 +7 @@
 #include "mr_mem.h"
 #include "mr_file.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
-//#include "../../config.h"
-#include "mr-externs.h"
-#include "mondo-rstr-compare.h"
-#include "mondorestore-EXT.h"
+#include "mr_sys.h"
+#include "mondostructures.h"
 #include "mondo-rstr-tools-EXT.h"
+#include "libmondo-string-EXT.h"
+#include "libmondo-verify-EXT.h"
+#include "libmondo-files-EXT.h"
+#include "libmondo-tools-EXT.h"
+#include "libmondo-fork-EXT.h"
+#include "libmondo-devices-EXT.h"
+#include "libmondo-string-EXT.h"
+#include "libmondo-mountlist-EXT.h"
+#include "libmondo-raid-EXT.h"
+#include "newt-specific-EXT.h"
 
 extern char *MONDO_LOGFILE;
@@ -21 +27 @@
 
 extern char *g_mountlist_fname;
+extern int g_current_media_number;
+extern bool g_text_mode;
+extern int g_currentY;
+extern long g_current_progress;
+extern char *g_mondo_cfg_file;
+
+// in mondo-rstr-newt.c
+extern int edit_mountlist(char *, struct mountlist_itself *, struct raidlist_itself *);
 
 //static char cvsid[] = "$Id$";
@@ -63 +77 @@
 
     if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-        if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
+        if (does_file_exist(ARCHIVES_PATH "/NOT-THE-LAST")) {
             insist_on_this_cd_number((++g_current_media_number));
         } else {
@@ -368 +382 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
+        mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzma", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.gz", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.star.", current_tarball_number);
+            mr_asprintf(tarball_fname, ARCHIVES_PATH "/%d.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            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) {
                 log_msg(2, "OK, I think I'm done with tarballs...");
@@ -492 +505 @@
  **************************************************************************/
 
+/**
+ * Compare all data on a tape-based backup.
+ * @param bkpinfo The backup information structure. Field used: @c bkpinfo->restore_path.
+ * @return 0 for success, nonzero for failure.
+ */
+/**************************************************************************
+ * F@COMPARE_TO_TAPE()                                                    *
+ * compare_to_tape() -  gots me??                                         *
+ *                                                                        *
+ * returns: int                                                           *
+ **************************************************************************/
+int compare_to_tape()
+{
+    int res;
+    char *dir;
+    char *command = NULL;
+
+    assert(bkpinfo != NULL);
+    malloc_string(dir);
+
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
+    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
+    run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
+    res = verify_tape_backups();
+    if (chdir(dir)) {
+        // FIXME
+    }
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(dir);
+    return (res);
+}
+
+/**************************************************************************
+ *END_COMPARE_TO_TAPE                                                     *
+ **************************************************************************/
+
+
+/**
+ * Compare all data on a cdstream-based backup.
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->disaster_recovery
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->restore_path
+ * @return 0 for success, nonzero for failure.
+ */
+int compare_to_cdstream()
+{
+    int res;
+
+  /** needs malloc **/
+    char *dir;
+    char *command = NULL;
+
+    assert(bkpinfo != NULL);
+    malloc_string(dir);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
+
+    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
+    run_program_and_log_output(command, FALSE);
+    mr_free(command);
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
+
+    if (bkpinfo->disaster_recovery
+        && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+    } else {
+        bkpinfo->media_device = find_optical_device();
+    }
+    res = verify_tape_backups();
+    if (chdir(dir)) {
+        // FIXME
+    }
+    if (length_of_file(MONDO_CACHE"/changed.txt") > 2
+        && length_of_file(MONDO_CACHE"/changed.files") > 2) {
+        log_msg(0,
+                "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
+        log_msg(2, "Calling popup_changelist_from_file()");
+        popup_changelist_from_file(MONDO_CACHE"/changed.files");
+        log_msg(2, "Returned from popup_changelist_from_file()");
+    }
+
+    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    paranoid_free(dir);
+    return (res);
+}
+
+/**************************************************************************
+ *END_COMPARE_CD_STREAM                                                   *
+ **************************************************************************/
 
 
@@ -620 +739 @@
  *END_COMPARE_MODE                                                        *
  **************************************************************************/
-
-/**
- * Compare all data on a cdstream-based backup.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->disaster_recovery
- * - @c bkpinfo->media_device
- * - @c bkpinfo->restore_path
- * @return 0 for success, nonzero for failure.
- */
-int compare_to_cdstream()
-{
-    int res;
-
-  /** needs malloc **/
-    char *dir;
-    char *command = NULL;
-
-    assert(bkpinfo != NULL);
-    malloc_string(dir);
-    if (getcwd(dir, MAX_STR_LEN)) {
-        // FIXME
-    }
-    if (chdir(bkpinfo->restore_path)) {
-        // FIXME
-    }
-
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
-
-    if (bkpinfo->disaster_recovery
-        && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        bkpinfo->media_device = find_optical_device();
-    }
-    res = verify_tape_backups();
-    if (chdir(dir)) {
-        // FIXME
-    }
-    if (length_of_file(MONDO_CACHE"/changed.txt") > 2
-        && length_of_file(MONDO_CACHE"/changed.files") > 2) {
-        log_msg(0,
-                "Type 'less "MONDO_CACHE"/changed.files' to see which files don't match the archives");
-        log_msg(2, "Calling popup_changelist_from_file()");
-        popup_changelist_from_file(MONDO_CACHE"/changed.files");
-        log_msg(2, "Returned from popup_changelist_from_file()");
-    }
-
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    paranoid_free(dir);
-    return (res);
-}
-
-/**************************************************************************
- *END_COMPARE_CD_STREAM                                                   *
- **************************************************************************/
-
-
-/**
- * Compare all data on a tape-based backup.
- * @param bkpinfo The backup information structure. Field used: @c bkpinfo->restore_path.
- * @return 0 for success, nonzero for failure.
- */
-/**************************************************************************
- * F@COMPARE_TO_TAPE()                                                    *
- * compare_to_tape() -  gots me??                                         *
- *                                                                        *
- * returns: int                                                           *
- **************************************************************************/
-int compare_to_tape()
-{
-    int res;
-    char *dir;
-    char *command = NULL;
-
-    assert(bkpinfo != NULL);
-    malloc_string(dir);
-
-    if (getcwd(dir, MAX_STR_LEN)) {
-        // FIXME
-    }
-    if (chdir(bkpinfo->restore_path)) {
-        // FIXME
-    }
-    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-    run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
-    res = verify_tape_backups();
-    if (chdir(dir)) {
-        // FIXME
-    }
-    if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    paranoid_free(dir);
-    return (res);
-}
-
-/**************************************************************************
- *END_COMPARE_TO_TAPE                                                     *
- **************************************************************************/
-
 /* @} - end compareGroup */