Changeset 3138 in MondoRescue for branches/3.0/mondo

Timestamp:

Jun 13, 2013, 6:37:24 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5337@localhost: bruno | 2013-06-13 01:56:06 +0200

• Attempt to realize #700 by adding a CLI parameter to modify the biggie file size limit. By default 64 MB.
• Also with previous commit, fixes #700 by using blocks, and adapting autoconf to use it as well.

Location:

branches/3.0/mondo

Files:

• configure.in (modified) (1 diff)
• src/common/libmondo-cli.c (modified) (2 diffs)
• src/common/libmondo-filelist.c (modified) (3 diffs)
• src/include/my-stuff.h (modified) (1 diff)
• src/mondoarchive/mondoarchive.h (modified) (1 diff)

branches/3.0/mondo/configure.in

@@ -122 +122 @@
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
+AC_STRUCT_ST_BLOCKS
 
 # Checks for library functions.

branches/3.0/mondo/src/common/libmondo-cli.c

@@ -53 +53 @@
 
 extern void free_MR_global_filenames(void);
+
+long g_max_biggie_size = BIGGIEMAXSIZE;
 
 /**
@@ -670 +672 @@
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
+    }
+
+    if (flag_set['M']) {
+        g_max_biggie_size = atol(flag_val['M']);
+        log_msg(1, "Max size for biggie file is now %ld KB", g_max_biggie_size);
     }
 

branches/3.0/mondo/src/common/libmondo-filelist.c

@@ -32 +32 @@
 extern char *MONDO_LOGFILE;
 
+extern long g_max_biggie_size;
+
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
@@ -199 +201 @@
     long lino = 0;
     // A big file has more than 64 MB of real content
-    long max_sane_size_for_a_file = 64L * 1024L;
     long curr_set_size;
     long noof_lines;
@@ -274 +275 @@
             siz = (long) ((buf.st_blocks*512) >> 10);
         }
-        if (siz > max_sane_size_for_a_file) {
+        if (siz > g_max_biggie_size) {
             log_msg(10, "Adding %s to big files\n", incoming);
             fprintf(fbig, "%s\n", incoming);

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

@@ -329 +329 @@
 #define ACL_BIGGLST_FNAME_RAW_SZ     "%s/acl_list.big.gz"
 
+#define BIGGIEMAXSIZE           64L*1024L
 /**
  * The template for an afioball filename.

branches/3.0/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LMNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */