diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 16:30:13 +0200 |
| commit | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (patch) | |
| tree | f3464946b2eef29b2f8a4e54c32f7bf063a2c27f /runtime/msg.c | |
| parent | f057fb2db388cc16475f9c5a7de64aeb1f3bdb43 (diff) | |
| parent | eccfbf71f9dbc235309c2ad40035d41620f5e5df (diff) | |
| download | rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.gz rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.bz2 rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.zip | |
Merge branch 'v5-beta' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index b0261faa..e8e60963 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -444,6 +444,8 @@ rsRetVal propNameToID(cstr_t *pCSPropName, propid_t *pPropID) *pPropID = PROP_SYS_MINUTE; } else if(!strcmp((char*) pName, "$myhostname")) { *pPropID = PROP_SYS_MYHOSTNAME; + } else if(!strcmp((char*) pName, "$bom")) { + *pPropID = PROP_SYS_BOM; } else { *pPropID = PROP_INVALID; iRet = RS_RET_VAR_NOT_FOUND; @@ -525,6 +527,8 @@ uchar *propIDToName(propid_t propID) return UCHAR_CONSTANT("$MINUTE"); case PROP_SYS_MYHOSTNAME: return UCHAR_CONSTANT("$MYHOSTNAME"); + case PROP_SYS_BOM: + return UCHAR_CONSTANT("$BOM"); default: return UCHAR_CONSTANT("*invalid property id*"); } @@ -2427,6 +2431,12 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, case PROP_SYS_MYHOSTNAME: pRes = glbl.GetLocalHostName(); break; + case PROP_SYS_BOM: + if(*pbMustBeFreed == 1) + free(pRes); + pRes = (uchar*) "\xEF\xBB\xBF"; + *pbMustBeFreed = 0; + break; default: /* there is no point in continuing, we may even otherwise render the * error message unreadable. rgerhards, 2007-07-10 |