added list_obj and list_uri

[helm.git] / helm / ocaml / getter / http_getter_misc.ml

diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml
index 897442e63206e90fcc0f9d25f7f7844836e31af2..eeea891602bf979404fe3c55a2abed7c87565cba 100644 (file)
--- a/helm/ocaml/getter/http_getter_misc.ml
+++ b/helm/ocaml/getter/http_getter_misc.ml
@@ -62,18 +62,37 @@ let hashtbl_sorted_iter f tbl =
   let sorted_keys =
     List.sort compare (Hashtbl.fold (fun key _ keys -> key::keys) tbl [])
   in
-  List.iter (fun k -> f k (Hashtbl.find tbl k)) sorted_keys
+    List.iter (fun k -> f k (Hashtbl.find tbl k)) sorted_keys
 
 let cp src dst =
-  let (ic, oc) = (open_in src, open_out dst) in
-  let buf = String.create bufsiz in
-  (try
-    while true do
-      let bytes = input ic buf 0 bufsiz in
-      if bytes = 0 then raise End_of_file else output oc buf 0 bytes
-    done
-  with End_of_file -> ());
-  close_in ic; close_out oc
+  try 
+    let ic = open_in src in
+      try
+       let oc = open_out dst in
+       let buf = String.create bufsiz in
+         (try
+            while true do
+              let bytes = input ic buf 0 bufsiz in
+                if bytes = 0 then raise End_of_file else output oc buf 0 bytes
+            done
+          with 
+              End_of_file -> ()
+         );
+         close_in ic; close_out oc
+      with 
+         Sys_error s -> 
+           Http_getter_logger.log s;
+           close_in ic
+       | e -> 
+           Http_getter_logger.log (Printexc.to_string e);
+           close_in ic;
+           raise e
+  with 
+      Sys_error s -> 
+       Http_getter_logger.log s
+    | e -> 
+       Http_getter_logger.log (Printexc.to_string e);
+       raise e
 
 let wget ?output url =
   Http_getter_logger.log
@@ -94,7 +113,7 @@ let wget ?output url =
       (let oc = 
         open_out (match output with Some f -> f | None -> Filename.basename url)
       in
-      Http_client.http_get_iter (fun data -> output_string oc data) url;
+      Http_user_agent.get_iter (fun data -> output_string oc data) url;
       close_out oc)
   | scheme -> (* unsupported scheme *)
       failwith ("Http_getter_misc.wget: unsupported scheme: " ^ scheme)
@@ -129,15 +148,26 @@ let gunzip ?(keep = false) ?output fname =
   in
   Http_getter_logger.log ~level:3
     (sprintf "gunzipping %s (keep: %b, output: %s)" fname keep output);
-  let (ic, oc) = (Gzip.open_in fname, open_out output) in
-  let buf = String.create bufsiz in
-  (try
-    while true do
-      let bytes = Gzip.input ic buf 0 bufsiz in
-      if bytes = 0 then raise End_of_file else Pervasives.output oc buf 0 bytes
-    done
-  with End_of_file -> ());
-  Gzip.close_in ic; close_out oc;
+  (* Open the zipped file manually since Gzip.open_in may
+   * leak the descriptor if it raises an exception *)
+  let zic = open_in fname in
+  begin
+    try
+      let ic = Gzip.open_in_chan zic in
+      Http_getter_logger.log (sprintf "LUCA: OK" );
+      let oc = open_out output in
+      let buf = String.create bufsiz in
+      (try
+        while true do
+          let bytes = Gzip.input ic buf 0 bufsiz in
+          if bytes = 0 then raise End_of_file else Pervasives.output oc buf 0 bytes
+        done
+      with End_of_file -> ());
+       close_out oc;
+       Gzip.close_in ic
+    with
+      e -> close_in zic ; raise e
+  end ;
   if not keep then Sys.remove fname
 ;;
 
@@ -189,16 +219,16 @@ let http_get url =
       let size = (Unix.stat fname).Unix.st_size in
       let buf = String.create size in
       let ic = open_in fname in
-      really_input ic buf 0 size;
+      really_input ic buf 0 size ;
       close_in ic;
       Some buf
     with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None
-  end else  (* other URL, pass it to Http_client *)
+  end else  (* other URL, pass it to Http_user_agent *)
     try
-      Some (Http_client.http_get url)
+      Some (Http_user_agent.get url)
     with e ->
       Http_getter_logger.log (sprintf
-        "Warning: Http_client failed on url %s with exception: %s"
+        "Warning: Http_user_agent failed on url %s with exception: %s"
         url (Printexc.to_string e));
       None