Request 262 (accepted)

MLDonkey.changes Changed

MLDonkey.spec Changed

mldonkey-disable-asm-opt.patch Added

mldonkey-fix_missing_return_in_non_void_functions.patch Deleted

mldonkey-3.1.2.tar.bz2/Makefile -> mldonkey-3.1.3.tar.bz2/Makefile Changed

@@ -5033,7 +5033,7 @@
 	$(OCAMLDOC) -sort -dump ocamldoc/ocamldocdump -html -d ocamldoc $(INCLUDES) $(libclient_DOC) $(CORE_DOC)
 
 $(LIB)/md4_cc.o: $(LIB)/md4.c
-	$(OCAMLC) -ccopt "$(CFLAGS) -O3 -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
+	$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
 
 $(CDK)/heap_c.o: $(CDK)/heap_c.c
 	$(OCAMLC) -ccopt "$(CFLAGS) $(MORECFLAGS) -o $(CDK)/heap_c.o" -ccopt "" -c $(CDK)/heap_c.c
@@ -5047,7 +5047,7 @@
 
 zogml:
 	(for i in $(GUI_CODE)/gui*_base.zog ; do \
-		$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i > $(GUI_CODE)/`basename $$i zog`ml ;\
+		$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i -o $(GUI_CODE)/`basename $$i zog`ml ;\
 	done)
 
 #######################################################################
@@ -5447,7 +5447,7 @@
 	$(OCAMLC) $(DEVFLAGS) $(INCLUDES) -c $<
 
 .mlcpp.ml:
-	@$(CPP) -x c -P $< $(FIX_BROKEN_CPP) -o $@
+	@$(CPP) -x c -P $< $(FIX_BROKEN_CPP) > $@
 
 %.ml: %.mlp $(BITSTRING)/pa_bitstring.cmo
 	$(CAMLP4OF) build/bitstring.cma $(BITSTRING)/bitstring_persistent.cmo $(BITSTRING)/pa_bitstring.cmo -impl $< -o $@
@@ -5462,17 +5462,16 @@
 	@$(OCAMLYACC) $<
 
 .zog.ml:
-	@$(CAMLP4) pa_o.cmo ./pa_zog.cma pr_o.cmo -impl $< > $@
+	@$(CAMLP4) pa_o.cmo ./pa_zog.cma pr_o.cmo -impl $< -o $@
 
 .ml4.ml:
-	@echo '# 1 "$<"' > $@
-	@$(CAMLP4) pa_o.cmo pa_op.cmo pr_o.cmo -impl $< >> $@
+	@$(CAMLP4) pa_o.cmo pa_op.cmo pr_o.cmo -impl $< -o $@
 
 .mlc4.ml:
 	@$(CAMLP4OF) -I +camlp4 -impl $< -o $@
 
 .mlt.ml:
-	@$(OCAMLPP) -pp $< > $@
+	@$(OCAMLPP) -o $@ -pp $<
 
 .c.o :
 	$(OCAMLC) -verbose -ccopt "-I $(OCAML_SRC)/byterun -o $*.o" -ccopt "$(CFLAGS)" $(LIBS_flags) -c $<

mldonkey-3.1.2.tar.bz2/config/Makefile.in -> mldonkey-3.1.3.tar.bz2/config/Makefile.in Changed

@@ -1434,7 +1434,7 @@
 	$(OCAMLDOC) -sort -dump ocamldoc/ocamldocdump -html -d ocamldoc $(INCLUDES) $(libclient_DOC) $(CORE_DOC)
 
 $(LIB)/md4_cc.o: $(LIB)/md4.c
-	$(OCAMLC) -ccopt "$(CFLAGS) -O3 -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
+	$(OCAMLC) -ccopt "$(CFLAGS) -o $(LIB)/md4_cc.o" -ccopt "" -c $(LIB)/md4.c
 
 $(CDK)/heap_c.o: $(CDK)/heap_c.c
 	$(OCAMLC) -ccopt "$(CFLAGS) $(MORECFLAGS) -o $(CDK)/heap_c.o" -ccopt "" -c $(CDK)/heap_c.c
@@ -1448,7 +1448,7 @@
 
 zogml:
 	(for i in $(GUI_CODE)/gui*_base.zog ; do \
-		$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i > $(GUI_CODE)/`basename $$i zog`ml ;\
+		$(CAMLP4) pa_o.cmo pa_zog.cma pr_o.cmo -impl $$i -o $(GUI_CODE)/`basename $$i zog`ml ;\
 	done)
 
 #######################################################################
@@ -1848,7 +1848,7 @@
 	$(OCAMLC) $(DEVFLAGS) $(INCLUDES) -c $<
 
 .mlcpp.ml:
-	@$(CPP) -x c -P $< $(FIX_BROKEN_CPP) -o $@
+	@$(CPP) -x c -P $< $(FIX_BROKEN_CPP) > $@
 
 %.ml: %.mlp $(BITSTRING)/pa_bitstring.cmo
 	$(CAMLP4OF) build/bitstring.cma $(BITSTRING)/bitstring_persistent.cmo $(BITSTRING)/pa_bitstring.cmo -impl $< -o $@
@@ -1863,17 +1863,16 @@
 	@$(OCAMLYACC) $<
 
 .zog.ml:
-	@$(CAMLP4) pa_o.cmo ./pa_zog.cma pr_o.cmo -impl $< > $@
+	@$(CAMLP4) pa_o.cmo ./pa_zog.cma pr_o.cmo -impl $< -o $@
 
 .ml4.ml:
-	@echo '# 1 "$<"' > $@
-	@$(CAMLP4) pa_o.cmo pa_op.cmo pr_o.cmo -impl $< >> $@
+	@$(CAMLP4) pa_o.cmo pa_op.cmo pr_o.cmo -impl $< -o $@
 
 .mlc4.ml:
 	@$(CAMLP4OF) -I +camlp4 -impl $< -o $@
 
 .mlt.ml:
-	@$(OCAMLPP) -pp $< > $@
+	@$(OCAMLPP) -o $@ -pp $<
 
 .c.o :
 	$(OCAMLC) -verbose -ccopt "-I $(OCAML_SRC)/byterun -o $*.o" -ccopt "$(CFLAGS)" $(LIBS_flags) -c $<

mldonkey-3.1.2.tar.bz2/config/configure -> mldonkey-3.1.3.tar.bz2/config/configure Changed

@@ -1450,8 +1450,8 @@
   --disable-gnutella2     disable support for Gnutella2
   --disable-fasttrack     disable support for FastTrack
   --enable-batch          reply YES to all queries in this script
-  --enable-force-ocaml    force usage of self-compiled Ocaml
-  --enable-ocamlver=VER   force usage of specific Ocaml version (3.10.1|SVN),
+  --enable-force-ocaml    force usage of self-compiled OCaml
+  --enable-ocamlver=VER   force usage of specific OCaml version (3.10.1|SVN),
   --enable-mingw          force compilation with MINGW on Cygwin
   --enable-checks         enable bounds-checking for array/string accesses
   --enable-profile        compile with gprof profiling support (enables debug)
@@ -2375,7 +2375,7 @@
 
 MAJOR_VERSION=3
 MINOR_VERSION=1
-SUB_VERSION=2   # range 0-7 due to eMule limitations
+SUB_VERSION=3   # range 0-7 due to eMule limitations
 
 # **********                                                                                  **********
 # **********                                  check for C compiler                            **********
@@ -3952,7 +3952,7 @@
 fi
 
 # **********                                                                                  **********
-# **********             build MLDonkey version, Required Ocaml and LablGTK versions          **********
+# **********             build MLDonkey version, Required OCaml and LablGTK versions          **********
 # **********                                                                                  **********
 
 MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION
@@ -4218,7 +4218,8 @@
 
 OCAML_PATH=
 
-echo -e "\n--------------------------------"
+echo ""
+echo "--------------------------------"
 echo "     Checking system tools."
 echo "--------------------------------"
 
@@ -4687,10 +4688,10 @@
 
 echo "----------------------------------------"
 echo "     Checking system tools finished."
-echo -e "----------------------------------------\n"
-
+echo "----------------------------------------"
+echo ""
 echo "--------------------------------"
-echo "     Checking Ocaml compiler."
+echo "     Checking OCaml compiler."
 echo "--------------------------------"
 
 CONFIG_DIR=$SOURCE_DIR/config
@@ -4890,7 +4891,7 @@
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *$.*$$|\1|p' `
   case "$OCAMLVERSION" in
-    "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
+    "$REQUIRED_OCAML"*|4.*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -4908,18 +4909,18 @@
 
   if  test "$SYSTEM" = "mingw" ; then
     echo "********         Objective-Caml $REQUIRED_OCAML is required               *********" 1>&2;
-    echo "********     no valid Ocaml compiler found on your system        *********" 1>&2;
+    echo "********     no valid OCaml compiler found on your system        *********" 1>&2;
     echo "********   on MinGW there is no possibility to let configure     *********" 1>&2;
-    echo "********   build the Ocaml compiler with the included script     *********" 1>&2;
+    echo "********   build the OCaml compiler with the included script     *********" 1>&2;
     echo "********    check http://mldonkey.sourceforge.net/Windows        *********" 1>&2;
-    echo "********   for instuctions how to compile Ocaml under MinGW      *********" 1>&2;
+    echo "********   for instuctions how to compile OCaml under MinGW      *********" 1>&2;
     exit 1
   else
 
   echo "********  Objective-Caml $REQUIRED_OCAML is required  *********" 1>&2;
   if  test "$WGET" = ""  &&  test "$REQUIRED_OCAML" != "SVN" ; then
     echo "********          wget is missing          *********" 1>&2;
-    echo "********       cannot download Ocaml       *********" 1>&2;
+    echo "********       cannot download OCaml       *********" 1>&2;
     exit 1
   fi
   echo "*******  Check http://caml.inria.fr/  ********" 1>&2;
@@ -4947,7 +4948,7 @@
           $WGET http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
-          echo "********        download Ocaml $REQUIRED_OCAML not successful, try do download it manually       *********" 1>&2;
+          echo "********        download OCaml $REQUIRED_OCAML not successful, try do download it manually       *********" 1>&2;
           echo "********        from http://caml.inria.fr/pub/distrib/                                   *********" 1>&2;
           echo "********        and copy the tar.gz into $PATCH_DIR              *********" 1>&2;
           exit 1
@@ -4987,7 +4988,7 @@
         rm -rf ocaml-"$REQUIRED_OCAML"
       fi
       cd $CONFIG_DIR
-      echo Ocaml locally installed for mldonkey
+      echo OCaml locally installed for mldonkey
 
       if test -f "$LOCAL_OCAML"/ocamlc.opt; then
          OCAMLC=$LOCAL_OCAML/ocamlc.opt
@@ -4997,7 +4998,7 @@
          OCAMLC=$LOCAL_OCAML/ocamlc
          ac_cv_prog_OCAMLC=$LOCAL_OCAML/ocamlc
       else
-        echo "Ocaml installation failed"; exit 1
+        echo "OCaml installation failed"; exit 1
       fi
       fi
       ;;
@@ -5420,9 +5421,9 @@
   CAMLP4LIB_OPT="dynlink.cmxa $CAMLP4LIB_OPT"
 fi
 
-# force usage of supported Ocaml versions
+# force usage of supported OCaml versions
 case "$OCAMLVERSION" in
-    3.10.1*|3.10.2*|3.1*) ;;
+    3.10.1*|3.10.2*|3.1*|4.*) ;;
     *)
       if  test "$REQUIRED_OCAML" != "SVN" ; then
         echo "********  Version $REQUIRED_OCAML of Objective-Caml is required  *********" 1>&2;
@@ -5449,7 +5450,7 @@
 fi
 
 echo "-------------------------------------------"
-echo "     Checking Ocaml $OCAMLVERSION finished."
+echo "     Checking OCaml $OCAMLVERSION finished."
 echo "-------------------------------------------"
 
 
@@ -5467,7 +5468,8 @@
     OCAMLOPT="$OCAMLOPT -g"
 fi
 
-echo -e "\n----------------------------------"
+echo ""
+echo "----------------------------------"
 echo "     Checking system headers."
 echo "----------------------------------"
 
@@ -6310,7 +6312,8 @@
 
 echo "-------------------------------------------"
 echo "     Checking system headers finished."
-echo -e "-------------------------------------------\n"
+echo "-------------------------------------------"
+echo ""
 echo "-----------------------------------"
 echo "     Checking system libraries."
 echo "-----------------------------------"
@@ -6530,25 +6533,25 @@
 if test "$UPNP_NATPMP_FORCE" = "yes"; then
 	UPNP_NATPMP=yes
 	cd $PATCH_DIR
-	$WGET http://miniupnp.tuxfamily.org/files/miniupnpc-1.4.20100609.tar.gz
-	$WGET http://miniupnp.tuxfamily.org/files/libnatpmp-20100202.tar.gz
+	$WGET http://miniupnp.tuxfamily.org/files/miniupnpc-1.6.tar.gz
+	$WGET http://miniupnp.tuxfamily.org/files/libnatpmp-20110808.tar.gz
 	mkdir -p $BUILD_DIR $LOCAL_DIR/usr/bin $LOCAL_DIR/usr/lib $LOCAL_DIR/usr/include/miniupnpc
 	cd $BUILD_DIR
-	rm -rf libnatpmp-20100202 miniupnpc-1.4.20100609
-	tar -xzf $PATCH_DIR/miniupnpc-1.4.20100609.tar.gz
-	tar -xzf $PATCH_DIR/libnatpmp-20100202.tar.gz
-	cd $BUILD_DIR/libnatpmp-20100202
+	rm -rf libnatpmp-20110808 miniupnpc-1.6
+	tar -xzf $PATCH_DIR/miniupnpc-1.6.tar.gz
+	tar -xzf $PATCH_DIR/libnatpmp-20110808.tar.gz
+	cd $BUILD_DIR/libnatpmp-20110808
 	make all install PREFIX=$LOCAL_DIR
-	cd $BUILD_DIR/miniupnpc-1.4.20100609
+	cd $BUILD_DIR/miniupnpc-1.6
 	make all install PREFIX=$LOCAL_DIR
 	cd $CONFIG_DIR
-	rm -rf $BUILD_DIR/libnatpmp-20100202 $BUILD_DIR/miniupnpc-1.4.20100609
+	rm -rf $BUILD_DIR/libnatpmp-20110808 $BUILD_DIR/miniupnpc-1.6
 	CPPFLAGS="${CPPFLAGS} -I$LOCAL_DIR/usr/include"
 	LDFLAGS="${LDFLAGS} -L$LOCAL_DIR/usr/lib"
 fi
 
 if test "$UPNP_NATPMP" = "yes"; then
-  echo "----- checking libminiupnpc >= 1.4.20100609 (optional)"
+  echo "----- checking libminiupnpc >= 1.6 (optional)"
   for ac_header in miniupnpc/miniupnpc.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "miniupnpc/miniupnpc.h" "ac_cv_header_miniupnpc_miniupnpc_h" "$ac_includes_default"
@@ -6607,7 +6610,7 @@
 fi
 
 if test "$UPNP_NATPMP" = "yes"; then
-  echo "----- checking libnatpmp >= 20100202 (optional)"
+  echo "----- checking libnatpmp >= 20110808 (optional)"
   for ac_header in natpmp.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "natpmp.h" "ac_cv_header_natpmp_h" "$ac_includes_default"
@@ -8570,7 +8573,8 @@
 
 echo "---------------------------------------------"
 echo "     Checking system libraries finished."
-echo -e "---------------------------------------------\n"
+echo "---------------------------------------------"
+echo ""
 
 CXX_VERSION=
 CRYPTOPPFLAGS=
@@ -10771,17 +10775,20 @@
 
 cd ..
 
-echo -e "\nBuilding dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)"
+echo ""
+echo "Building dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)"
 $GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: '$GNU_MAKE depend'"
 
-echo -e -n "\nConfiguring MLDonkey" $MLDONKEY_VERSION
+echo ""
+printf "Configuring MLDonkey %s" "$MLDONKEY_VERSION"
 if test ! -z "$SCM_VERSION"; then
-  echo -n " - SCM: $SCM_VERSION"
+  printf " - SCM: %s" "$SCM_VERSION"
 fi
-echo " completed."
+ec " completed.\n"
 
-echo -e "\nNetwork modules:"
-echo -n " - eDonkey           "
+echo ""
+echo "Network modules:"
+printf " - eDonkey           "
 if test "$DONKEY" = "yes"; then
   if test "$DONKEY_SUI" = "yes"; then
     echo "enabled (eMule SUI enabled)"
@@ -10792,119 +10799,120 @@
   echo "        disabled"
 fi
 
-echo -n " - BitTorrent        "
+printf " - BitTorrent        "
 if test "$BITTORRENT" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - FileTP (aka wget) "
+printf " - FileTP (aka wget) "
 if test "$FILETP" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Fasttrack         "
+printf " - Fasttrack         "
 if test "$FASTTRACK" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Gnutella          "
+printf " - Gnutella          "
 if test "$GNUTELLA" = "yes"; then
   echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi
 
-echo -n " - Gnutella2         "
+printf " - Gnutella2         "
 if test "$GNUTELLA2" = "yes"; then
   echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi
 
-echo -n " - Direct Connect    "
+printf " - Direct Connect    "
 if test "$DIRECT_CONNECT" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Open Napster      "
+printf " - Open Napster      "
 if test "$OPEN_NAPSTER" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -n " - Soulseek          "
+printf " - Soulseek          "
 if test "$SOULSEEK" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -n " - OpenFT            "
+printf " - OpenFT            "
 if test "$OPENFT" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -e "\nCore features:"
+echo ""
+echo "Core features:"
 
 echo " - zlib (required)   enabled"
 
-echo -n " - threads           "
+printf " - threads           "
 if test "$USE_PTHREAD" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - bzip2             "
+printf " - bzip2             "
 if test "$BZIP2" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - iconv             "
+printf " - iconv             "
 if test "$ICONV" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - libmagic          "
+printf " - libmagic          "
 if test "$MAGIC" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - upnp & natpmp     "
+printf " - upnp & natpmp     "
 if test "$UPNP_NATPMP" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - graphical stats   "
+printf " - graphical stats   "
 if test "$GD" = "yes"; then
   echo "enabled"
-  echo -n "   - png support     "
+  printf "   - png support     "
   if test "$GD_PNG" = "yes"; then
     echo "enabled"
   else
     echo "        disabled"
   fi
 
-  echo -n "   - jpg support     "
+  printf "   - jpg support     "
   if test "$GD_JPG" = "yes"; then
     echo "enabled"
   else
@@ -10915,7 +10923,8 @@
 fi
 
 if test "$LABLGTK_CONFIG" = "yes"; then
-  echo -n -e "\n - GUI support       "
+  echo ""
+  printf "\n - GUI support       "
   if test "$GUI" = "newgui1"; then
     echo "GTK1 newgui"
   else
@@ -10935,17 +10944,21 @@
   OCAML_TYPE="- byte code"
   COMPILE_TARGET=".byte"
 fi
-echo -e "\nCompilers:"
-echo -e " - Ocaml version     $OCAMLVERSION $OCAML_TYPE"
-echo -e " - $CC version       $CC_VERSION"
+echo ""
+printf "Compilers:"
+echo " - OCaml version     $OCAMLVERSION $OCAML_TYPE"
+echo " - $CC version       $CC_VERSION"
 if test "x$CXX" != "x"; then
-  echo -e " - $CXX version       $CXX_VERSION"
+  echo " - $CXX version       $CXX_VERSION"
 fi
-echo -e "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
+echo ""
+echo "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
 
-echo -e "\nTo compile a static code execute:     $GNU_MAKE mlnet$COMPILE_TARGET.static"
-echo      "To produce a release tarball execute: $GNU_MAKE release.mlnet.static"
-echo      "To clean the build directory execute: $GNU_MAKE maintainerclean"
+echo ""
+echo "To compile a static code execute:     $GNU_MAKE mlnet$COMPILE_TARGET.static"
+echo "To produce a release tarball execute: $GNU_MAKE release.mlnet.static"
+echo "To clean the build directory execute: $GNU_MAKE maintainerclean"
 if test "$DONKEY_SUI" = "yes"; then
-  echo -e "\nCompiling CryptoPP.cc can take several minutes, on slow machines up to half an hour."
+  echo ""
+  echo "Compiling CryptoPP.cc can take several minutes, on slow machines up to half an hour."
 fi

mldonkey-3.1.2.tar.bz2/config/configure.in -> mldonkey-3.1.3.tar.bz2/config/configure.in Changed

@@ -22,7 +22,7 @@
 
 MAJOR_VERSION=3
 MINOR_VERSION=1
-SUB_VERSION=2   # range 0-7 due to eMule limitations
+SUB_VERSION=3   # range 0-7 due to eMule limitations
 
 # **********                                                                                  **********
 # **********                                  check for C compiler                            **********
@@ -274,7 +274,7 @@
 fi
 
 # **********                                                                                  **********
-# **********             build MLDonkey version, Required Ocaml and LablGTK versions          **********
+# **********             build MLDonkey version, Required OCaml and LablGTK versions          **********
 # **********                                                                                  **********
 
 MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION
@@ -408,10 +408,10 @@
   AS_HELP_STRING([--enable-batch], [reply YES to all queries in this script]),
   [BATCH="$enableval"])
 AC_ARG_ENABLE(force-ocaml,
-  AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled Ocaml]),
+  AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled OCaml]),
   [FORCE_OCAML="$enableval"])
 AC_ARG_ENABLE(ocamlver,
-  AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific Ocaml version (3.10.1|SVN), ]),
+  AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific OCaml version (3.10.1|SVN), ]),
   [REQUIRED_OCAML="$enableval"])
 AC_ARG_ENABLE(mingw,
   AS_HELP_STRING([--enable-mingw], [force compilation with MINGW on Cygwin]),
@@ -485,7 +485,8 @@
 
 OCAML_PATH=
 
-echo -e "\n--------------------------------"
+echo ""
+echo "--------------------------------"
 echo "     Checking system tools."
 echo "--------------------------------"
 
@@ -529,10 +530,10 @@
 
 echo "----------------------------------------"
 echo "     Checking system tools finished."
-echo -e "----------------------------------------\n"
-
+echo "----------------------------------------"
+echo ""
 echo "--------------------------------"
-echo "     Checking Ocaml compiler."
+echo "     Checking OCaml compiler."
 echo "--------------------------------"
 
 CONFIG_DIR=$SOURCE_DIR/config
@@ -557,7 +558,7 @@
 else
   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *$.*$$|\1|p' `
   case "$OCAMLVERSION" in
-    "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
+    "$REQUIRED_OCAML"*|4.*|3.12.*|3.11.*|3.10.1*|3.10.2*) ;;
     *)
         echo "Need build"
         BUILD_OCAML=yes
@@ -575,18 +576,18 @@
 
   if [ test "$SYSTEM" = "mingw" ]; then
     echo "********         Objective-Caml $REQUIRED_OCAML is required               *********" 1>&2;
-    echo "********     no valid Ocaml compiler found on your system        *********" 1>&2;
+    echo "********     no valid OCaml compiler found on your system        *********" 1>&2;
     echo "********   on MinGW there is no possibility to let configure     *********" 1>&2;
-    echo "********   build the Ocaml compiler with the included script     *********" 1>&2;
+    echo "********   build the OCaml compiler with the included script     *********" 1>&2;
     echo "********    check http://mldonkey.sourceforge.net/Windows        *********" 1>&2;
-    echo "********   for instuctions how to compile Ocaml under MinGW      *********" 1>&2;
+    echo "********   for instuctions how to compile OCaml under MinGW      *********" 1>&2;
     exit 1
   else  
     
   echo "********  Objective-Caml $REQUIRED_OCAML is required  *********" 1>&2;
   if [ test "$WGET" = "" ] && [ test "$REQUIRED_OCAML" != "SVN" ]; then
     echo "********          wget is missing          *********" 1>&2;
-    echo "********       cannot download Ocaml       *********" 1>&2;
+    echo "********       cannot download OCaml       *********" 1>&2;
     exit 1
   fi
   echo "*******  Check http://caml.inria.fr/  ********" 1>&2;
@@ -614,7 +615,7 @@
           $WGET http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
         fi
         if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
-          echo "********        download Ocaml $REQUIRED_OCAML not successful, try do download it manually       *********" 1>&2;
+          echo "********        download OCaml $REQUIRED_OCAML not successful, try do download it manually       *********" 1>&2;
           echo "********        from http://caml.inria.fr/pub/distrib/                                   *********" 1>&2;
           echo "********        and copy the tar.gz into $PATCH_DIR              *********" 1>&2;
           exit 1
@@ -654,7 +655,7 @@
         rm -rf ocaml-"$REQUIRED_OCAML"
       fi
       cd $CONFIG_DIR
-      echo Ocaml locally installed for mldonkey
+      echo OCaml locally installed for mldonkey
 
       if test -f "$LOCAL_OCAML"/ocamlc.opt; then
          OCAMLC=$LOCAL_OCAML/ocamlc.opt
@@ -664,7 +665,7 @@
          OCAMLC=$LOCAL_OCAML/ocamlc
          ac_cv_prog_OCAMLC=$LOCAL_OCAML/ocamlc
       else
-        echo "Ocaml installation failed"; exit 1
+        echo "OCaml installation failed"; exit 1
       fi
       fi
       ;;
@@ -725,9 +726,9 @@
   CAMLP4LIB_OPT="dynlink.cmxa $CAMLP4LIB_OPT"
 fi
 
-# force usage of supported Ocaml versions
+# force usage of supported OCaml versions
 case "$OCAMLVERSION" in
-    3.10.1*|3.10.2*|3.1*) ;;
+    3.10.1*|3.10.2*|3.1*|4.*) ;;
     *)
       if [ test "$REQUIRED_OCAML" != "SVN" ]; then
         echo "********  Version $REQUIRED_OCAML of Objective-Caml is required  *********" 1>&2;
@@ -754,7 +755,7 @@
 fi
 
 echo "-------------------------------------------"
-echo "     Checking Ocaml $OCAMLVERSION finished."
+echo "     Checking OCaml $OCAMLVERSION finished."
 echo "-------------------------------------------"
 
 
@@ -772,7 +773,8 @@
     OCAMLOPT="$OCAMLOPT -g"
 fi
 
-echo -e "\n----------------------------------"
+echo ""
+echo "----------------------------------"
 echo "     Checking system headers."
 echo "----------------------------------"
 
@@ -826,7 +828,8 @@
 ])
 echo "-------------------------------------------"
 echo "     Checking system headers finished."
-echo -e "-------------------------------------------\n"
+echo "-------------------------------------------"
+echo ""
 echo "-----------------------------------"
 echo "     Checking system libraries."
 echo "-----------------------------------"
@@ -850,30 +853,30 @@
 if test "$UPNP_NATPMP_FORCE" = "yes"; then
 	UPNP_NATPMP=yes
 	cd $PATCH_DIR
-	$WGET http://miniupnp.tuxfamily.org/files/miniupnpc-1.4.20100609.tar.gz
-	$WGET http://miniupnp.tuxfamily.org/files/libnatpmp-20100202.tar.gz
+	$WGET http://miniupnp.tuxfamily.org/files/miniupnpc-1.6.tar.gz
+	$WGET http://miniupnp.tuxfamily.org/files/libnatpmp-20110808.tar.gz
 	mkdir -p $BUILD_DIR $LOCAL_DIR/usr/bin $LOCAL_DIR/usr/lib $LOCAL_DIR/usr/include/miniupnpc
 	cd $BUILD_DIR
-	rm -rf libnatpmp-20100202 miniupnpc-1.4.20100609
-	tar -xzf $PATCH_DIR/miniupnpc-1.4.20100609.tar.gz
-	tar -xzf $PATCH_DIR/libnatpmp-20100202.tar.gz
-	cd $BUILD_DIR/libnatpmp-20100202
+	rm -rf libnatpmp-20110808 miniupnpc-1.6
+	tar -xzf $PATCH_DIR/miniupnpc-1.6.tar.gz
+	tar -xzf $PATCH_DIR/libnatpmp-20110808.tar.gz
+	cd $BUILD_DIR/libnatpmp-20110808
 	make all install PREFIX=$LOCAL_DIR
-	cd $BUILD_DIR/miniupnpc-1.4.20100609
+	cd $BUILD_DIR/miniupnpc-1.6
 	make all install PREFIX=$LOCAL_DIR
 	cd $CONFIG_DIR
-	rm -rf $BUILD_DIR/libnatpmp-20100202 $BUILD_DIR/miniupnpc-1.4.20100609
+	rm -rf $BUILD_DIR/libnatpmp-20110808 $BUILD_DIR/miniupnpc-1.6
 	CPPFLAGS="${CPPFLAGS} -I$LOCAL_DIR/usr/include"
 	LDFLAGS="${LDFLAGS} -L$LOCAL_DIR/usr/lib"
 fi
 
 if test "$UPNP_NATPMP" = "yes"; then
-  echo "----- checking libminiupnpc >= 1.4.20100609 (optional)"
+  echo "----- checking libminiupnpc >= 1.6 (optional)"
   AC_CHECK_HEADERS(miniupnpc/miniupnpc.h,[AC_CHECK_LIB(miniupnpc,upnpDiscover,[UPNP_NATPMP=yes],[UPNP_NATPMP=no])],[UPNP_NATPMP=no])
 fi
 
 if test "$UPNP_NATPMP" = "yes"; then
-  echo "----- checking libnatpmp >= 20100202 (optional)"
+  echo "----- checking libnatpmp >= 20110808 (optional)"
   AC_CHECK_HEADERS(natpmp.h,[AC_CHECK_LIB(natpmp,initnatpmp,[UPNP_NATPMP=yes],[UPNP_NATPMP=no])],[UPNP_NATPMP=no])
 fi
 
@@ -1133,7 +1136,8 @@
 
 echo "---------------------------------------------"
 echo "     Checking system libraries finished."
-echo -e "---------------------------------------------\n"
+echo "---------------------------------------------"
+echo ""
 
 CXX_VERSION=
 CRYPTOPPFLAGS=
@@ -1572,17 +1576,20 @@
 
 cd ..
 
-echo -e "\nBuilding dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)"
+echo ""
+echo "Building dependencies (if it blocks, try '$GNU_MAKE depend' to see the problem)"
 $GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: '$GNU_MAKE depend'"
 
-echo -e -n "\nConfiguring MLDonkey" $MLDONKEY_VERSION
+echo ""
+printf "Configuring MLDonkey %s" "$MLDONKEY_VERSION"
 if test ! -z "$SCM_VERSION"; then
-  echo -n " - SCM: $SCM_VERSION"
+  printf " - SCM: %s" "$SCM_VERSION"
 fi
-echo " completed."
+ec " completed.\n"
 
-echo -e "\nNetwork modules:"
-echo -n " - eDonkey           "
+echo ""
+echo "Network modules:"
+printf " - eDonkey           "
 if test "$DONKEY" = "yes"; then
   if test "$DONKEY_SUI" = "yes"; then
     echo "enabled (eMule SUI enabled)"
@@ -1593,119 +1600,120 @@
   echo "        disabled"
 fi
 
-echo -n " - BitTorrent        "
+printf " - BitTorrent        "
 if test "$BITTORRENT" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - FileTP (aka wget) "
+printf " - FileTP (aka wget) "
 if test "$FILETP" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Fasttrack         "
+printf " - Fasttrack         "
 if test "$FASTTRACK" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Gnutella          "
+printf " - Gnutella          "
 if test "$GNUTELLA" = "yes"; then
   echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi
 
-echo -n " - Gnutella2         "
+printf " - Gnutella2         "
 if test "$GNUTELLA2" = "yes"; then
   echo "enabled (warning: this network module is unmaintained)"
 else
   echo "        disabled - unmaintained"
 fi
 
-echo -n " - Direct Connect    "
+printf " - Direct Connect    "
 if test "$DIRECT_CONNECT" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - Open Napster      "
+printf " - Open Napster      "
 if test "$OPEN_NAPSTER" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -n " - Soulseek          "
+printf " - Soulseek          "
 if test "$SOULSEEK" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -n " - OpenFT            "
+printf " - OpenFT            "
 if test "$OPENFT" = "yes"; then
   echo "enabled          - currently not usable"
 else
   echo "        disabled - currently not usable"
 fi
 
-echo -e "\nCore features:"
+echo ""
+echo "Core features:"
 
 echo " - zlib (required)   enabled"
 
-echo -n " - threads           "
+printf " - threads           "
 if test "$USE_PTHREAD" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - bzip2             "
+printf " - bzip2             "
 if test "$BZIP2" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - iconv             "
+printf " - iconv             "
 if test "$ICONV" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - libmagic          "
+printf " - libmagic          "
 if test "$MAGIC" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - upnp & natpmp     "
+printf " - upnp & natpmp     "
 if test "$UPNP_NATPMP" = "yes"; then
   echo "enabled"
 else
   echo "        disabled"
 fi
 
-echo -n " - graphical stats   "
+printf " - graphical stats   "
 if test "$GD" = "yes"; then
   echo "enabled"
-  echo -n "   - png support     "
+  printf "   - png support     "
   if test "$GD_PNG" = "yes"; then
     echo "enabled"
   else
     echo "        disabled"
   fi
 
-  echo -n "   - jpg support     "
+  printf "   - jpg support     "
   if test "$GD_JPG" = "yes"; then
     echo "enabled"
   else
@@ -1716,7 +1724,8 @@
 fi
 
 if test "$LABLGTK_CONFIG" = "yes"; then
-  echo -n -e "\n - GUI support       "
+  echo ""
+  printf "\n - GUI support       "
   if test "$GUI" = "newgui1"; then
     echo "GTK1 newgui"
   else
@@ -1736,17 +1745,21 @@
   OCAML_TYPE="- byte code"
   COMPILE_TARGET=".byte"
 fi
-echo -e "\nCompilers:"
-echo -e " - Ocaml version     $OCAMLVERSION $OCAML_TYPE"
-echo -e " - $CC version       $CC_VERSION"
+echo ""
+printf "Compilers:"
+echo " - OCaml version     $OCAMLVERSION $OCAML_TYPE"
+echo " - $CC version       $CC_VERSION"
 if test "x$CXX" != "x"; then
-  echo -e " - $CXX version       $CXX_VERSION"
+  echo " - $CXX version       $CXX_VERSION"
 fi
-echo -e "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
+echo ""
+echo "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
 
-echo -e "\nTo compile a static code execute:     $GNU_MAKE mlnet$COMPILE_TARGET.static"
-echo      "To produce a release tarball execute: $GNU_MAKE release.mlnet.static"
-echo      "To clean the build directory execute: $GNU_MAKE maintainerclean"
+echo ""
+echo "To compile a static code execute:     $GNU_MAKE mlnet$COMPILE_TARGET.static"
+echo "To produce a release tarball execute: $GNU_MAKE release.mlnet.static"
+echo "To clean the build directory execute: $GNU_MAKE maintainerclean"
 if test "$DONKEY_SUI" = "yes"; then
-  echo -e "\nCompiling CryptoPP.cc can take several minutes, on slow machines up to half an hour."
+  echo ""
+  echo "Compiling CryptoPP.cc can take several minutes, on slow machines up to half an hour."
 fi

mldonkey-3.1.2.tar.bz2/distrib/ChangeLog -> mldonkey-3.1.3.tar.bz2/distrib/ChangeLog Changed

@@ -14,6 +14,31 @@
 ChangeLog
 =========
 
+2012/08/05: version 3.1.3 = tag release-3-1-3
+
+2012/07/27
+7756: BT: Add support for magnet links (ygrek, jave)
+
+2012/07/01
+7813: Fix segfault on Solaris/OpenIndiana in md4 code written in C (dcoppa)
+7812: FreeBSD: proper version identification (lioux)
+
+2012/06/24
+7805: Update upnp libraries
+7804: new option filenames_utf8 (ygrek)
+7803: pause conditions: "pause where priority < X" (ygrek)
+7802: Do not leave empty files if code generation fails (ygrek)
+7801: HTML: Fix content-type for 401 error (ygrek)
+7800: Improve error message visibility (ygrek)
+7799: HTML: fix validation errors (ygrek)
+7798: Fix Mac OS X compilation (ygrek)
+7797: allow build with upcoming OCaml 4.00 (ygrek)
+7795: spelling fix, official language name is "OCaml" (ygrek)
+7796: configure: fix non-portable use of echo (ygrek)
+
+2012/05/23
+7784: IP discover: Fix broken URL
+-------------------------------------------------------------------------------
 2012/05/13: version 3.1.2 = tag release-3-1-2 (expect no binary updates)
 7726: Add support for Debian/Hurd, really ;)
 
@@ -340,289 +365,6 @@
 6752: Optimized implementation of the ip_set module (cbah)
 6736: Add/fix some copyright texts
 -------------------------------------------------------------------------------
-2009/01/20: version 2.9.7 = tag release-2-9-7
-6727: Web_infos: Replace old GeoIP URL with new one
-- old code added the new URL, even if GeoIP was not present in web_infos
-
-2009/01/04
-6714: BT: Fix bug when computing limits for max_bt_uploaders
-6713: GeoIP: New web_infos URL for country list (thx to Choby)
-- old URLs are updated to:
-  http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
-
-2008/12/13
-6689: Allow compilation with Ocaml 3.11.0
-
-2008/09/01
-6629: Mail: Move hostname from subject to body (eydaimon)
-Updated Mozilla protocol handler to version 2.5
-- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
-6628: IP discover: Use http://whatismyip.org, old URL is not working anymore
--------------------------------------------------------------------------------
-2008/08/04: version 2.9.6 = tag release-2-9-6
-6599: Allow values lower than max_upload_slots for BT-max_bt_uploaders
-
-2008/07/29
-6593: CryptoPP performance fix for ARM (Marc Pignat)
-6592: HTML: Fix invalid html respond when login is invalid
-
-2008/07/17
-6571: Runinfo: Include DirectConnect in list of enabled nets
-
-2008/07/02
-6558: Fix text relocation warnings on hardened distributions (Davide Pesavento)
-6557: BT: Send correct downloaded value when download is stopped to tracker
-      (Fox Mulder)
--------------------------------------------------------------------------------
-2008/05/02: version 2.9.5 = tag release-2-9-5
-6503: Remove release status when download is finished
-
-2008/03/31
-6465: BT: Send correct downloaded value when download starts to tracker
-      (colchaodemola)
-6477: Use $MLDONKEY_DIR/mlnet_tmp instead of /tmp
-- This patch fixes problems with hash checking of multifile BT
-  downloads when /tmp is too small.
-- To override $MLDONKEY_DIR/mlnet_tmp use variable $MLDONKEY_TEMP.
-  This patch has nothing to do with option temp_directory.
-6472: Multiuser: Count only files in download queue for user/group statistics
-6471: Clean logfile
-6470: BT: Use default of max_upload_slots as minimum for BT-max_bt_uploaders
-      instead of hard-coded value
-
-2008/03/18
-6466: Fix option_hook loop when changing max_upload_slots < 3,
-      caused by patch #6451
-
-2008/03/14
-6462: Multiuser: Restrict chown to admin users only
-
-2008/03/11
-6458: Fix commit bug when filesystem reports negative values
-      for maximum filename length
-
-2008/03/07
-6451: BT: Implement minimum of 3 (like max_upload_slots)
-      for option max_bt_uploaders
--------------------------------------------------------------------------------
-2008/03/02: version 2.9.4 = tag release-2-9-4
-6440: GTK2 GUI: Compile with lablgtk-2.10.1 by default
-- lablgtk-2.10.0 does not compile with Ocaml 3.10.2
-
-2008/02/29
-6439: Configure: Make Ocaml 3.10.2 the default compiler
-
-2008/02/06
-6407: New options run_as_group/run_as_groupgid
-- works the same way as options run_as_user/run_as_useruid
-- display system user:group running MLDonkey core in runinfo
-6406: Mail: Fix bug in rfc2047 encoding
-
-2008/02/05
-6404: New option release_new_downloads
-- set to true to activate release slot feature for all newly started downloads
-
-2008/02/04
-6080: HTTP interface: new command/button "logout" (Schlumpf)
-6077: bw_toggle: support new option "max_opened_connections_2" (Schlumpf)
-6401: Swarmer: Correctly update file_downloaded during recover_temp (pango)
-6400: EDK: Correctly update filename after recover_temp
-6396: Log: Print user:group when starting a download
-6395: Makefile: Do not strip shared linked binaries on Mac OS X, clean Makefile
-
-2008/01/24
-6381: Multiuser: Block commands "shares" and "share" for non-admin users
--------------------------------------------------------------------------------
-2008/01/16: version 2.9.3 = tag release-2-9-3
-6379: bwstats: Show downloaded bytes (pango)
-
-2008/01/16
-6377: Configure: Make Ocaml 3.10.1 the default compiler
-- Ocaml 3.10.1 fixes crashes in MLDonkeys eDonkey module when compiled with
-  Ocaml 3.10.0 on 64bit systems
-
-2008/01/15
-6373: Swarmer: Ignore received data when file is queued
-
-2008/01/08
-6367: FileTP: Fix bug when starting downloads > 4GB via dllink
-
-2008/01/07
-6364: MinGW: Fix broken share priorities (thx to vbnuy6)
-6365: HTML: Use option max_name_len in upstats for unhashed files
-
-2008/01/04
-6362: Small Geoip updates
-- new countries + flags: Saint Barthelemy, Saint Martin
-- updates flags: Georgia, Democratic Republic of the Congo, Western Sahara, Lesotho
-
-2008/01/02
-6361: GUI: Send console messages to admin users after unsharing a file
-6349: DirectConnect: Correctly report total shared filesize to server (LuCasn)
-6360: BT: New command print_torrent <file_num>,
-      new link in HTML, upstats to display .torrent details
-
-2007/12/19
-6351: Allow compilation with upcoming Ocaml 3.10.1
-
-2007/12/17
-6342: HTML: fix broken vm output in Opera (schlumpf)
-6346: Environment variables for file_started_cmd (see option help text)
-
-2007/12/13
-6343: gcc-4.3 compile fix for CryptoPP (brian m. carlson)
-
-2007/12/09
-6337: Fix inequality test for option html_mods_theme (pango)
-
-2007/11/03
-6255: Fix compile warnings for GTK2 GUI and DC++ (pango)
--------------------------------------------------------------------------------
-2007/10/20: version 2.9.2 = tag release-2-9-2
-6242: Allow deactivation of [telnet|gui|gift]_port by setting it to 0
-
-2007/10/17
-6240: GTK1 oldgui: Hide password in server settings
-6239: Update GNU config.guess and config.sub to version 2007/07
-Updated Mozilla protocol handler to version 2.2
-- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
-6238: Fix statvfs code on alpha platform (Alexander Kotelnikov)
-6237: EDK: Load server.met files from archives even if unpack fails
-- http://www.gruk.org/server.met.gz is not a gz archive at the moment...
-
-2007/10/10
-6231: Swarming: Propagate chunks of finished file before commit (pango)
-      to other downloading files
-
-2007/10/04
-6223: GTK2 GUI: Compile with lablgtk-2.10.0 by default
-- this patch changes the lablgtk2 version used by ./configure
-- self-compiled lablgtk-2.10.0 must be patched with patches/lablgtk-2.10.0.patch
-
-2007/09/30
-6221: Configure: Remove unneeded checks
-6220: GTK2 GUI: Fix compile bug due to changed API in lablgtk-2.10.0
-- GTK2 GUI still compiles with older versions of lablgtk2
-
-2007/09/13
-6197: Options backup: Better log messages, remove useless exception
--------------------------------------------------------------------------------
-2007/09/09: version 2.9.1 = tag release-2-9-1
-6192: EDK: Use discovered client_ip when lowid
-
-2007/09/05
-6187: BT: Fix wrong file order of multifile torrents due to patch #6174
-
-2007/09/01
-6179: BT: Send correct downloaded amount to tracker when download completed
-6174: BT: Encode non-UTF8 filenames using "encoding" or "codepage" data
-      from .torrent if present
-
-2007/08/31
-6175: Yet another patch for share_scan_interval
-- new default 30 minutes for newly created ini files
-- still use 0 to disable
-- hard-coded global minimum of 5 minutes, this updates old default 1 to 5
-- automated options update, if update is needed (options_version <= 19) and
-  share_scan_interval = 5 (because of new hard-coded minimum, which is
-  processed earlier) its changed to new default of 30
-6145: EDK: Update options description of max_connected_servers (Schlumpf)
-6172: EDK: properly advertise and honour noviewshared tag (TripleM)
-
-2007/08/23
-6160: BT: Another fix for share_scan_interval
-- Old hard-coded default was 300s, now with share_scan_interval its
-  possible to use a minimum of 60s which produces high CPU load.
-  This patch implements a minimum of 300s for the BT share_files timer.
-
-2007/08/04
-6128: New default for option messages_filter (unease)
-6132: HTML: Fix group display in vd <num> for admin users
-      view of other users files
-6130: Change API for network_parse_url, support user group
-6127: HTML: Display file_chunk_sizes/file_piece_size in vd <num>
-6135: BT: Fix high CPU load when share_scan_interval = 0
-      due to buggy patch #6049 (thx to darkman)
--------------------------------------------------------------------------------
-2007/07/27: version 2.9.0 = tag release-2-9-0
-6118: Configure: Update defaults
-- enable DirectConnect by default 
-- disable Gnutella & Gnutella2 by default
-  - MLDonkey does not support UDP host cache and contains
-    non-working GWebCache URLs
-  - Gnutella/G2 code has not been updated for several years,
-    its officially unmaintained for now
-  - remove non-existing GWebCache URLs
-
-2007/07/25
-6087: Fix logging of verbosity "bw", remove obsolete options
-6085: BT: Improve UTF8 support
-- parse field "encoding"
-- use field "name.utf8" instead of "name", if available
-
-2007/07/10
-5996: BT: Recognize more client types (orbit)
-6065: DirectConnect: Support dc++ hublist in web_infos
-6063: BT: Better detect single-file torrents
-
-2007/07/03
-6068: BT: Fix download start when torrents/downloads filesystem
-      allows more than 16M chars
-
-2007/07/01
-6064: BT: Earlier first scan of torrents/incoming/*
-6053: HTML: Send correct filename when previewing (chandlerding)
-6061: Options: New type port_option, values are bound to be >= 0 and <= 65535
-6060: Do not send mail notifications when smtp_server = ""
-6059: Multiuser: Avoid double group entries in user_groups
-6056: Log username, IP:port and old/new value when changing options
-
-2007/06/30
-6049: BT: Support user_commit_dir when seeding,
-      reshare every share_scan_interval minutes
-
-2007/06/26
-Move docs/multiuser.txt to distrib/multiuser.txt
-6048: Make Ocaml 3.10.0 the default compiler
-- MLDonkey can still be compiled with Ocaml 3.08.3/4 & 3.09.*
-- if you need GTK1 oldgui you must use Ocaml < 3.10.0 to compile
-
-2007/06/24
-6044: BT: Limit max_bt_uploaders to max_upload_slots (pango)
-6043: Discover WAN IP
-- new command "discover_ip" to force discovery
-- new option "discover_ip" to enable automatic discovery on startup
-  and after SIGHUP, default true
-- this patch is important for BT-only usage, without this patch the
-  WAN IP was discovered only by using EDK server replies
-6034: Load $MLDONKEY/web_infos/* before activating network modules
-- this fixes a security hole when networks started connecting
-  before IP blocklist was loaded
-6025: Extend command "links" to optionally display all downloading files
-- "links" displays all files, not only shared ones like before
-- "links shared" lists only shared files
-- "links downloading" lists only downloading files
-
-2007/06/18
-6024: Multiuser: New parameters for command useradd:
-      user_mail + user_max_concurrent_downloads
-
-2007/06/17
-6021: Remove leftovers from optional zlib support,
-      replace Autoconf.zlib__* with Zlib.* functions
-6005: Swarmer: Implement new download mechanism
-- its now possible to switch the order blocks are downloaded from random
-  (first and last block first, default) to linear
-- new command: download_order <file number> <random|linear>
-6017: Multiuser: New optional parameters group/commit_dir for command useradd
-6020: Multiuser: Fix handling of user "admin", its user_commit_dir was not
-      used when MLDonkey was not restarted between download start and commit
-6019: BT: Disable user_commit_dir for multifile torrents to fix seeding
-6011: BT: Send no_peer_id to trackers to save some bandwidth (berni)
-6010: Update syslog.ml to version 1.4
-5995: EDK: Better handle permission denied errors for shared/downloading files
-5992: BT/IP block: Fix country-based IP blocking
--------------------------------------------------------------------------------
-Split Changelog, all stuff older than 2.9.0 is now in docs/ChangeLog.old:
+Split Changelog, all stuff older than 3.0.0 is now in docs/ChangeLog.old:
 
 http://savannah.nongnu.org/cgi-bin/viewcvs/mldonkey/mldonkey/docs/ChangeLog.old?rev=HEAD&content-type=text/vnd.viewcvs-markup

mldonkey-3.1.2.tar.bz2/distrib/Install.txt -> mldonkey-3.1.3.tar.bz2/distrib/Install.txt Changed

mldonkey-3.1.2.tar.bz2/docs/ChangeLog.old -> mldonkey-3.1.3.tar.bz2/docs/ChangeLog.old Changed

@@ -4,9 +4,292 @@
 All numbers mentioned here can be found as patches on
 http://savannah.nongnu.org/patch/?group=mldonkey
 
-2009/10/23: spiralvoice
+2012/07/01: spiralvoice
 
-Split Changelog, all stuff newer than 2.8.7 is now in distrib/ChangeLog
+Split Changelog, all stuff newer than 2.9.7 is now in distrib/ChangeLog
+-------------------------------------------------------------------------------
+2009/01/20: version 2.9.7 = tag release-2-9-7
+6727: Web_infos: Replace old GeoIP URL with new one
+- old code added the new URL, even if GeoIP was not present in web_infos
+
+2009/01/04
+6714: BT: Fix bug when computing limits for max_bt_uploaders
+6713: GeoIP: New web_infos URL for country list (thx to Choby)
+- old URLs are updated to:
+  http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
+
+2008/12/13
+6689: Allow compilation with Ocaml 3.11.0
+
+2008/09/01
+6629: Mail: Move hostname from subject to body (eydaimon)
+Updated Mozilla protocol handler to version 2.5
+- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
+6628: IP discover: Use http://whatismyip.org, old URL is not working anymore
+-------------------------------------------------------------------------------
+2008/08/04: version 2.9.6 = tag release-2-9-6
+6599: Allow values lower than max_upload_slots for BT-max_bt_uploaders
+
+2008/07/29
+6593: CryptoPP performance fix for ARM (Marc Pignat)
+6592: HTML: Fix invalid html respond when login is invalid
+
+2008/07/17
+6571: Runinfo: Include DirectConnect in list of enabled nets
+
+2008/07/02
+6558: Fix text relocation warnings on hardened distributions (Davide Pesavento)
+6557: BT: Send correct downloaded value when download is stopped to tracker
+      (Fox Mulder)
+-------------------------------------------------------------------------------
+2008/05/02: version 2.9.5 = tag release-2-9-5
+6503: Remove release status when download is finished
+
+2008/03/31
+6465: BT: Send correct downloaded value when download starts to tracker
+      (colchaodemola)
+6477: Use $MLDONKEY_DIR/mlnet_tmp instead of /tmp
+- This patch fixes problems with hash checking of multifile BT
+  downloads when /tmp is too small.
+- To override $MLDONKEY_DIR/mlnet_tmp use variable $MLDONKEY_TEMP.
+  This patch has nothing to do with option temp_directory.
+6472: Multiuser: Count only files in download queue for user/group statistics
+6471: Clean logfile
+6470: BT: Use default of max_upload_slots as minimum for BT-max_bt_uploaders
+      instead of hard-coded value
+
+2008/03/18
+6466: Fix option_hook loop when changing max_upload_slots < 3,
+      caused by patch #6451
+
+2008/03/14
+6462: Multiuser: Restrict chown to admin users only
+
+2008/03/11
+6458: Fix commit bug when filesystem reports negative values
+      for maximum filename length
+
+2008/03/07
+6451: BT: Implement minimum of 3 (like max_upload_slots)
+      for option max_bt_uploaders
+-------------------------------------------------------------------------------
+2008/03/02: version 2.9.4 = tag release-2-9-4
+6440: GTK2 GUI: Compile with lablgtk-2.10.1 by default
+- lablgtk-2.10.0 does not compile with Ocaml 3.10.2
+
+2008/02/29
+6439: Configure: Make Ocaml 3.10.2 the default compiler
+
+2008/02/06
+6407: New options run_as_group/run_as_groupgid
+- works the same way as options run_as_user/run_as_useruid
+- display system user:group running MLDonkey core in runinfo
+6406: Mail: Fix bug in rfc2047 encoding
+
+2008/02/05
+6404: New option release_new_downloads
+- set to true to activate release slot feature for all newly started downloads
+
+2008/02/04
+6080: HTTP interface: new command/button "logout" (Schlumpf)
+6077: bw_toggle: support new option "max_opened_connections_2" (Schlumpf)
+6401: Swarmer: Correctly update file_downloaded during recover_temp (pango)
+6400: EDK: Correctly update filename after recover_temp
+6396: Log: Print user:group when starting a download
+6395: Makefile: Do not strip shared linked binaries on Mac OS X, clean Makefile
+
+2008/01/24
+6381: Multiuser: Block commands "shares" and "share" for non-admin users
+-------------------------------------------------------------------------------
+2008/01/16: version 2.9.3 = tag release-2-9-3
+6379: bwstats: Show downloaded bytes (pango)
+
+2008/01/16
+6377: Configure: Make Ocaml 3.10.1 the default compiler
+- Ocaml 3.10.1 fixes crashes in MLDonkeys eDonkey module when compiled with
+  Ocaml 3.10.0 on 64bit systems
+
+2008/01/15
+6373: Swarmer: Ignore received data when file is queued
+
+2008/01/08
+6367: FileTP: Fix bug when starting downloads > 4GB via dllink
+
+2008/01/07
+6364: MinGW: Fix broken share priorities (thx to vbnuy6)
+6365: HTML: Use option max_name_len in upstats for unhashed files
+
+2008/01/04
+6362: Small Geoip updates
+- new countries + flags: Saint Barthelemy, Saint Martin
+- updates flags: Georgia, Democratic Republic of the Congo, Western Sahara, Lesotho
+
+2008/01/02
+6361: GUI: Send console messages to admin users after unsharing a file
+6349: DirectConnect: Correctly report total shared filesize to server (LuCasn)
+6360: BT: New command print_torrent <file_num>,
+      new link in HTML, upstats to display .torrent details
+
+2007/12/19
+6351: Allow compilation with upcoming Ocaml 3.10.1
+
+2007/12/17
+6342: HTML: fix broken vm output in Opera (schlumpf)
+6346: Environment variables for file_started_cmd (see option help text)
+
+2007/12/13
+6343: gcc-4.3 compile fix for CryptoPP (brian m. carlson)
+
+2007/12/09
+6337: Fix inequality test for option html_mods_theme (pango)
+
+2007/11/03
+6255: Fix compile warnings for GTK2 GUI and DC++ (pango)
+-------------------------------------------------------------------------------
+2007/10/20: version 2.9.2 = tag release-2-9-2
+6242: Allow deactivation of [telnet|gui|gift]_port by setting it to 0
+
+2007/10/17
+6240: GTK1 oldgui: Hide password in server settings
+6239: Update GNU config.guess and config.sub to version 2007/07
+Updated Mozilla protocol handler to version 2.2
+- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
+6238: Fix statvfs code on alpha platform (Alexander Kotelnikov)
+6237: EDK: Load server.met files from archives even if unpack fails
+- http://www.gruk.org/server.met.gz is not a gz archive at the moment...
+
+2007/10/10
+6231: Swarming: Propagate chunks of finished file before commit (pango)
+      to other downloading files
+
+2007/10/04
+6223: GTK2 GUI: Compile with lablgtk-2.10.0 by default
+- this patch changes the lablgtk2 version used by ./configure
+- self-compiled lablgtk-2.10.0 must be patched with patches/lablgtk-2.10.0.patch
+
+2007/09/30
+6221: Configure: Remove unneeded checks
+6220: GTK2 GUI: Fix compile bug due to changed API in lablgtk-2.10.0
+- GTK2 GUI still compiles with older versions of lablgtk2
+
+2007/09/13
+6197: Options backup: Better log messages, remove useless exception
+-------------------------------------------------------------------------------
+2007/09/09: version 2.9.1 = tag release-2-9-1
+6192: EDK: Use discovered client_ip when lowid
+
+2007/09/05
+6187: BT: Fix wrong file order of multifile torrents due to patch #6174
+
+2007/09/01
+6179: BT: Send correct downloaded amount to tracker when download completed
+6174: BT: Encode non-UTF8 filenames using "encoding" or "codepage" data
+      from .torrent if present
+
+2007/08/31
+6175: Yet another patch for share_scan_interval
+- new default 30 minutes for newly created ini files
+- still use 0 to disable
+- hard-coded global minimum of 5 minutes, this updates old default 1 to 5
+- automated options update, if update is needed (options_version <= 19) and
+  share_scan_interval = 5 (because of new hard-coded minimum, which is
+  processed earlier) its changed to new default of 30
+6145: EDK: Update options description of max_connected_servers (Schlumpf)
+6172: EDK: properly advertise and honour noviewshared tag (TripleM)
+
+2007/08/23
+6160: BT: Another fix for share_scan_interval
+- Old hard-coded default was 300s, now with share_scan_interval its
+  possible to use a minimum of 60s which produces high CPU load.
+  This patch implements a minimum of 300s for the BT share_files timer.
+
+2007/08/04
+6128: New default for option messages_filter (unease)
+6132: HTML: Fix group display in vd <num> for admin users
+      view of other users files
+6130: Change API for network_parse_url, support user group
+6127: HTML: Display file_chunk_sizes/file_piece_size in vd <num>
+6135: BT: Fix high CPU load when share_scan_interval = 0
+      due to buggy patch #6049 (thx to darkman)
+-------------------------------------------------------------------------------
+2007/07/27: version 2.9.0 = tag release-2-9-0
+6118: Configure: Update defaults
+- enable DirectConnect by default 
+- disable Gnutella & Gnutella2 by default
+  - MLDonkey does not support UDP host cache and contains
+    non-working GWebCache URLs
+  - Gnutella/G2 code has not been updated for several years,
+    its officially unmaintained for now
+  - remove non-existing GWebCache URLs
+
+2007/07/25
+6087: Fix logging of verbosity "bw", remove obsolete options
+6085: BT: Improve UTF8 support
+- parse field "encoding"
+- use field "name.utf8" instead of "name", if available
+
+2007/07/10
+5996: BT: Recognize more client types (orbit)
+6065: DirectConnect: Support dc++ hublist in web_infos
+6063: BT: Better detect single-file torrents
+
+2007/07/03
+6068: BT: Fix download start when torrents/downloads filesystem
+      allows more than 16M chars
+
+2007/07/01
+6064: BT: Earlier first scan of torrents/incoming/*
+6053: HTML: Send correct filename when previewing (chandlerding)
+6061: Options: New type port_option, values are bound to be >= 0 and <= 65535
+6060: Do not send mail notifications when smtp_server = ""
+6059: Multiuser: Avoid double group entries in user_groups
+6056: Log username, IP:port and old/new value when changing options
+
+2007/06/30
+6049: BT: Support user_commit_dir when seeding,
+      reshare every share_scan_interval minutes
+
+2007/06/26
+Move docs/multiuser.txt to distrib/multiuser.txt
+6048: Make Ocaml 3.10.0 the default compiler
+- MLDonkey can still be compiled with Ocaml 3.08.3/4 & 3.09.*
+- if you need GTK1 oldgui you must use Ocaml < 3.10.0 to compile
+
+2007/06/24
+6044: BT: Limit max_bt_uploaders to max_upload_slots (pango)
+6043: Discover WAN IP
+- new command "discover_ip" to force discovery
+- new option "discover_ip" to enable automatic discovery on startup
+  and after SIGHUP, default true
+- this patch is important for BT-only usage, without this patch the
+  WAN IP was discovered only by using EDK server replies
+6034: Load $MLDONKEY/web_infos/* before activating network modules
+- this fixes a security hole when networks started connecting
+  before IP blocklist was loaded
+6025: Extend command "links" to optionally display all downloading files
+- "links" displays all files, not only shared ones like before
+- "links shared" lists only shared files
+- "links downloading" lists only downloading files
+
+2007/06/18
+6024: Multiuser: New parameters for command useradd:
+      user_mail + user_max_concurrent_downloads
+
+2007/06/17
+6021: Remove leftovers from optional zlib support,
+      replace Autoconf.zlib__* with Zlib.* functions
+6005: Swarmer: Implement new download mechanism
+- its now possible to switch the order blocks are downloaded from random
+  (first and last block first, default) to linear
+- new command: download_order <file number> <random|linear>
+6017: Multiuser: New optional parameters group/commit_dir for command useradd
+6020: Multiuser: Fix handling of user "admin", its user_commit_dir was not
+      used when MLDonkey was not restarted between download start and commit
+6019: BT: Disable user_commit_dir for multifile torrents to fix seeding
+6011: BT: Send no_peer_id to trackers to save some bandwidth (berni)
+6010: Update syslog.ml to version 1.4
+5995: EDK: Better handle permission denied errors for shared/downloading files
+5992: BT/IP block: Fix country-based IP blocking
 -------------------------------------------------------------------------------
 2007/06/03: version 2.8.7 = tag release-2-8-7
 5988: BT: Completely parse handshake packet of newer BT clients (thx to Berni)

mldonkey-3.1.2.tar.bz2/src/daemon/common/commonGlobals.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/common/commonGlobals.ml Changed

mldonkey-3.1.2.tar.bz2/src/daemon/common/commonInteractive.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/common/commonInteractive.ml Changed

mldonkey-3.1.2.tar.bz2/src/daemon/common/commonMessages.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/common/commonMessages.ml Changed

@@ -1006,10 +1006,10 @@
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onclick=\"dllink();\">" ^ _s
 "DL" ^ "</TD></TR></TBODY></TABLE></TD>
-<TD noWrap width=100% title=\\\" " ^ _s "Input mldonkey commands here" ^ " \\\">
+<TD noWrap width=\"100%\" title=\" " ^ _s "Input mldonkey commands here" ^ " \">
 <TABLE cellSpacing=0 cellpadding=0 width=\"100%\"><TBODY><TR>
 <TD style=\"height: 1%; padding: 0px; border: 0px; padding-left: 5px;\" title=\" " ^ _s "Input mldonkey command here" ^ " \">
-<INPUT class=\"txt2\" style=\"WIDTH: 99%;\" name=q><body onload=\"document.cmdFormular.q.focus();\">
+<INPUT class=\"txt2\" style=\"WIDTH: 99%;\" name=q>
 </TD></TR></TBODY></TABLE></TD><TD noWrap>
 <TABLE class=commands cellSpacing=0 cellPadding=0 width=\"100%\"><TBODY><TR>
 <TD class=\"bu bbigm\" style=\"padding-top: 0px; padding-bottom: 0px;\" title=\" " ^ _s "Input Command" ^ " \">
@@ -1019,6 +1019,11 @@
 </TR></TABLE>
 
 
+
+<script type=\"text/javascript\">
+document.forms['cmdFormular'].elements['q'].focus();
+</script>
+
 <DIV ID=\"tab1\" style=\"display: none\">
 <TABLE class=commands cellSpacing=0 cellPadding=0 width=\"100%\">
 <TBODY><TR>

mldonkey-3.1.2.tar.bz2/src/daemon/common/commonOptions.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/common/commonOptions.ml Changed

mldonkey-3.1.2.tar.bz2/src/daemon/common/commonTypes.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/common/commonTypes.ml Changed

@@ -116,8 +116,9 @@
   | "ttr" -> TigerTree (TigerTree.of_string rem)
   | "md5" ->  Md5 (Md5.of_string rem)
   | "sig2dat" -> Md5Ext (Md5Ext.of_base32 rem)
-  | "bt" | "bittorrent" | "btih" -> 
-      BTUrl (Sha1.of_string rem)
+  | "bt" | "btih" ->
+    (* accept both base32 (32 chars) and base16 (40 chars) *)
+    BTUrl (if String.length rem = 40 then Sha1.of_hexa rem else Sha1.of_string rem)
   | "filetp" -> FileTP (Md4.of_string rem)
   | _ -> raise (Illegal_urn (s ^ " at " ^ sign ^ " is not known"))
 
@@ -211,6 +212,7 @@
     let uids = ref [] in
     let name = ref "" in
     let size = ref None in
+    let trackers = ref [] in
     let each k v =
       match String2.split k '.' with
       | "xt"::_ -> uids := Uid.of_string v :: !uids
@@ -220,7 +222,7 @@
       | "xs"::_ -> () (* eXtra source *)
       | "mt"::_ -> () (* manifest topic: url or urn, see http://rakjar.de/gnuticles/MAGMA-Specsv22.txt *)
       | "kt"::_ -> () (* keywords topic *)
-      | "tr"::_ -> () (* BT tracker *)
+      | "tr"::_ -> trackers := Url.decode v :: !trackers
       | "x"::_ -> () (* extensions *)
 (*
       | _ when v = "" ->
@@ -234,7 +236,12 @@
       try each k v
       with exn -> lprintf_nl "MAGNET: field %S=%S, exn %s" k v (Printexc2.to_string exn)
     ) url.Url.args;
-    object method name = !name method size = !size method uids = List.map Uid.to_uid (Uid.expand !uids) end
+    object
+      method name = !name
+      method size = !size
+      method uids = List.map Uid.to_uid (Uid.expand !uids)
+      method trackers = !trackers
+    end
   else 
     raise Not_found

mldonkey-3.1.2.tar.bz2/src/daemon/driver/driverCommands.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/driver/driverCommands.ml Changed

@@ -2088,6 +2088,7 @@
                       [
 			strings_of_option previewer;
 			strings_of_option temp_directory;
+			strings_of_option filenames_utf8;
 			strings_of_option share_scan_interval;
 			strings_of_option hdd_temp_minfree;
 			strings_of_option hdd_temp_stop_core;
@@ -3136,18 +3137,23 @@
     ), "<num> :\t\t\tverify chunks of file <num>";
 
     "pause", Arg_multiple (fun args o ->
-        if args = ["all"] && user2_is_admin o.conn_user.ui_user then
-          List.iter (fun file ->
-              file_pause file (admin_user ())
-          ) !!files
-        else
-          List.iter (fun num ->
-              let num = int_of_string num in
-              List.iter (fun file ->
-                  if (as_file_impl file).impl_file_num = num then
-                      file_pause file o.conn_user.ui_user
-              ) !!files) args; ""
-    ), "<num|all> :\t\t\tpause a download (use arg 'all' for all files)";
+      let filter = 
+        match args with (* TODO richer condition language *)
+        | ["where";"priority";(">"|"<" as op);n] ->
+          let n = int_of_string n in
+          let op = if op = ">" then (>) else (<) in
+          (fun file -> op (file_priority file) n)
+        | ["all"] -> (fun _ -> true)
+        | l ->
+          let l = List.map int_of_string l in
+          (fun file -> List.mem (file_num file) l)
+      in
+      List.iter begin fun file ->
+        if filter file then
+          file_pause file o.conn_user.ui_user
+      end !!files;
+      ""
+    ), "<num|all|where priority < prio> :\t\t\tpause a download (use arg 'all' for all files)";
 
     resume_alias "resume";
     resume_alias "unpause";

mldonkey-3.1.2.tar.bz2/src/daemon/driver/driverControlers.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/driver/driverControlers.ml Changed

@@ -963,15 +963,14 @@
   let user = if r.options.login = "" then (admin_user ()).CommonTypes.user_name else r.options.login in
   if not (valid_password user r.options.passwd) || (r.get_url.Url.short_file = "logout") then begin
       clear_page buf;
-      http_file_type := TXT;
-      let _, error_text_long, header = Http_server.error_page "401" "" ""
+      http_file_type := HTM;
+      let _, error_text_long, head = Http_server.error_page "401" "" ""
 	(Ip.to_string (TcpBufferedSocket.my_ip r.sock))
 	(string_of_int !!http_port) None in
       Buffer.add_string buf error_text_long;
-      r.reply_head <- header;
-      r.reply_headers <- [
-        "Connection", "close";
-        "WWW-Authenticate", Printf.sprintf "Basic realm=\"%s\"" !!http_realm]
+      r.reply_head <- head;
+      http_add_html_header r;
+      add_reply_header r "WWW-Authenticate" (Printf.sprintf "Basic realm=\"%s\"" !!http_realm);
     end
   else
     begin
@@ -1520,14 +1519,17 @@
         | s ->  http_send_bin_pictures r buf (String.lowercase s)
       with
       | Not_found ->
-	  let _, error_text_long, header = Http_server.error_page "404" "" ""
+	  let _, error_text_long, head = Http_server.error_page "404" "" ""
 			(Ip.to_string (TcpBufferedSocket.my_ip r.sock))
 			(string_of_int !!http_port)
 			(Some (Url_not_found r.get_url.Url.full_file)) in
-	  r.reply_head <- header;
+	  r.reply_head <- head;
+          http_add_html_header r;
 	  Buffer.add_string buf error_text_long
       | e ->
-          Printf.bprintf buf "\nException %s\n" (Printexc2.to_string e);
+          http_add_text_header r TEXTS;
+          Printf.bprintf buf "%sException %s\n"
+            (if Buffer.length buf = 0 then "" else "\n") (Printexc2.to_string e);
           r.reply_stream <- None
     end;

mldonkey-3.1.2.tar.bz2/src/daemon/driver/driverInteractive.ml -> mldonkey-3.1.3.tar.bz2/src/daemon/driver/driverInteractive.ml Changed

mldonkey-3.1.2.tar.bz2/src/gtk/gui/gui_keys.ml -> mldonkey-3.1.3.tar.bz2/src/gtk/gui/gui_keys.ml Changed

mldonkey-3.1.2.tar.bz2/src/gtk/newgui/gui_keys.ml -> mldonkey-3.1.3.tar.bz2/src/gtk/newgui/gui_keys.ml Changed

mldonkey-3.1.2.tar.bz2/src/networks/bittorrent/bTClients.ml -> mldonkey-3.1.3.tar.bz2/src/networks/bittorrent/bTClients.ml Changed

@@ -540,6 +540,7 @@
 let reserved () =
   let s = String.make 8 '\x00' in
   s.[7] <- (match !bt_dht with None -> '\x00' | Some _ -> '\x01');
+  s.[5] <- '\x10'; (* TODO bep9, bep10, notify clients about extended*)
   s
 
 (** handshake *)
@@ -569,6 +570,7 @@
 *)
 
 let send_bitfield c =
+  if not c.client_file.file_metadata_downloading then
   send_client c (BitField
       (
       match c.client_file.file_swarmer with
@@ -607,6 +609,21 @@
 
   c.client_azureus_messaging_protocol <- has_bit 0 0x80
 
+let send_extended_handshake c file =
+  let module B = Bencode in
+  let msg = (B.encode (B.Dictionary [(* "e",B.Int 0L; *)
+                                     "m", (B.Dictionary ["ut_metadata", B.Int 1L]);
+                                     (* "metadata_size", B.Int (-1L) *)])) in begin
+    send_client c (Extended (Int64.to_int 0L, msg));
+  end
+
+let send_extended_piece_request c piece file =
+  let module B = Bencode in
+  let msg = (B.encode (B.Dictionary ["msg_type", B.Int 0L; (* 0 is request subtype*)
+                                     "piece", B.Int piece; ])) in begin
+    send_client c (Extended (Int64.to_int c.client_ut_metadata_msg, msg));
+  end
+
 let show_client c =
   let (ip,port) = c.client_host in
   Printf.sprintf "%s:%d %S" (Ip.to_string ip) port (brand_to_string c.client_brand)
@@ -705,6 +722,7 @@
       begin
         c.client_incoming <- true;
         send_init !!client_uid file_id sock;
+        send_extended_handshake c file;
       end;
     connection_ok c.client_connection_control;
     if !verbose_msg_clients then
@@ -977,7 +995,7 @@
       (int_of_float timeout)
       (int_of_float next)
       (TcpMessages.to_string msg);
-    end;
+  end;
 
   let file = c.client_file in
 
@@ -1079,12 +1097,15 @@
 
     | BitField p ->
         (*A bitfield is a summary of what a client have*)
+      if !verbose_msg_clients then
+        lprintf_file_nl (as_file file) "Bitfield message,  metadata state %B" c.client_file.file_metadata_downloading;
+      if not c.client_file.file_metadata_downloading then
         begin
           match c.client_file.file_swarmer with
             None -> ()
           | Some swarmer ->
               c.client_new_chunks <- [];
-              
+
               let npieces = CommonSwarming.partition_size swarmer in
               let nbits = String.length p * 8 in
 
@@ -1125,6 +1146,7 @@
 
     | Have n ->
         (* A client can send a "Have" without sending a Bitfield *)
+        if not c.client_file.file_metadata_downloading then
         begin
           match c.client_file.file_swarmer with
             None -> ()
@@ -1247,6 +1269,172 @@
           if !verbose_msg_clients then
             lprintf_file_nl (as_file file) "Error: received cancel request but client has no slot"
 
+    | Extended (extmsg, payload) ->
+      (* extmsg: 0 handshake, N other message previously declared in handshake.
+         atm ignore extended messages if were not currently in metadata state.
+         TODO when were not in metadata state we should be friendly and answer metadata requests
+      *)
+      let module B = Bencode in
+      if file.file_metadata_downloading then begin
+        (* since we got at least one extended handshake from the peer, it should be okay to
+           send a handshake back now. we need to send it so the remote client knows how
+           to send us messages back.
+           this should of course be moved but I dont know where yet.
+           also we shouldnt send more than one handshake of course...
+        *)
+        if !verbose_msg_clients then
+          lprintf_file_nl (as_file file) "Got extended msg: %d %s" extmsg (String.escaped payload);
+
+        match extmsg with
+            0x0 ->
+            if !verbose_msg_clients then
+              lprintf_file_nl (as_file file) "Got extended handshake";
+            let dict = Bencode.decode payload in begin
+              match dict with
+                  B.Dictionary list ->
+                    List.iter (fun (key,value) ->
+                      match key, value with
+                        | "metadata_size", B.Int n ->
+                            if !verbose_msg_clients then
+                              lprintf_file_nl (as_file file) "Got metadata size %Ld" n;
+                            c.client_file.file_metadata_size <- n;
+                        | "m", B.Dictionary  mdict ->
+                          if !verbose_msg_clients then
+                            lprintf_file_nl (as_file file) "Got meta dict";
+                          List.iter (fun (key,value) ->
+                            match key, value with
+                                "ut_metadata", B.Int n ->
+                                  if !verbose_msg_clients then
+                                    lprintf_file_nl (as_file file) "ut_metadata is %Ld " n;
+                                  c.client_ut_metadata_msg <- n;
+                              | _ -> ();
+                          ) mdict;
+
+                        | _ -> () ;
+                    ) list;
+                    (* okay so now we know what to ask for, so ask for metadata now
+                       since metadata can be larger than 16k which is the limit, the transfer needs to be chunked, so
+                       it is not really right to make the query here. but its a start.
+                       also im just asking for piece 0.
+                       (we should also check that we actually got the metadata info before proceeding)
+                    *)
+                    send_extended_handshake c file;
+                    send_extended_piece_request c c.client_file.file_metadata_piece file;
+                  |_ -> () ;
+            end;
+          | 0x01 -> (* ut_metadata is 1 because we asked it to be 1 in the handshake
+                       the msg_type is probably
+                       1 for data,
+                       but could be 0 for request(unlikely since we didnt advertise we had the meta)
+                       2 for reject, also unlikely since peers shouldnt advertise if they dont have(but will need handling in the end)
+
+                       {'msg_type': 1, 'piece': 0, 'total_size': 3425}
+                       after the dict comes the actual piece
+                    *)
+            if !verbose_msg_clients then
+              lprintf_file_nl (as_file file) "Got extended ut_metadata message";
+            let msgtype = ref 0L in begin
+              begin
+                match B.decode payload with
+                    B.Dictionary list ->
+                      List.iter (fun (key,value) ->
+                        match key, value with
+                            "msg_type", B.Int n ->
+                              if !verbose_msg_clients then
+                                lprintf_file_nl (as_file file) "msg_type %Ld" n;
+                              msgtype := n;
+                          | "piece", B.Int n ->
+                            if !verbose_msg_clients then
+                              lprintf_file_nl (as_file file) "piece %Ld" n;
+                            file.file_metadata_piece <- n;
+                          | "total_size", B.Int n ->
+                             if !verbose_msg_clients then
+                              lprintf_file_nl (as_file file) "total_size %Ld" n; (* should always be the same as received in the initial handshake i suppose *)
+                          |_ -> () ;
+                      ) list;
+                  |_ -> () ;
+              end;
+              match !msgtype with
+                  1L ->
+                    let last_piece_index = (Int64.div file.file_metadata_size 16384L) in
+                    if !verbose_msg_clients then
+                      lprintf_file_nl (as_file file) "handling metadata piece %Ld of %Ld"
+                        file.file_metadata_piece
+                        last_piece_index;
+                        (* store the metadata piece in memory *)
+                    file.file_metadata_chunks.(1 + (Int64.to_int file.file_metadata_piece)) <- payload;
+                        (* possibly write metadata to disk *)
+                    if file.file_metadata_piece >=
+                      (Int64.div file.file_metadata_size 16384L) then begin
+                        if !verbose_msg_clients then
+                          lprintf_file_nl (as_file file) "this was the last piece";
+                            (* here we should simply delete the current download, and wait for mld to pick up the new torrent file *)
+                            (* the entire payload is currently in the array, TODO *)
+                        let newtorrentfile = (Printf.sprintf "%s/BT-%s.torrent"
+                                                      (Filename2.temp_dir_name ())
+                                                      (Sha1.to_string file.file_id)) in
+                        let fd = Unix32.create_rw  newtorrentfile  in
+                        let fileindex = ref 0L in
+                        begin
+                          (* the ee is so we can use the same method to find the
+                             start of the payload for the real payloads as well as the synthetic ones
+                             *)
+                          file.file_metadata_chunks.(0) <- "eed4:info";
+                          file.file_metadata_chunks.(2 + Int64.to_int last_piece_index) <- "eee";
+                          try
+                            Array.iteri (fun index chunk ->
+                            (* regexp ee is a fugly way to find the end of the 1st dict before the real payload *)
+                              let metaindex = (2 + (Str.search_forward  (Str.regexp_string "ee") chunk 0 )) in
+                              let chunklength = ((String.length chunk) - metaindex) in
+                              Unix32.write fd !fileindex chunk
+                                metaindex
+                                chunklength;
+                              fileindex := Int64.add !fileindex  (Int64.of_int chunklength);
+                              ();
+                            ) file.file_metadata_chunks;
+                          with e -> begin
+                            (* TODO ignoring errors for now, the array isnt really set up right anyway yet *)
+                            (*
+                            lprintf_file_nl (as_file file) "Error %s saving metadata"
+                              (Printexc2.to_string e)
+                            *) ()
+                          end;
+                          (* Yay, now the new torrent is on disk! amazing! However, now we need to kill the dummy torrent
+                             and restart it with the fresh real torrent *)
+
+                          (* it seems we need to use the dynamic interface... *)
+                          if !verbose then
+                            lprintf_file_nl (as_file file) "cancelling metadata download ";
+                          let owner = file.file_file.impl_file_owner in
+                          let group = file.file_file.impl_file_group in begin
+                            CommonInteractive.file_cancel (as_file file) owner ;
+                            (* hack_op_file_cancel c.client_file;   *)
+                            if !verbose then
+                              lprintf_file_nl (as_file file) "starting download from metadata torrent %s" newtorrentfile  ;
+                            ignore(CommonNetwork.network_parse_url BTGlobals.network newtorrentfile owner group);
+                          end;
+                          (try Sys.remove newtorrentfile with _ -> ())
+                        end;
+
+                      end
+                    else begin
+                          (* now ask for the next metadata piece, if any *)
+                      let nextpiece = (Int64.succ file.file_metadata_piece) in begin
+                        if !verbose_msg_clients then
+                          lprintf_file_nl (as_file file) "asking for the next piece %Ld" nextpiece;
+                        send_extended_piece_request c nextpiece file;
+                      end;
+                    end;
+                |_ ->
+                  if !verbose_msg_clients then
+                    lprintf_file_nl (as_file file) "unmatched extended subtype" ;
+            end;
+
+          | _ ->
+            if !verbose_msg_clients then
+              lprintf_file_nl (as_file file) "Got extended other msg ";
+      end;
+
     | DHT_Port port ->
         match !bt_dht with
         | None ->
@@ -1332,6 +1520,8 @@
                     lprintf_file_nl (as_file file) "READY TO DOWNLOAD FILE";
 
                   send_init !!client_uid file.file_id sock;
+                  send_extended_handshake c file;
+
 (* Fabrice: Initialize the client bitmap and uploader fields to <> None *)
                   update_client_bitmap c;
 (*              (try get_from_client sock c with _ -> ());*)

mldonkey-3.1.2.tar.bz2/src/networks/bittorrent/bTGlobals.ml -> mldonkey-3.1.3.tar.bz2/src/networks/bittorrent/bTGlobals.ml Changed

@@ -272,7 +272,7 @@
           file.file_trackers <-  t :: file.file_trackers)
   file_trackers
 
-let new_file file_id t torrent_diskname file_temp file_state user group =
+let new_file ?(metadata=false) file_id t torrent_diskname file_temp file_state user group =
   try
     Hashtbl.find files_by_uid file_id
   with Not_found ->
@@ -302,6 +302,10 @@
           file_session_uploaded = Int64.zero;
           file_session_downloaded = Int64.zero;
           file_last_dht_announce = 0;
+          file_metadata_size = 0L;
+          file_metadata_piece = 0L;
+          file_metadata_downloading = metadata;
+          file_metadata_chunks = Array.make 20 "";
           file_private = t.torrent_private;
         } and file_impl =  {
           (dummy_file_impl ()) with
@@ -354,10 +358,10 @@
       must_share_file file;
       file
 
-let new_download file_id t torrent_diskname user =
+let new_download ?(metadata=false) file_id t torrent_diskname user =
   let file_temp = Filename.concat !!DO.temp_directory
       (Printf.sprintf "BT-%s" (Sha1.to_string file_id)) in
-  new_file file_id t torrent_diskname file_temp FileDownloading user
+  new_file ~metadata file_id t torrent_diskname file_temp FileDownloading user
 
 let ft_by_num = Hashtbl.create 13
 let ft_counter = ref 0
@@ -866,6 +870,7 @@
           client_cache_extension = false;
           client_fast_extension = false;
           client_utorrent_extension = false;
+          client_ut_metadata_msg = -1L;
           client_azureus_messaging_protocol = false;
         } and impl = {
           dummy_client_impl with

mldonkey-3.1.2.tar.bz2/src/networks/bittorrent/bTInteractive.ml -> mldonkey-3.1.3.tar.bz2/src/networks/bittorrent/bTInteractive.ml Changed

@@ -322,6 +322,7 @@
   if !bt_dht <> None then
     emit (_s"Last DHT announce") ~desc:(_s"Last time this torrent was announced in DHT")
       (string_of_date file.file_last_dht_announce);
+  emit (_s"Metadata downloading") (if file.file_metadata_downloading then _s "yes" else _s "no");
 
   let rec print_first_tracker l =
     match l with
@@ -837,7 +838,8 @@
   List.iter (fun file ->
       (* if !verbose_share then lprintf_nl "Checking torrent share for %s" file.file_torrent_diskname; *)
       if not (Sys.file_exists file.file_torrent_diskname) &&
-        file_state file = FileShared then
+        file_state file = FileShared &&
+        not (file.file_metadata_downloading) then
         begin
           if !verbose_share then lprintf_nl "Removing torrent share for %s" file.file_torrent_diskname;
           BTClients.file_stop file;
@@ -898,6 +900,46 @@
   String.sub text a (b - a)
 
 let op_network_parse_url url user group =
+        let exn_catch f x = try `Ok (f x) with exn -> `Exn exn in
+        match exn_catch parse_magnet_url url with
+          | `Ok magnet ->
+            (
+            if !verbose then begin
+              lprintf_nl "Got magnet url %S" url;
+              List.iter (fun(v) -> lprintf_nl "magnet %s" (string_of_uid v)) magnet#uids;
+              List.iter (fun(v) -> lprintf_nl "magnet trackers %s" v) magnet#trackers;
+            end;
+            match List2.filter_map (function BTUrl btih -> Some btih | _ -> None) magnet#uids with
+              | [] -> "No btih found in magnet url", false;
+              | btih::_ ->
+                if !verbose then
+                  lprintf_nl "Got btih %S" (Sha1.to_string btih);
+                let hashstr = (Sha1.to_string btih) in 
+                let torrent = {
+                  torrent_name = hashstr; (*magnet#name*)
+                  torrent_filename = hashstr;
+                  torrent_name_utf8 = hashstr;
+                  torrent_comment = "";
+                  torrent_pieces = Array.of_list [];  
+                  torrent_piece_size = 1L;  
+                  torrent_files = []; 
+                  torrent_length = 1L;
+                  torrent_created_by = ""; 
+                  torrent_creation_date = 1000000L;
+                  torrent_modified_by = ""; 
+                  torrent_encoding = ""; 
+                  torrent_private = false; 
+                  torrent_announce =
+                    (match magnet#trackers with
+                     | h::q -> h
+                     | [] -> "");
+                  torrent_announce_list = magnet#trackers;
+                }  in
+                ignore(new_download ~metadata:true btih torrent "" user group);
+                magnet#name, true; 
+              )
+          | `Exn _ ->
+  (
   let location_regexp = "Location: \$.*\$" in
   try
     let real_url = get_regexp_string url (Str.regexp location_regexp) in
@@ -964,6 +1006,7 @@
        let s = Printf.sprintf "Can not load load torrent file: %s"
          (Printexc2.to_string e) in
        s, false
+  )
 
 let op_client_info c =
   check_client_country_code c;

mldonkey-3.1.2.tar.bz2/src/networks/bittorrent/bTProtocol.ml -> mldonkey-3.1.3.tar.bz2/src/networks/bittorrent/bTProtocol.ml Changed

@@ -216,7 +216,8 @@
           int: length (power of 2, 2 ^ 15)
     * 9 - DHT port announcement
           int16: UDP port
-
+    * 20 - extended
+          byte: extended message ID (0 = handshake)
 Choke/unchoke every 10 seconds
 *)
 
@@ -266,6 +267,7 @@
     | Ping
     | PeerID of string
     | DHT_Port of int
+    | Extended of int * string
 
     let to_string msg =
       match msg with
@@ -284,6 +286,7 @@
       | Ping -> "Ping"
       | PeerID s ->  Printf.sprintf  "PeerID [%s]" (String.escaped s)
       | DHT_Port n -> Printf.sprintf "DHT_Port %d" n
+      | Extended (n, s) -> Printf.sprintf  "Extended [%d %s]" n (String.escaped s)
 
     let parsing opcode m =
         match opcode with
@@ -297,6 +300,7 @@
         | 7 -> Piece (get_int m 0, get_uint64_32 m 4, m, 8, String.length m - 8)
         | 8 -> Cancel (get_int m 0, get_uint64_32 m 4, get_uint64_32 m 8)
         | 9 -> DHT_Port (get_int16 m 0)
+        | 20 -> Extended (get_int8 m 0, String.sub m 1 (String.length m - 1))
         | -1 -> PeerID m
         | _ -> raise Not_found
 
@@ -325,6 +329,7 @@
         | PeerID _ -> ()
         | Ping -> ()
         | DHT_Port n -> buf_int8 buf 9; buf_int16 buf n
+        | Extended (n,msg) -> buf_int8 buf 20; buf_int8 buf n; Buffer.add_string buf msg
       end;
       let s = Buffer.contents buf in
       str_int s 0 (String.length s - 4);

mldonkey-3.1.2.tar.bz2/src/networks/bittorrent/bTTypes.ml -> mldonkey-3.1.3.tar.bz2/src/networks/bittorrent/bTTypes.ml Changed

mldonkey-3.1.2.tar.bz2/src/networks/donkey/donkeyReliability.ml -> mldonkey-3.1.3.tar.bz2/src/networks/donkey/donkeyReliability.ml Changed

mldonkey-3.1.2.tar.bz2/src/networks/donkey/donkeyThieves.ml -> mldonkey-3.1.3.tar.bz2/src/networks/donkey/donkeyThieves.ml Changed

mldonkey-3.1.2.tar.bz2/src/utils/cdk/filename2.ml -> mldonkey-3.1.3.tar.bz2/src/utils/cdk/filename2.ml Changed

mldonkey-3.1.2.tar.bz2/src/utils/cdk/gd.ml -> mldonkey-3.1.3.tar.bz2/src/utils/cdk/gd.ml Changed

mldonkey-3.1.2.tar.bz2/src/utils/cdk/gdstubs.c -> mldonkey-3.1.3.tar.bz2/src/utils/cdk/gdstubs.c Changed

mldonkey-3.1.2.tar.bz2/src/utils/lib/stubs_c.c -> mldonkey-3.1.3.tar.bz2/src/utils/lib/stubs_c.c Changed

mldonkey-3.1.2.tar.bz2/src/utils/lib/tiger.c -> mldonkey-3.1.3.tar.bz2/src/utils/lib/tiger.c Changed

mldonkey-3.1.2.tar.bz2/src/utils/net/upnp_stubs.c -> mldonkey-3.1.3.tar.bz2/src/utils/net/upnp_stubs.c Changed

@@ -501,7 +501,7 @@
 
     if( map->enabled && ( map->natpmpState == ML_NATPMP_DISCOVER ) )
     {
-        int val = initnatpmp( &map->natpmp );
+        int val = initnatpmp( &map->natpmp, 0, 0 );
         dbg_printf( "initnatpmp = %d\n", val );
         val = sendpublicaddressrequest( &map->natpmp );
         dbg_printf( "sendpublicaddressrequest = %d\n", val );
@@ -639,7 +639,7 @@
     {
         struct UPNPDev * devlist;
         errno = 0;
-        devlist = upnpDiscover( 2000, NULL, NULL, 0 );
+        devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 );
         if( devlist == NULL )
         {
             dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno,  str_errno( errno ) );
@@ -680,7 +680,7 @@
         snprintf( type, sizeof( type ), "%s", ( map->isTcp ? "TCP" : "UDP" ) );
         i = UPNP_GetSpecificPortMappingEntry( map->upnpUrls.controlURL,
                                               map->upnpData.first.servicetype, portStr,
-                                              type, intClient, intPort );
+                                              type, intClient, intPort, NULL, NULL, NULL );
         if( i != UPNPCOMMAND_SUCCESS )
         {
             dbg_printf( "Port %d isn't forwarded\n", map->extPort );
@@ -730,7 +730,7 @@
             err = UPNP_AddPortMapping( map->upnpUrls.controlURL,
                                        map->upnpData.first.servicetype,
                                        extPortStr, intPortStr, map->lanaddr,
-                                       desc, type, NULL );
+                                       desc, type, NULL, "0" );
             map->upnpMapped = !err;
         }
         dbg_printf( "Port forwarding through \"%s\", service \"%s\". (local address[%s:%d])\n", map->upnpUrls.controlURL, map->upnpData.first.servicetype, map->lanaddr, map->intPort );
@@ -901,7 +901,6 @@
 	    //pthread_cond_init(&cond, NULL);
 	    pthread_mutex_init(&g_mutex, NULL);
 	    pthread_mutex_init(&g_delay_mutex, NULL);
-	    pthread_mutex_unlock(&g_mutex);
 
 	    err = pthread_create(&g_pthread, &attr, upnpNatpmpThread, NULL);

mldonkey-3.1.2.tar.bz2/tools/ocamlpp.ml4 -> mldonkey-3.1.3.tar.bz2/tools/ocamlpp.ml4 Changed

@@ -1,5 +1,7 @@
 open Str
-    
+
+let outch = ref stdout
+
 (*
 let gen dest_filename =
   
@@ -156,8 +158,8 @@
   let ic = open_in filename in
   
   let line_warning line =
-    Printf.fprintf stdout "(*\n\n WARNING: this file is automatically generated from: \n\t%s\n\n*)\n\n" filename;
-    Printf.fprintf stdout "# %d \"%s\"\n" (line+1) filename;  
+    Printf.fprintf !outch "(*\n\n WARNING: this file is automatically generated from: \n\t%s\n\n*)\n\n" filename;
+    Printf.fprintf !outch "# %d \"%s\"\n" (line+1) filename;  
   in
   
   let rec iter_line i env =
@@ -178,7 +180,7 @@
                   line_warning (i+1);
                   env
               | Line (line, filename) ->
-                  Printf.fprintf stdout "# %d \"%s\"\n" line filename;
+                  Printf.fprintf !outch "# %d \"%s\"\n" line filename;
                   env
               | Regexps regexps2 ->
                   line_warning (i+1);
@@ -192,8 +194,8 @@
                 exit 2
           end;
         end else begin
-          output_string stdout line;
-          output_char stdout '\n';
+          output_string !outch line;
+          output_char !outch '\n';
           env
         end
     in
@@ -217,7 +219,7 @@
 
 let add_depend  filedep filename depends =
   if not (List.mem filename !depends) then begin
-      Printf.fprintf stdout "%s: %s\n" filedep filename;
+      Printf.fprintf !outch "%s: %s\n" filedep filename;
       depends := filename :: !depends
     end
   
@@ -278,13 +280,13 @@
         Printf.fprintf stderr "Don't know what to do with %s\n" filename;
         exit 2
       end
-      
-let _ =
+
+let () =
   Arg.parse 
     [
 (*    "-gen", Arg.String gen, " <filename> : generate filename"; *)
     "-pp", Arg.String pp, " <filename> : preprocess filename";
-  ] depend ""
-    
-  
-  
\ No newline at end of file
+    "-o", Arg.String (fun s -> outch := open_out s), " <filename> : output filename (influences subsequent options)";
+  ] depend "";
+  close_out !outch
+

Overview

Request 262 (accepted)

Request History