summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:34:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-05 14:34:21 +0100
commit4578dc6a2dc65112f4aaae1524f83cc9b075295d (patch)
tree7f86aaf79a9b4a77bfb297336b25f1f61007db72 /tools
parent6d9c54c7a2d4f07b0414082ef9681bd197ed6bde (diff)
parentcd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (diff)
downloadrsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.tar.gz
rsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.tar.xz
rsyslog-4578dc6a2dc65112f4aaae1524f83cc9b075295d.zip
Merge branch 'v4-devel' into tmp
Diffstat (limited to 'tools')
-rw-r--r--tools/omfile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/omfile.c b/tools/omfile.c
index a724a695..0e6d9617 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -1,8 +1,6 @@
/* omfile.c
* This is the implementation of the build-in file output module.
*
- * Handles: eTypeCONSOLE, eTypeTTY, eTypeFILE, eTypePIPE
- *
* NOTE: read comments in module-template.h to understand how this file
* works!
*
@@ -701,6 +699,11 @@ CODESTARTparseSelectorAct
case '|':
case '/':
CODE_STD_STRING_REQUESTparseSelectorAct(1)
+ /* we now have the same semantics for files and pipes, but we need to skip over
+ * the pipe indicator traditionally seen in config files...
+ */
+ if(*p == '|')
+ ++p;
CHKiRet(cflineParseFileName(p, (uchar*) pData->f_fname, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS,
(pszTplName == NULL) ? (uchar*)"RSYSLOG_FileFormat" : pszTplName));
pData->bDynamicName = 0;