X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=utils.ml;h=0bf18fa94a791d714b0c7bcc54da359a39ebb427;hb=refs%2Ftags%2F0.1.5;hp=95c128937fd0112c37fd3ee53941fe2375150c63;hpb=f09bb82de01019f24411cac2916d9567b5e9a235;p=guestfs-browser.git

diff --git a/utils.ml b/utils.ml
index 95c1289..0bf18fa 100644
--- a/utils.ml
+++ b/utils.ml
@@ -18,8 +18,6 @@
 
 open ExtString
 open ExtList
-open CamomileLibrary
-open Default.Camomile
 
 open Printf
 
@@ -156,7 +154,7 @@ let tmpdir () =
   (* Note this is secure, because if the name already exists, even as a
    * symlink, mkdir(2) will fail.
    *)
-  let tmpdir = Filename.temp_dir_name // sprintf "febootstrap%s.tmp" data in
+  let tmpdir = Filename.temp_dir_name // sprintf "guestfsbrowser%s.tmp" data in
   Unix.mkdir tmpdir 0o700;
   at_exit
     (fun () ->
@@ -164,9 +162,12 @@ let tmpdir () =
        ignore (Sys.command cmd));
   tmpdir
 
-let utf16le = CharEncoding.utf16le
-let utf8 = CharEncoding.utf8
-let recode = CharEncoding.recode_string ~in_enc:utf16le ~out_enc:utf8
+module CE = CamomileLibraryDefault.Camomile.CharEncoding
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
+module UChar = CamomileLibraryDefault.Camomile.UChar
+let utf16le = CE.utf16le
+let utf8 = CE.utf8
+let recode = CE.recode_string ~in_enc:utf16le ~out_enc:utf8
 
 let windows_string_to_utf8 str =
   let str = recode str in
@@ -218,3 +219,7 @@ and reg_hex_of_string ?(split_long_lines=false) v =
         (int_of_char c)
   ) vs in
   String.concat "," vs
+
+let local_file_exists filename =
+  try Unix.access filename [Unix.F_OK]; true
+  with Unix.Unix_error _ -> false