X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unixsocketwatcher.ml;h=7663be93f8c9512072df23a0d65fd42d09841d81;hb=0a4a3a68d48188e50ae321557f4527a8dffaf73a;hp=420d05a7c3497aa3e2744af79332ad77f143ebbc;hpb=36303447f006c8c87cf4e91794b96752003e4b68;p=vsys.git

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index 420d05a..7663be9 100644
--- a/unixsocketwatcher.ml
+++ b/unixsocketwatcher.ml
@@ -13,6 +13,8 @@ open Globals
 open Fdwatcher
 open Printf
 
+exception Exec_failed
+
 let close_if_open fd = (try (ignore(close fd);) with _ -> ())
 
 type control_path_name = string
@@ -37,7 +39,7 @@ let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
           |None -> logprint "Received unexpected socket event\n";()
           |Some (execpath, slice_name) ->
               begin
-                let child = fork () in
+                let child = try fork () with _ -> -1 in
                   if (child == 0) then
                     begin
                       (* Child *)
@@ -48,7 +50,9 @@ let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
                           for i = 3 to 1023 do
                             if (i != fd) then close_if_open(Obj.magic i)
                           done;
-                            execv execpath [|execpath;slice_name;sprintf "%d" fd|] (*with
+                            execv execpath [|execpath;slice_name;sprintf "%d" fd|];
+                            raise Exec_failed
+                        (*with
                                 Unix_error(num,str1,str2)->logprint "Error %d: %s (%s)" (Obj.magic num) str1 str2;raise (Unix_error(num,str1,str2))*)
                         in
                             logprint "Could not execve %s" execpath