Changeset 3137 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

r5336@localhost: bruno | 2013-06-12 15:37:29 +0200

• Change the calculation of the big size limit for a file by using the number of 512 blocks instead of the size returned by stat, thus allowing to consider some sparse file as not biggie file and such handling them through afio/star instead of fread/fwrite which makes them non sparse anymore.

Location:

branches/3.0/mondo/src/common

Files:

• libmondo-filelist.c (modified) (3 diffs)
• mondostructures.h (modified) (2 diffs)

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

@@ -198 +198 @@
 /*@ long ****************************************/
     long lino = 0;
-    long max_sane_size_for_a_file;
+    // 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;
@@ -226 +227 @@
     assert_string_is_neither_NULL_nor_zerolength(outdir);
     assert(maxsetsizeK > 0);
-
-    max_sane_size_for_a_file = 64L * 1024L;
-// max_sane_size_for_a_file = maxsetsizeK*2;
-//  if (max_sane_size_for_a_file > 32*1024)
-//    { max_sane_size_for_a_file = 32*1024; }
 
     log_it("filelist=%s;", filelist);
@@ -274 +270 @@
             siz = 0;
         } else {
-            siz = (long) (buf.st_size >> 10);
+            // blocks are 512 bytes long - cf man 2 stat - Pass to the next unit (kB => MB e.g.)
+            // use blocks instead of size to allow sparse file correct handling as much as possible
+            siz = (long) ((buf.st_blocks*512) >> 10);
         }
         if (siz > max_sane_size_for_a_file) {

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

@@ -192 +192 @@
  * A type of file in the catalog of recent archives.
  */
-typedef enum { other,           ///< Some other kind of file.
+typedef enum { 
+    other,                      ///< Some other kind of file.
     fileset,                    ///< An afioball (fileset), optionally compressed.
     biggieslice                 ///< A slice of a biggiefile, optionally compressed.
@@ -202 +203 @@
 typedef enum {
     nuke = 0,                   /// Nuke mode
-    interactive,                /// Interactive mode
+    interactive,                    /// Interactive mode
     compare,                    /// Compare mode
     mbr,                        /// MBR mode