diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-01 17:28:36 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-01 17:28:36 +0100 |
commit | 48877c8ef41787d59a062ab07f5b6ee37eba7ce1 (patch) | |
tree | d94876c7521bdd81f0028fe7824bad228b67a5fd /parse.c | |
parent | b030fe7b1f8fb26dad24ce23243f11603b5c9d4e (diff) | |
download | rsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.tar.gz rsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.tar.xz rsyslog-48877c8ef41787d59a062ab07f5b6ee37eba7ce1.zip |
milestone: added support for CEE-properties in property-based filters
Diffstat (limited to 'parse.c')
-rw-r--r-- | parse.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -231,7 +231,8 @@ rsRetVal parsSkipWhitespace(rsParsObj *pThis) /* Parse string up to a delimiter. * * Input: - * cDelim - the delimiter + * cDelim - the delimiter. Note that SP within a value always is a delimiter, + * so cDelim is actually an *additional* delimiter. * The following two are for whitespace stripping, * 0 means "no", 1 "yes" * - bTrimLeading @@ -256,13 +257,13 @@ rsRetVal parsDelimCStr(rsParsObj *pThis, cstr_t **ppCStr, char cDelim, int bTrim pC = rsCStrGetBufBeg(pThis->pCStr) + pThis->iCurrPos; - while(pThis->iCurrPos < rsCStrLen(pThis->pCStr) && *pC != cDelim) { + while(pThis->iCurrPos < rsCStrLen(pThis->pCStr) && *pC != cDelim && *pC != ' ') { CHKiRet(cstrAppendChar(pCStr, bConvLower ? tolower(*pC) : *pC)); ++pThis->iCurrPos; ++pC; } - if(*pC == cDelim) { + if(pThis->iCurrPos < cstrLen(pThis->pCStr)) { //BUGFIX!! ++pThis->iCurrPos; /* eat delimiter */ } |