[Libguestfs] [PATCH v3 22/22] v2v: utils: Replace Str.bounded_split with PCRE.nsplit.

Richard W.M. Jones rjones at redhat.com
Fri Sep 22 07:36:23 UTC 2017


Updates commit 8f91d3a9b0356a701c1904e0a2efa5d272d08ac2 similar to
Tomáš's original intended code.
---
 v2v/utils.ml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v2v/utils.ml b/v2v/utils.ml
index 008452d69..12ebe23f4 100644
--- a/v2v/utils.ml
+++ b/v2v/utils.ml
@@ -138,6 +138,8 @@ let backend_is_libvirt () =
   let backend = fst (String.split ":" backend) in
   backend = "libvirt"
 
+let ws = PCRE.compile "\\s+"
+
 let find_file_in_tar tar filename =
   let lines = external_command (sprintf "tar tRvf %s" (Filename.quote tar)) in
   let rec loop lines =
@@ -147,7 +149,7 @@ let find_file_in_tar tar filename =
       (* Lines have the form:
        * block <offset>: <perms> <owner>/<group> <size> <mdate> <mtime> <file>
        *)
-      let elems = Str.bounded_split (Str.regexp " +") line 8 in
+      let elems = PCRE.nsplit ~max:8 ws line in
       if List.length elems = 8 && List.hd elems = "block" then (
         let elems = Array.of_list elems in
         let offset = elems.(1) in
-- 
2.13.2




More information about the Libguestfs mailing list