From 0e1b77c8b4aeb6b828a94c887bbe4f03ba3a28ae Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 13 Apr 2015 09:47:10 +0000 Subject: [PATCH] #1028 and #1053. Change options to regex to respect ^ and $ in option -g --- src/actions.cpp | 2 +- src/version.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index 52dbc788..32e73011 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -571,7 +571,7 @@ namespace Action { !result && g != Params::instance().greps_.end(); ++g) { #if EXV_HAVE_REGEX - result = regexec( &(*g), key.c_str(), 0, NULL, REG_NOTBOL | REG_NOTEOL) == 0 ; + result = regexec( &(*g), key.c_str(), 0, NULL, REG_EXTENDED) == 0 ; #else result = key.find(*g) != std::string::npos; #endif diff --git a/src/version.cpp b/src/version.cpp index 8ae7d856..9b74b0a2 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -151,8 +151,8 @@ static void output(std::ostream& os,const exv_grep_keys_t& greps,const char* nam !bPrint && g != greps.end() ; ++g ) { #if EXV_HAVE_REGEX - bPrint = ( 0 == regexec( &(*g), name , 0, NULL, REG_NOTBOL | REG_NOTEOL) - || 0 == regexec( &(*g), value.c_str(), 0, NULL, REG_NOTBOL | REG_NOTEOL) + bPrint = ( 0 == regexec( &(*g), name , 0, NULL, REG_EXTENDED) + || 0 == regexec( &(*g), value.c_str(), 0, NULL, REG_EXTENDED) ); #else bPrint = std::string(name).find(*g) != std::string::npos || value.find(*g) != std::string::npos;