[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
|
Date: |
Thu, 26 Jan 2006 10:34:55 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/26 10:34:54
Modified files:
distrib : ChangeLog
src/daemon/driver: driverCommands.ml
src/networks/bittorrent: bTInteractive.ml bTStats.ml
src/networks/donkey: donkeyInteractive.ml donkeyOvernet.ml
donkeyStats.ml
src/networks/fileTP: fileTPInteractive.ml
src/networks/gnutella: gnutellaInteractive.ml
Log message:
patch #4827
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.686&tr2=1.687&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTStats.ml.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyStats.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.686 mldonkey/distrib/ChangeLog:1.687
--- mldonkey/distrib/ChangeLog:1.686 Thu Jan 26 00:25:24 2006
+++ mldonkey/distrib/ChangeLog Thu Jan 26 10:34:51 2006
@@ -15,6 +15,7 @@
=========
2006/01/26
+4827: longhelp cleanup (anhi)
4823: EDK: CryptoPP optional, disable with --disable-donkeysui
Makefile: link CryptoPP stuff only in binaries which need it
Buildinfo: show compiler versions
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.116
mldonkey/src/daemon/driver/driverCommands.ml:1.117
--- mldonkey/src/daemon/driver/driverCommands.ml:1.116 Wed Jan 25 22:29:53 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml Thu Jan 26 10:34:52 2006
@@ -329,7 +329,8 @@
"removing " ^ arg ^ " -> " ^ old_def
with _ -> "Alias not found");
- ), ":\t\t\t\t\t$bdelete an command alias example: \"unalias ca\"$n";
+ ), ":\t\t\t\t$bdelete a command alias\n"
+ ^"\t\t\t\t\texample: \"unalias ca\"$n";
"q", Arg_none (fun o ->
raise CommonTypes.CommandCloseSocket
@@ -351,8 +352,8 @@
web_infos =:= v :: !!web_infos;
CommonWeb.load_url true kind url;
"url added to web_infos. downloading now"
- ), "<kind> <url> :\t\t\tload this file from the web.
-\t\t\t\t\tkind is either server.met (if the downloaded file is a server.met)";
+ ), "<kind> <url> :\t\t\tload this file from the web\n"
+ ^"\t\t\t\t\tkind is either server.met (if the downloaded file is a
server.met)";
"recover_temp", Arg_none (fun o ->
networks_iter (fun r ->
@@ -497,7 +498,7 @@
end
) activities;
""
- ), " <minutes> :\t\t\tprint activity in the last <minutes> minutes";
+ ), "<minutes> :\t\t\tprint activity in the last <minutes> minutes";
"message_log", Arg_multiple (fun args o ->
let buf = o.conn_buf in
@@ -675,7 +676,7 @@
end
else
_s "Only 'admin' is allowed to do that"
- ), "<user> :\t\tremove a mldonkey user";
+ ), "<user> :\t\t\tremove a mldonkey user";
"users", Arg_none (fun o ->
@@ -755,7 +756,7 @@
else
Printf.bprintf buf "%s" whoami;
""
- ), ":\t\t\t\tPrint logged-in user name";
+ ), ":\t\t\t\tprint logged-in user name";
"calendar_add", Arg_two (fun hour action o ->
let buf = o.conn_buf in
@@ -954,7 +955,7 @@
) args;
Printf.sprintf (_b "%d friends removed") (List.length args)
end
- ), "<client numbers> :\t\tremove friend (use arg 'all' for all friends)";
+ ), "<client numbers> :\tremove friend (use arg 'all' for all friends)";
"friends", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -1097,7 +1098,7 @@
!CommonUploads.has_upload !CommonUploads.upload_credit
else ""
- ), "<m> :\t\t\t\t\tdisable upload during <m> minutes (multiple of 5)";
+ ), "<m> :\t\t\t\tdisable upload during <m> minutes (multiple of 5)";
"bw_stats", Arg_multiple (fun args o ->
let buf = o.conn_buf in
@@ -1156,7 +1157,7 @@
Printf.bprintf buf "Only available on HTML interface"
else
Printf.bprintf buf "Gd support was not compiled";
- _s ""), ":\t\t\t\t\tdisplay graphical transfer statistics";
+ _s ""), ":\t\t\t\tdisplay graphical transfer statistics";
"gdremove", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -1214,19 +1215,19 @@
let buf = o.conn_buf in
print_network_modules buf o;
""
- ) , " :\t\t\t\tprint all networks";
+ ) , ":\t\t\t\tprint all networks";
"enable", Arg_one (fun num o ->
let n = network_find_by_num (int_of_string num) in
network_enable n;
_s "network enabled"
- ) , " <num> :\t\t\t\tenable a particular network";
+ ) , "<num> :\t\t\t\tenable a particular network";
"disable", Arg_one (fun num o ->
let n = network_find_by_num (int_of_string num) in
network_disable n;
_s "network disabled"
- ) , " <num> :\t\t\t\tdisable a particular network";
+ ) , "<num> :\t\t\t\tdisable a particular network";
]
@@ -1264,7 +1265,7 @@
) args;
end;
""
- ), "<num1> <num2> ...:\t\tforget searches <num1> <num2> ...";
+ ), "<num1> <num2> ... :\t\tforget searches <num1> <num2> ...";
"vr", Arg_multiple (fun args o ->
let buf = o.conn_buf in
@@ -1436,7 +1437,7 @@
end) in
_s output
end;
- ), ":\t\t\t\tforce download of an already downloaded file";
+ ), ":\t\t\tforce download of an already downloaded file";
]
@@ -1493,7 +1494,7 @@
_s "options, sources and backup saved"
| _ -> DriverInteractive.save_config ();
CommonComplexOptions.save_sources (); _s "options and sources
saved"
- ), "<options|sources|backup (empty for options + sources)>:\t\tsave
options and/or sources or backup";
+ ), "[<options|sources|backup>] :\tsave options and/or sources or
backup (empty for options and sources)";
"vo", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -2065,7 +2066,7 @@
end;
""
- ), ":\t\t\t\t\tprint shared directories";
+ ), ":\t\t\t\tprint shared directories";
"share", Arg_multiple (fun args o ->
let (prio, arg, strategy) = match args with
@@ -2464,7 +2465,7 @@
| "what" | "w" ->
files_to_cancel o
| _ -> failwith "Invalid argument"
- ), " <yes|no|what>:\t\t\tconfirm cancellation";
+ ), "<yes|no|what> :\t\t\tconfirm cancellation";
"test_recover", Arg_one (fun num o ->
@@ -2479,7 +2480,7 @@
downloaded := !downloaded ++ (end_pos -- begin_pos);
) segments;
Printf.sprintf "Downloaded: %Ld\n" !downloaded
- ), " <num> :\t\t\tprint the segments downloaded in file";
+ ), "<num> :\t\t\tprint the segments downloaded in file";
"cancel", Arg_multiple (fun args o ->
@@ -2599,7 +2600,7 @@
else
Printf.bprintf buf "Commited";
""
- ) , ":\t\t\t\t\t$bmove downloaded files to incoming directory$n";
+ ) , ":\t\t\t\t$bmove downloaded files to incoming directory$n";
"vd", Arg_multiple (fun args o ->
let buf = o.conn_buf in
@@ -2801,7 +2802,7 @@
Printf.sprintf "done"
end) in
_s output
- ), "<file> :\t\t\t\tdownload all the links contained in the file";
+ ), "<file> :\t\t\tdownload all the links contained in the file";
]
@@ -2904,7 +2905,7 @@
let file2 = file_find (int_of_string f2) in
Int64Swarmer.merge file1 file2;
"The two files are now merged"
- ), " <num1> <num2> :\t\t\ttry to swarm downloads from file <num2>
(secondary) to file <num1> (primary)";
+ ), "<num1> <num2> :\t\t\ttry to swarm downloads from file <num2>
(secondary) to file <num1> (primary)";
"open_log", Arg_none (fun o ->
if !!log_file <> "" then
@@ -3020,7 +3021,7 @@
""
- ), " :\t\t\t\t\tprint RSS feeds";
+ ), ":\t\t\t\t\tprint RSS feeds";
"html_theme", Arg_multiple (fun args o ->
let buf = o.conn_buf in
@@ -3045,7 +3046,7 @@
"\\<script
type=\\\"text/javascript\\\"\\>top.window.location.reload();\\</script\\>"
end
- ), "<theme>:\t\t\tselect html_theme";
+ ), "<theme> :\t\t\tselect html_theme";
"mem_stats", Arg_one (fun level o ->
let buf = o.conn_buf in
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.78
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.79
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.78 Mon Jan 16
16:05:14 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml Thu Jan 26 10:34:53 2006
@@ -825,7 +825,7 @@
else
Printf.bprintf buf "Not enough parameters\n";
""
- ), _s " <filename> <comment>:\t\tgenerate the corresponding <filename>
.torrent file with <comment> in torrents/tracked/.\n\t\t\t\t\tThe file is
automatically tracked, and seeded if in incoming/";
+ ), _s "<filename> <comment> :\tgenerate the corresponding <filename>
.torrent file with <comment> in torrents/tracked/.\n\t\t\t\t\tThe file is
automatically tracked, and seeded if in incoming/";
"torrents", "Network/Bittorrent", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -859,7 +859,7 @@
else
Printf.bprintf buf "Tracker not activated (tracker_port = 0)\n";
_s ""
- ), _s " :\t\t\t\tprint all .torrent files on this server";
+ ), _s ":\t\t\t\tprint all .torrent files on this server";
"seeded_torrents", "Network/Bittorrent", Arg_none (fun o ->
List.iter (fun file ->
@@ -868,12 +868,12 @@
) !current_files;
_s "done"
- ), _s " :\t\t\tprint all seeded .torrent files on this server";
+ ), _s ":\t\t\tprint all seeded .torrent files on this server";
"reshare_torrents", "Network/Bittorrent", Arg_none (fun o ->
share_files ();
_s "done"
- ), _s " :\t\t\trecheck torrents/* directories for changes";
+ ), _s ":\t\t\trecheck torrents/* directories for changes";
"rm_old_torrents", "Network/Bittorrent", Arg_none (fun o ->
let files_outdated = Unix2.list_directory old_directory in
@@ -897,7 +897,7 @@
Sys.remove (Filename.concat old_directory file)
) files_outdated;
_s ""
- ), _s " :\t\t\t\tremove all old .torrent files";
+ ), _s ":\t\t\tremove all old .torrent files";
"stop_all_bt", "Network/Bittorrent", Arg_none (fun o ->
List.iter (fun file -> BTClients.file_stop file ) !current_files;
@@ -908,7 +908,7 @@
else
Printf.bprintf buf "started sending stops...\n";
_s ""
- ), _s " :\t\t\t\tstops all bittorrent downloads, use this if you want to
make sure that the stop signal actualy gets to the tracker\n\t\t\t\twhen
shuting mlnet down, but you have to wait till the stops get to the tracker and
not wait too long,\n\t\t\t\tso mldonkey reconnects to the tracker :)";
+ ), _s ":\t\t\t\tstops all bittorrent downloads, use this if you want to
make sure that the stop signal actualy gets to the tracker\n\t\t\t\t\twhen
shuting mlnet down, but you have to wait till the stops get to the tracker and
not wait too long,\n\t\t\t\t\tso mldonkey reconnects to the tracker :)";
"tracker", "Network/Bittorrent", Arg_multiple (fun args o ->
try
@@ -954,13 +954,13 @@
else
Printf.bprintf buf "Not enough or wrong parameters.";
_s ""
- ), " <num> <url> <url>... :\t\t\tadd urls as trackers for num.";
+ ), "<num> <url> <url>... :\t\tadd URLs as trackers for num";
(* TODO : add some code from make_torrent
"print_torrent", Arg_one (fun filename o ->
".torrent file printed"
- ), " <filename.torrent> : print the content of filename"
+ ), "<filename.torrent> :\t\tprint the content of filename"
*)
]
Index: mldonkey/src/networks/bittorrent/bTStats.ml
diff -u mldonkey/src/networks/bittorrent/bTStats.ml:1.6
mldonkey/src/networks/bittorrent/bTStats.ml:1.7
--- mldonkey/src/networks/bittorrent/bTStats.ml:1.6 Mon Nov 7 20:11:42 2005
+++ mldonkey/src/networks/bittorrent/bTStats.ml Thu Jan 26 10:34:53 2006
@@ -98,7 +98,7 @@
"client_stats_bt", "Network/Bittorrent",Arg_none (fun o ->
print_stats o Old;
""
- ), ":\t\t\t\tshow breakdown of download/upload by clients brand";
+ ), ":\t\t\tshow breakdown of download/upload by clients brand";
"csbt", "Network/Bittorrent",Arg_none (fun o ->
print_stats o New;
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.86
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.87
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.86 Thu Jan 26
00:25:25 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Thu Jan 26 10:34:53 2006
@@ -661,7 +661,7 @@
with e ->
Printf.sprintf "error %s while loading temp files" (
Printexc2.to_string e)
- ), "<temp_dir> :\t\t\timport the old edonkey temp directory";
+ ), "<temp_dir> :\t\timport the old edonkey temp directory";
(*
"load_old_history", Arg_none (fun o ->
@@ -690,7 +690,7 @@
end
else
Printf.sprintf "ED2K_update_server_list_met is disabled, ignoring..."
- ), "<filename|URL> :\t\t\tadd the servers from a server.met file or URL";
+ ), "<filename|URL> :\t\tadd the servers from a server.met file or URL";
"id", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -943,7 +943,7 @@
set_simple_option donkey_ini "client_md4" (Md4.to_string (mldonkey_md4
(Md4.random ())));
if Autoconf.donkey_sui = "yes" then set_simple_option donkey_ini
"client_private_key" (DonkeySui.SUI.create_key ());
"reset client_md4/client_private_key"
- ), ":\t\t\t\t\treset client_md4/client_private_key to random values";
+ ), ":\t\t\t\treset client_md4/client_private_key to random values";
"bp", Arg_multiple (fun args o ->
List.iter (fun arg ->
@@ -951,7 +951,7 @@
port_black_list =:= port :: !!port_black_list;
) args;
"done"
- ), "<port1> <port2> ... :\t\t\tadd these Ports to the port black list";
+ ), "<port1> <port2> ... :\t\tadd these ports to the port black list";
"send_servers", Arg_none (fun o ->
CommonWeb.connect_redirector ();
Index: mldonkey/src/networks/donkey/donkeyOvernet.ml
diff -u mldonkey/src/networks/donkey/donkeyOvernet.ml:1.61
mldonkey/src/networks/donkey/donkeyOvernet.ml:1.62
--- mldonkey/src/networks/donkey/donkeyOvernet.ml:1.61 Sat Dec 17 20:14:38 2005
+++ mldonkey/src/networks/donkey/donkeyOvernet.ml Thu Jan 26 10:34:53 2006
@@ -1571,7 +1571,7 @@
Fifo.put pb p;
done;
""
- ), ("<bucket_nr> :\t\t\tdumps a bucket");
+ ), ("<bucket_nr> :\t\tdumps a bucket");
"dump_known_peers", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -1615,7 +1615,7 @@
command_prefix_to_net ^ " store");
]);
"";
- ), (":\t\t\t\t" ^ command_prefix_to_net ^ " Stats commands");
+ ), (":\t\t\t" ^ command_prefix_to_net ^ " Stats commands");
"stats", Arg_none (fun o ->
let buf = o.conn_buf in
@@ -1706,7 +1706,7 @@
Printf.bprintf o.conn_buf "Loading %s\n" url;
CommonWeb.load_url true web_info url) urls;
"web boot started"
- ), "<urls> :\t\t\t\tdownload .ocl URLS (no arg load default)";
+ ), "<urls> : \t\t\tdownload .ocl URLs (no arg load default)";
"load", Arg_one (fun filename o ->
try
@@ -1717,7 +1717,7 @@
), "<filename> :\t\t\tload the peers from a contact.dat file";
"md4", Arg_none (fun o -> "MD4 is " ^ (Md4.to_string !!overnet_md4);
- ), ":\t\t\t\t\tget client MD4 address on the Overnet/Kademlia network";
+ ), ":\t\t\t\tget client MD4 address on the Overnet/Kademlia network";
"store", Arg_none (fun o ->
let buf = o.conn_buf in
Index: mldonkey/src/networks/donkey/donkeyStats.ml
diff -u mldonkey/src/networks/donkey/donkeyStats.ml:1.23
mldonkey/src/networks/donkey/donkeyStats.ml:1.24
--- mldonkey/src/networks/donkey/donkeyStats.ml:1.23 Mon Nov 7 20:11:42 2005
+++ mldonkey/src/networks/donkey/donkeyStats.ml Thu Jan 26 10:34:53 2006
@@ -207,7 +207,7 @@
start_session := BasicSocket.last_time ();
"done"
- ), ":\t\t\t\t\treset session statistics";
+ ), ":\t\t\t\treset session statistics";
]
(*
Index: mldonkey/src/networks/fileTP/fileTPInteractive.ml
diff -u mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.28
mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.29
--- mldonkey/src/networks/fileTP/fileTPInteractive.ml:1.28 Thu Jan 12
08:57:58 2006
+++ mldonkey/src/networks/fileTP/fileTPInteractive.ml Thu Jan 26 10:34:54 2006
@@ -408,7 +408,7 @@
else
Printf.bprintf buf "%s" error;
_s ""
- ), " <url> <referer> :\t\t\t\tstart downloading this URL";
+ ), "<url> <referer> :\t\t\tstart downloading this URL";
"mirror", "Network/FileTP", Arg_multiple (fun args o ->
try
@@ -470,7 +470,7 @@
else
Printf.bprintf buf "Not enough parameters";
_s ""
- ), " <num> <url> <referer> :\t\t\tadd url as mirror for num";
+ ), "<num> <url> <referer> :\t\tadd URL as mirror for num";
]
let _ =
Index: mldonkey/src/networks/gnutella/gnutellaInteractive.ml
diff -u mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.49
mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.50
--- mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.49 Mon Jan 16
16:05:14 2006
+++ mldonkey/src/networks/gnutella/gnutellaInteractive.ml Thu Jan 26
10:34:54 2006
@@ -523,7 +523,7 @@
(Queue.length waiting_udp_queue);
end;
""
- ), " :\t\t\t\tprint stats on Gnutella network";
+ ), ":\t\t\t\tprint stats on Gnutella network";
]