mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: utils: Replace Str.bounded_split with PCRE.nsplit.

Browse Source 
Updates commit 8f91d3a9b0 similar to
Tomáš's original intended code.
This commit is contained in:
Richard W.M. Jones
2017-09-21 20:50:55 +01:00
parent 7e73fdece4
commit fa62e3a0cf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
v2v/utils.ml
View File

@@ -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