search for: rex_resum

...l index b273785e6..02dc2fee2 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -976,7 +976,7 @@ let convert (g : G.guestfs) inspect source output rcaps = List.flatten (List.map Array.to_list (List.map g#aug_match paths)) in (* Map device names for each entry. *) - let rex_resume = PCRE.compile "^(.*resume=)(/dev/\\S+)(.*)$" + let rex_resume = PCRE.compile "^resume=(/dev/[a-z\\d]+)(.*)$" and rex_device_cciss = PCRE.compile "^/dev/(cciss/c\\d+d\\d+)(?:p(\\d+))?$" and rex_device = PCRE.compile "^/dev/([a-z]+)(\\d*)?$" in...

...index be4905473..945c3aa32 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -1004,7 +1004,7 @@ let convert (g : G.guestfs) inspect source output rcaps = List.flatten (List.map Array.to_list (List.map g#aug_match paths)) in (* Map device names for each entry. *) - let rex_resume = PCRE.compile "^resume=(/dev/[a-z\\d]+)(.*)$" + let rex_resume = PCRE.compile "^resume=(/dev/[-a-z\\d/_]+)(.*)$" and rex_device_cciss = PCRE.compile "^/dev/(cciss/c\\d+d\\d+)(?:p(\\d+))?$" and rex_device = PCRE.compile "^/dev/([a-z]+)(\\d*)?$"...

...gt; --- a/v2v/convert_linux.ml > +++ b/v2v/convert_linux.ml > @@ -1004,7 +1004,7 @@ let convert (g : G.guestfs) inspect source output rcaps = > List.flatten (List.map Array.to_list (List.map g#aug_match paths)) in > > (* Map device names for each entry. *) > - let rex_resume = PCRE.compile "^resume=(/dev/[a-z\\d]+)(.*)$" > + let rex_resume = PCRE.compile "^resume=(/dev/[-a-z\\d/_]+)(.*)$" > and rex_device_cciss = PCRE.compile "^/dev/(cciss/c\\d+d\\d+)(?:p(\\d+))?$" > and rex_device = PCRE.compile "^/dev/([a-z]+)...

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As

...r conversion.") path device; device in - if string_find path "GRUB_CMDLINE" >= 0 then ( + if String.find path "GRUB_CMDLINE" >= 0 then ( (* Handle grub2 resume=<dev> specially. *) if Str.string_match rex_resume value 0 then ( let start = Str.matched_group 1 value diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index ac281a0..d1aef36 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -647,7 +647,7 @@ echo uninstalling Xen PV driver let t = g#hivex_valu...

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.