summaryrefslogtreecommitdiffstats
path: root/omshell.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-27 16:55:40 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-27 16:55:40 +0000
commit1d96a98daf4ac4c4ec9e664e328f1aac4bf6af9e (patch)
tree249ec71321b657a6a37b91f1d03f4e2c4bf07697 /omshell.c
parent8193522d85290df659d8c2e505e8c47f39db9267 (diff)
downloadrsyslog-1d96a98daf4ac4c4ec9e664e328f1aac4bf6af9e.tar.gz
rsyslog-1d96a98daf4ac4c4ec9e664e328f1aac4bf6af9e.tar.xz
rsyslog-1d96a98daf4ac4c4ec9e664e328f1aac4bf6af9e.zip
- added omsr object (objomsr.c, objomsr.h) - template request for output
modules - changed doAction() interface - templates and output string generation for doActon() is now fully
Diffstat (limited to 'omshell.c')
-rw-r--r--omshell.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/omshell.c b/omshell.c
index efeb7bf7..5a25cc9f 100644
--- a/omshell.c
+++ b/omshell.c
@@ -81,14 +81,14 @@ CODESTARTdoAction
* rgerhards, 2007-07-20
*/
dprintf("\n");
- if(execProg((uchar*) pData->progName, 1, pMsg) == 0)
+ if(execProg((uchar*) pData->progName, 1, ppString[0]) == 0)
logerrorSz("Executing program '%s' failed", (char*)pData->progName);
ENDdoAction
BEGINparseSelectorAct
CODESTARTparseSelectorAct
- p = *pp;
+CODE_STD_STRING_REQUESTparseSelectorAct(1)
/* yes, the if below is redundant, but I need it now. Will go away as
* the code further changes. -- rgerhards, 2007-07-25
*/
@@ -103,7 +103,7 @@ CODESTARTparseSelectorAct
case '^': /* bkalkbrenner 2005-09-20: execute shell command */
dprintf("exec\n");
++p;
- iRet = cflineParseFileName(f, p, (uchar*) pData->progName);
+ iRet = cflineParseFileName(p, (uchar*) pData->progName, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS);
break;
default:
iRet = RS_RET_CONFLINE_UNPROCESSED;