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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/28 18:21:10

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

Log message:
        patch #5335

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.978&r2=1.979
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.166&r2=1.167

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -b -r1.978 -r1.979
--- distrib/ChangeLog   28 Aug 2006 18:20:18 -0000      1.978
+++ distrib/ChangeLog   28 Aug 2006 18:21:09 -0000      1.979
@@ -15,6 +15,7 @@
 =========
 
 2006/08/28
+5335: Fix small bugs in "!" command (execute shell commands)
 5334: HTML: Display edk2 links in search results
 5333: Clean logging (Swarmer, Fasttrack, Gnutella)
 5332: New command option: rem blocked - remove all IP blocked servers

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- src/daemon/driver/driverCommands.ml 28 Aug 2006 18:20:18 -0000      1.166
+++ src/daemon/driver/driverCommands.ml 28 Aug 2006 18:21:10 -0000      1.167
@@ -1047,7 +1047,7 @@
           match arg with
             c :: tail ->
               let args = String2.unsplit tail ' ' in
-              let cmd = List.assoc c !!allowed_commands in
+              let cmd = try List.assoc c !!allowed_commands with Not_found -> 
c in
               let tmp = Filename.temp_file "com" ".out" in
               let ret = Sys.command (Printf.sprintf "%s %s > %s"
                     cmd args tmp) in
@@ -1058,6 +1058,7 @@
         else
         match arg with
           [arg] ->
+           (try
             let cmd = List.assoc arg !!allowed_commands in
             let tmp = Filename.temp_file "com" ".out" in
             let ret = Sys.command (Printf.sprintf "%s > %s"
@@ -1065,6 +1066,7 @@
             let output = File.to_string tmp in
             Sys.remove tmp;
             Printf.sprintf (_b "%s\n---------------- Exited with code %d") 
output ret
+           with e -> "For arbitrary commands, you must set 
'allowed_any_command'")
         | [] ->
             _s "no command given"
         | _ -> "For arbitrary commands, you must set 'allowed_any_command'"