X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_misc.ml;h=c6a5954e55a243c271d69d3175053be8f482cabf;hb=eb5345bc1314ca8bf8b9ea2293dbe0aa496b2d69;hp=6f612cc30aead385867a3965bf9e45991e271701;hpb=2f9a5abbd182b6ef3768c9137bb19afed2ee6bf2;p=helm.git

diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml
index 6f612cc30..c6a5954e5 100644
--- a/helm/ocaml/getter/http_getter_misc.ml
+++ b/helm/ocaml/getter/http_getter_misc.ml
@@ -28,8 +28,6 @@
 
 open Printf
 
-open Http_getter_debugger
-
 let trailing_dot_gz_RE = Pcre.regexp "\\.gz$"   (* for g{,un}zip *)
 let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$"
 let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://"
@@ -37,6 +35,8 @@ let file_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^file://"
 let dir_sep_RE = Pcre.regexp "/"
 let heading_slash_RE = Pcre.regexp "^/"
 
+let is_local_url s = Pcre.pmatch ~rex:file_scheme_RE s
+
 let bufsiz = 16384  (* for file system I/O *)
 let tcp_bufsiz = 4096 (* for TCP I/O *)
 
@@ -64,21 +64,40 @@ 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 =
-  debug_print
+  Http_getter_logger.log
     (sprintf "wgetting %s (output: %s)" url
       (match output with None -> "default" | Some f -> f));
   match url with
@@ -96,14 +115,15 @@ 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)
 
 let gzip ?(keep = false) ?output fname =
   let output = match output with None -> fname ^ ".gz" | Some fname -> fname in
-  debug_print (sprintf "gzipping %s (keep: %b, output: %s)" fname keep output);
+  Http_getter_logger.log ~level:3
+    (sprintf "gzipping %s (keep: %b, output: %s)" fname keep output);
   let (ic, oc) = (open_in fname, Gzip.open_out output) in
   let buf = String.create bufsiz in
   (try
@@ -128,17 +148,28 @@ let gunzip ?(keep = false) ?output fname =
             "Http_getter_misc.gunzip: unable to determine output file name"
     | Some fname -> fname
   in
-  debug_print (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;
+  Http_getter_logger.log ~level:3
+    (sprintf "gunzipping %s (keep: %b, output: %s)" fname keep output);
+  (* 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
 ;;
 
@@ -190,16 +221,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 ->
-      prerr_endline (sprintf
-        "Warning: Http_client failed on url %s with exception: %s"
+      Http_getter_logger.log (sprintf
+        "Warning: Http_user_agent failed on url %s with exception: %s"
         url (Printexc.to_string e));
       None