todo: Use signals.

[guestfs-browser.git] / utils.ml

diff --git a/utils.ml b/utils.ml
index e0c2ff1..9da9eb1 100644 (file)
--- a/utils.ml
+++ b/utils.ml
@@ -18,8 +18,6 @@
 
 open ExtString
 open ExtList
-open CamomileLibrary
-open Default.Camomile
 
 open Printf
 
@@ -66,6 +64,24 @@ let connect_uri () = !connect_uri
 
 let utf8_rarrow = "\xe2\x86\x92"
 
+let pretty_string_of_exn =
+  function
+  | Guestfs.Error str ->
+      "Libguestfs error",
+      sprintf "libguestfs reported an error:
+
+%s
+
+To get more information about libguestfs errors, run guestfs-browser
+with the -x flag on the command line."
+        str
+
+  (* Add more exception types here as we come across them.  Last
+   * case below is the catch-all.
+   *)
+  | exn ->
+      "Error", Printexc.to_string exn
+
 let human_size i =
   if i < 1024L then
     sprintf "%Ld" i
@@ -164,9 +180,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