[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/15 11:34:10

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverMain.ml 

Log message:
        patch #5299

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.957&r2=1.958
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.121&r2=1.122

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.957
retrieving revision 1.958
diff -u -b -r1.957 -r1.958
--- distrib/ChangeLog   15 Aug 2006 11:32:50 -0000      1.957
+++ distrib/ChangeLog   15 Aug 2006 11:34:10 -0000      1.958
@@ -15,6 +15,8 @@
 =========
 
 2006/08/15
+5299: Support magicdb in $MLDONKEY_DIR/magic/magic if present
+      this location is used in addition to the defaults of libmagic
 5277: MinGW: use new gettimeofday() from mingw-runtime-3.10 (Schlumpf)
 
 2006/08/12

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- src/daemon/driver/driverMain.ml     12 Aug 2006 18:14:03 -0000      1.121
+++ src/daemon/driver/driverMain.ml     15 Aug 2006 11:34:10 -0000      1.122
@@ -367,7 +367,9 @@
           real_glibc_version Autoconf.glibc_version Autoconf.glibc_version
   );
   (
-    if Autoconf.magic then
+    if Autoconf.magic then begin
+      (if Sys.file_exists "./magic/magic" then
+         try Unix.putenv "MAGIC" "./magic/magic" with _ -> ());
       if Magic.M.magic_works () then
         begin
          Autoconf.magic_works := true;
@@ -378,6 +380,7 @@
          Autoconf.magic_works := false;
           lprintf_nl (_b "Libmagic file-type recognition database not present")
        end
+      end
   );
   load_config ();