diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-05 14:34:08 +0100 |
| commit | cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (patch) | |
| tree | 4e98efffdf24157afe8601a8c381dcc56a0ad354 /tools | |
| parent | e4ca8a3119ece504819605b340a3f5ba36b3eab6 (diff) | |
| parent | 6a99be469643ef0214729391f9cef4867b8e9fca (diff) | |
| download | rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.gz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.tar.xz rsyslog-cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfile.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 65140ac4..82548247 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! * @@ -687,6 +685,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; |