[libvirt] [PATCH] util: escapes special characters in VIR_LOG_REGEX

[Daniel P. Berrange]

On Sat, Mar 09, 2013 at 10:49:16PM +0800, Guannan Ren wrote:
> In debug mode, the bug failed to start vm
> error: Failed to start domain rhel5u9
> error: internal error Out of space while reading console log output:
> ...
> ---
>  src/util/virlog.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/util/virlog.c b/src/util/virlog.c
> index 130bdff..957d993 100644
> --- a/src/util/virlog.c
> +++ b/src/util/virlog.c
> @@ -80,7 +80,7 @@ static regex_t *virLogRegex = NULL;
>  
>  
>  #define VIR_LOG_DATE_REGEX "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]"
> -#define VIR_LOG_TIME_REGEX "[0-9][0-9]:[0-9][0-9]:[0-9][0-9].[0-9][0-9][0-9]+[0-9][0-9][0-9][0-9]"
> +#define VIR_LOG_TIME_REGEX "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\.[0-9][0-9][0-9]\\+[0-9][0-9][0-9][0-9]"
>  #define VIR_LOG_PID_REGEX "[0-9]+"
>  #define VIR_LOG_LEVEL_REGEX "debug|info|warning|error"

ACK, these need to be literal '.' and '+' characters, not regex control
characters

   2013-03-07 12:22:00.736+0000: starting up



Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|