[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/unix32.ml

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       11/03/13 17:45:32

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : unix32.ml 

Log message:
        patch #7500

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1521&r2=1.1522
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/unix32.ml?cvsroot=mldonkey&r1=1.76&r2=1.77

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1521
retrieving revision 1.1522
diff -u -b -r1.1521 -r1.1522
--- distrib/ChangeLog   10 Mar 2011 19:26:22 -0000      1.1521
+++ distrib/ChangeLog   13 Mar 2011 17:45:32 -0000      1.1522
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2011/03/13
+7500: Diskinfo: Recognize BTRFS
+
 2011/03/10
 7499: BT/DHT: fix logging (ygrek)
 7498: BT/DHT: make token more robust against broken nodes (ygrek)

Index: src/utils/lib/unix32.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/unix32.ml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- src/utils/lib/unix32.ml     31 Jan 2011 17:17:07 -0000      1.76
+++ src/utils/lib/unix32.ml     13 Mar 2011 17:45:32 -0000      1.77
@@ -1821,7 +1821,7 @@
     | 0x00414A53L -> "EFS_SUPER_MAGIC"
     | 0x137DL -> "EXT_SUPER_MAGIC"
     | 0xEF51L -> "ext2" (* EXT2_OLD_SUPER_MAGIC *)
-    | 0xEF53L -> "ext2/3" (* EXT2/3_SUPER_MAGIC *)
+    | 0xEF53L -> "ext2/3/4" (* EXT2/3/4_SUPER_MAGIC *)
     | 0x4244L -> "HFS_SUPER_MAGIC"
     | 0xF995E849L -> "HPFS_SUPER_MAGIC"
     | 0x958458f6L -> "HUGETLBFS_MAGIC"
@@ -1856,6 +1856,7 @@
     | 0x012FF7B4L -> "XENIX_SUPER_MAGIC"
     | 0x58465342L -> "xfs" (* XFS_SUPER_MAGIC *)
     | 0x012FD16DL -> "_XIAFS_SUPER_MAGIC"
+    | 0x9123683EL -> "btrfs"
     | 5L -> "iso9660" (* Cygwin *)
     | 6L -> "fat" (* Cygwin *)
     | 0x700FFL -> "ntfs" (* Cygwin *)
@@ -1863,7 +1864,7 @@
     | _ -> if s.f_basetype <> "-1" then
             s.f_basetype
           else
-            Printf.sprintf "unknown (%Ld)" s.f_type
+            Printf.sprintf "unknown (%LX)" s.f_type
   with e -> "not supported"
 
 let set_max_cache_size v =