Changeset 2188 in MondoRescue

Timestamp:

Apr 30, 2009, 6:01:51 PM (15 years ago)

Author:

Bruno Cornec

Message:

Create a new defind for MAX_MOUNTLIST_ENTRIES and increse MAX_TAPECATALOG_ENTRIES to solve a reported blimit

Location:

branches/2.2.9/mondo/src

Files:

• common/mondostructures.h (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/2.2.9/mondo/src/common/mondostructures.h

@@ -79 +79 @@
    * The list of entries, all @p entries of them.
    */
-    struct mountlist_line el[MAX_TAPECATALOG_ENTRIES];
+    struct mountlist_line el[MAX_MOUNTLIST_ENTRIES];
 };
 

branches/2.2.9/mondo/src/include/my-stuff.h

@@ -117 +117 @@
 #define NOOF_ERR_LINES 6        ///< The number of lines of log output to keep at the bottom of the screen.
 #define ARBITRARY_MAXIMUM 2000  ///< The maximum number of items showing at once in the mountlist or filelist editor.
-#define MAX_TAPECATALOG_ENTRIES 8192    ///< The maximum number of entries in the tape catalog.
+#define MAX_TAPECATALOG_ENTRIES 16384   ///< The maximum number of entries in the tape catalog.
+#define MAX_MOUNTLIST_ENTRIES 8192  ///< The maximum number of entries in the mountlist.
 #define MAX_STR_LEN 384         ///< The maximum length of almost all @p char buffers in Mondo.
                                         ///  Note: Make this divisible by eight to avoid aligment issues

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -2500 +2500 @@
     drivemntlist = malloc(sizeof(struct mountlist_reference));
     drivemntlist->el =
-        malloc(sizeof(struct mountlist_line *) * MAX_TAPECATALOG_ENTRIES);
+        malloc(sizeof(struct mountlist_line *) * MAX_MOUNTLIST_ENTRIES);
 
     if (!drivemntlist) {

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

@@ -770 +770 @@
 
 if (!cfgf) {
-strcpy(cfg_file, g_mondo_cfg_file);
+    strcpy(cfg_file, g_mondo_cfg_file);
 } else {
-strcpy(cfg_file, cfgf);
+    strcpy(cfg_file, cfgf);
 }
 
@@ -790 +790 @@
     bkpinfo->please_dont_eject = TRUE;
 } else if (!strcmp(value, "iso")) {
-/*
-if (am_I_in_disaster_recovery_mode()
-&& !run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1)
-&& does_file_exist(MNT_CDROM"/archives/filelist.0"))
-*/
 
 // Patch by Conor Daly - 2004/07/12