X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=lib%2Fvirt_mem.ml;h=8a835ec2427a525f446664f8716e6a81109bd509;hp=82e0b37e820e7f1a7f389685d0fb92cf46201cf8;hb=cb0cb33ae593436fd984c105cf5682155704e39f;hpb=5ce06c3326a2672e82dc656b35eb7a3e6616539a

diff --git a/lib/virt_mem.ml b/lib/virt_mem.ml
index 82e0b37..8a835ec 100644
--- a/lib/virt_mem.ml
+++ b/lib/virt_mem.ml
@@ -1,4 +1,4 @@
-(* Memory info command for virtual domains.
+(* Memory info for virtual domains.
    (C) Copyright 2008 Richard W.M. Jones, Red Hat Inc.
    http://libvirt.org/
 
@@ -21,11 +21,19 @@ open Unix
 open Printf
 open ExtList
 
+open Virt_mem_gettext.Gettext
 open Virt_mem_utils
 module MMap = Virt_mem_mmap
 
-(* Main program. *)
-let () =
+type ksym = string
+
+type image =
+    string
+    * Virt_mem_utils.architecture
+    * ([`Wordsize], [`Endian]) Virt_mem_mmap.t
+    * (ksym -> Virt_mem_mmap.addr)
+
+let start usage_msg =
   (* Verbose messages. *)
   let verbose = ref false in
 
@@ -35,7 +43,7 @@ let () =
     | "32" -> def_wordsize := Some W32
     | "64" -> def_wordsize := Some W64
     | "auto" -> def_wordsize := None
-    | str -> failwith (sprintf "set_wordsize: %s: unknown wordsize" str)
+    | str -> failwith (sprintf (f_"set_wordsize: %s: unknown wordsize") str)
   in
 
   (* Default endianness. *)
@@ -46,7 +54,7 @@ let () =
 	def_endian := Some Bitmatch.LittleEndian
     | "be" | "big" | "bigendian" | "motorola" ->
 	def_endian := Some Bitmatch.BigEndian
-    | str -> failwith (sprintf "set_endian: %s: unknown endianness" str)
+    | str -> failwith (sprintf (f_"set_endian: %s: unknown endianness") str)
   in
 
   (* Default architecture. *)
@@ -80,28 +88,22 @@ let () =
 
   let argspec = Arg.align [
     "-A", Arg.String set_architecture,
-    "arch " ^ "Set kernel architecture, endianness and word size";
+    "arch " ^ s_"Set kernel architecture, endianness and word size";
     "-E", Arg.String set_endian,
-    "endian " ^ "Set kernel endianness";
+    "endian " ^ s_"Set kernel endianness";
     "-T", Arg.String set_text_addr,
-    "addr " ^ "Set kernel text address";
+    "addr " ^ s_"Set kernel text address";
     "-W", Arg.String set_wordsize,
-    "addr " ^ "Set kernel word size";
+    "addr " ^ s_"Set kernel word size";
     "-t", Arg.String memory_image,
-    "image " ^ "Use saved kernel memory image";
+    "image " ^ s_"Use saved kernel memory image";
     "-verbose", Arg.Set verbose,
-    " " ^ "Verbose messages";
+    " " ^ s_"Verbose messages";
   ] in
 
   let anon_fun str =
-    raise (Arg.Bad (sprintf "%s: unknown parameter" str)) in
-  let usage_msg = "virt-mem: shows memory information for guests
-
-SUMMARY
-  virt-mem [-options]
-
-OPTIONS" in
-
+    raise (Arg.Bad (sprintf (f_"%s: unknown parameter") str)) in
+  let usage_msg = usage_msg ^ s_"\n\nOPTIONS" in
   Arg.parse argspec anon_fun usage_msg;
 
   let images = !images in
@@ -123,14 +125,14 @@ OPTIONS" in
 	    match wordsize with
 	    | None ->
 		failwith
-		  (sprintf "%s: use -W to define word size for this image"
+		  (sprintf (f_"%s: use -W to define word size for this image")
 		     filename);
 	    | Some ws -> ws in
 	  let endian =
 	    match endian with
 	    | None ->
 		failwith
-		  (sprintf "%s: use -E to define endianness for this image"
+		  (sprintf (f_"%s: use -E to define endianness for this image")
 		     filename);
 	    | Some e -> e in
 
@@ -139,11 +141,11 @@ OPTIONS" in
 	    | Some I386 -> I386 | Some X86_64 -> X86_64
 	    | _ ->
 		failwith
-		  (sprintf "%s: use -A to define architecture (i386/x86-64 only) for this image" filename) in
+		  (sprintf (f_"%s: use -A to define architecture (i386/x86-64 only) for this image") filename) in
 
 	  if text_addr = 0L then
 	    failwith
-	      (sprintf "%s: use -T to define kernel load address for this image"
+	      (sprintf (f_"%s: use -T to define kernel load address for this image")
 		 filename);
 
 	  (* Map the virtual memory. *)
@@ -154,159 +156,155