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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/21 15:50:27

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

Log message:
        patch #5693

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1160&r2=1.1161
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.213&r2=1.214

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1160
retrieving revision 1.1161
diff -u -b -r1.1160 -r1.1161
--- distrib/ChangeLog   21 Jan 2007 15:36:43 -0000      1.1160
+++ distrib/ChangeLog   21 Jan 2007 15:50:27 -0000      1.1161
@@ -15,6 +15,7 @@
 =========
 
 2007/01/21
+5693: "voo changed" prints changed options only, useful for support (Schlumpf)
 5698: EDK: fix display of porttest result images (Schlumpf)
 5699: Multiuser: Fix wrong file path (user_commit_dir) in notification mail
 5695: Command "set": better error text if option does not exist

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- src/daemon/driver/driverCommands.ml 21 Jan 2007 15:14:55 -0000      1.213
+++ src/daemon/driver/driverCommands.ml 21 Jan 2007 15:50:27 -0000      1.214
@@ -1589,6 +1589,9 @@
 
     "voo", Arg_multiple (fun args o ->
         let buf = o.conn_buf in
+        let changed_list = List.sort (fun d1 d2 -> compare d1 d2) (List.filter 
(fun o -> 
+            o.option_value <> o.option_default && not (String2.starts_with 
o.option_name "enable_")
+            ) (CommonInteractive.all_simple_options ())) in
         if use_html_mods o then begin
 
             Printf.bprintf buf "\\<script type=\\\"text/javascript\\\"\\>
@@ -1632,7 +1635,8 @@
                 ("Files", "File related options") ; 
                 ("Mail", "eMail information options") ; 
                 ("Net", "activate/deaktivate Networks, some TCP/IP & IP 
blocking options") ; 
-                ("Misc", "miscellaneous") ];
+                ("Misc", "miscellaneous") ;
+                ("changed", "Show changed options") ];
 
             Printf.bprintf buf "
 \\<td nowrap title=\\\"Show all options\\\" class=\\\"fbig\\\"\\>\\<a 
onclick=\\\"javascript:window.location.href='submit?q=voo'\\\"\\>All\\</a\\>\\</td\\>
@@ -1670,9 +1674,12 @@
 
             list_options_html o (
               match args with
-                [] | _ :: _ :: _ ->
+              |  [] | _ :: _ :: _ ->
                   CommonInteractive.all_simple_options ()
 
+              | ["changed"] ->
+                  changed_list
+
               | [arg] ->
                   try
                   let tab = int_of_string arg in
@@ -1875,6 +1882,8 @@
                        strings_of_option backup_options_generations;
                        strings_of_option small_files_slot_limit;
                       ]
+                  | 9 ->
+                      changed_list
 
                   | _ ->
                       let v = CommonInteractive.some_simple_options (tab - 
!mtabs) in
@@ -1928,10 +1937,14 @@
           ("", "srh", "!! press ENTER to send changes to core !!"); ];
           end
                      
-        else
-            list_options o (CommonInteractive.parse_simple_options args);
+        else begin
+          match args with
+            | [] | _ :: _ :: _ -> list_options o 
(CommonInteractive.all_simple_options ())
+            | ["9"] | ["changed"] -> list_options o changed_list
+            | [_] -> list_options o (CommonInteractive.parse_simple_options 
args);
+          end;
         ""
-    ), ":\t\t\t\t\tprint all options";
+    ), "[<option>|changed]:\t\t\tprint options (use * as wildcard), 'changed' 
prints all changed options, leave empty to print all options";
 
     "vwi", Arg_none (fun o ->
         let buf = o.conn_buf in