Changeset 684 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-files.c

Timestamp:

Jun 26, 2006, 1:12:48 PM (18 years ago)

Author:

bcornec

Message:

Attempt to fix Bug #7820 Does not backup a file greater than 2 GB
Report from taps23@…
Changed legnth_of_file to off_t for ftello support and all relative changes made as well in various functions to be consistent

File:

• branches/stable/mondo/mondo/common/libmondo-files.c (modified) (6 diffs)

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -596 +596 @@
  * @return The length of the file, or -1 for error.
  */
-long long length_of_file(char *filename)
+off_t length_of_file(char *filename)
 {
     /*@ pointers *************************************************** */
@@ -602 +602 @@
 
     /*@ long long ************************************************* */
-    long long length;
+    off_t length;
 
     fin = fopen(filename, "r");
@@ -611 +611 @@
     }
     fseeko(fin, 0, SEEK_END);
-    length = ftell(fin);
+    length = ftello(fin);
     paranoid_fclose(fin);
     return (length);
@@ -641 +641 @@
 
     /*@ long [long] ************************************************* */
-    long long filelist_length;
-    long curr_pos;
+    off_t filelist_length;
+    off_t curr_pos;
     long start_time;
     long current_time;
@@ -680 +680 @@
             counter = 0;
             curr_fname[37] = '\0';
-            curr_pos = ftell(fin) / 1024;
+            curr_pos = ftello(fin) / 1024;
             percentage = (int) (curr_pos * 100 / filelist_length);
             time_taken = current_time - start_time;
@@ -921 +921 @@
                 }
             } else {
+                /* BERLIOS: more than long here ??? */
                 file_len_K = (long) (length_of_file(fname) / 1024);
             }