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

RHEL 5: p2v: Workarounds for limited partial match support in ancient PCRE.

Browse Source 
In the ancient version of PCRE in RHEL 5, partial match support does
not support /.*/, returning PCRE_ERROR_BADPARTIAL.  However the
equivalent regular expression /(?:.)*/ works fine, so use that
instead.
This commit is contained in:
Richard W.M. Jones
2017-01-21 05:22:36 -05:00
parent 17cc502d9b
commit ae160215ca
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2v/ssh.c
View File

@@ -163,15 +163,21 @@ compile_regexps (void)
} while (0)
COMPILE (password_re, "password:", 0);
COMPILE (ssh_message_re, "(ssh: .*)", 0);
/* Note that (?:.)* is required in order to work around a problem
* with partial matching and PCRE in RHEL 5.
*/
COMPILE (ssh_message_re, "(ssh: (?:.)*)", 0);
COMPILE (sudo_password_re, "sudo: a password is required", 0);
/* The magic synchronization strings all match this expression. See
* start_ssh function below.
*/
COMPILE (prompt_re,
"###((?:[0123456789abcdefghijklmnopqrstuvwxyz]){8})### ", 0);
/* Note that (?:.)* is required in order to work around a problem
* with partial matching and PCRE in RHEL 5.
*/
COMPILE (version_re,
"virt-v2v ([1-9].*)",
"virt-v2v ([1-9](?:.)*)",
0);
COMPILE (feature_libguestfs_rewrite_re, "libguestfs-rewrite", 0);
COMPILE (feature_colours_option_re, "colours-option", 0);