Changeset 687 in MondoRescue for trunk/mondo/mondo/common/libmondo-files.c

Timestamp:

Jul 17, 2006, 3:39:42 PM (18 years ago)

Author:

bcornec

Message:

merge -r671:686 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-files.c (modified) (5 diffs)

trunk/mondo/mondo/common/libmondo-files.c

@@ -435 +435 @@
     if (i < 0) {
         asprintf(&command,
-                "tail -n3 %s | fgrep -i \"%c\" | tail -n1 | awk '{print $0;}'",
+                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
                 filename, '%');
         asprintf(&lastline,
@@ -513 +513 @@
  * @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 *************************************************** */
@@ -519 +519 @@
 
     /*@ long long ************************************************* */
-    long long length;
+    off_t length;
 
     fin = fopen(filename, "r");
@@ -528 +528 @@
     }
     fseeko(fin, 0, SEEK_END);
-    length = ftell(fin);
+    length = ftello(fin);
     paranoid_fclose(fin);
     return (length);
@@ -763 +763 @@
                 }
             } else {
+                /* BERLIOS: more than long here ??? */
                 file_len_K = (long) (length_of_file(fname) / 1024);
             }