summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-21 14:07:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-21 14:07:22 +0200
commit572241c51e547c681f6eb06f6602e51b9a779b9b (patch)
treef161b64c64256d06166909ab8dea776c0381f4ef /runtime/msg.c
parent0af5062e9a94d17653818c3a220a1f97cdf9f005 (diff)
downloadrsyslog-572241c51e547c681f6eb06f6602e51b9a779b9b.tar.gz
rsyslog-572241c51e547c681f6eb06f6602e51b9a779b9b.tar.bz2
rsyslog-572241c51e547c681f6eb06f6602e51b9a779b9b.zip
prep work to support one-char variable namepaces
Diffstat (limited to 'runtime/msg.c')
-rw-r--r--runtime/msg.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/msg.c b/runtime/msg.c
index e159bba9..2e5d9358 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -534,16 +534,16 @@ propNameStrToID(uchar *pName, propid_t *pPropID)
*pPropID = PROP_SYS_MYHOSTNAME;
} else if(!strcmp((char*) pName, "$!all-json")) {
*pPropID = PROP_CEE_ALL_JSON;
- } else if(!strncmp((char*) pName, "$!", 2)) {
- *pPropID = PROP_CEE;
- } else if(!strncmp((char*) pName, "$.", 2)) {
- *pPropID = PROP_LOCAL_VAR;
- } else if(!strncmp((char*) pName, "$/", 2)) {
- *pPropID = PROP_GLOBAL_VAR;
} else if(!strcmp((char*) pName, "$bom")) {
*pPropID = PROP_SYS_BOM;
} else if(!strcmp((char*) pName, "$uptime")) {
*pPropID = PROP_SYS_UPTIME;
+ } else if(!strncmp((char*) pName, "$!", 2) || pName[0] == '!') {
+ *pPropID = PROP_CEE;
+ } else if(!strncmp((char*) pName, "$.", 2) || pName[0] == '.') {
+ *pPropID = PROP_LOCAL_VAR;
+ } else if(!strncmp((char*) pName, "$/", 2) || pName[0] == '/') {
+ *pPropID = PROP_GLOBAL_VAR;
} else {
DBGPRINTF("PROP_INVALID for name '%s'\n", pName);
*pPropID = PROP_INVALID;