diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 07:59:31 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 07:59:31 -0700 |
| commit | 3700a64d973f55e1cc8bd478e203f00d529ce27b (patch) | |
| tree | 872a07003a538ac9c7921476c89c1e01766ca8b7 /plugins | |
| parent | 053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8 (diff) | |
| parent | c27a2ab6867897ec379ec1e9afb216c99070b33e (diff) | |
| download | rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.tar.gz rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.tar.xz rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
runtime/stream.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imfile/imfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 7c588f90..3981f9f7 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -359,12 +359,15 @@ persistStrmState(fileInfo_t *pInfo) { DEFiRet; strm_t *psSF = NULL; /* state file (stream) */ + size_t lenDir; ASSERT(pInfo != NULL); /* TODO: create a function persistObj in obj.c? */ CHKiRet(strm.Construct(&psSF)); - CHKiRet(strm.SetDir(psSF, glbl.GetWorkDir(), strlen((char*)glbl.GetWorkDir()))); + lenDir = strlen((char*)glbl.GetWorkDir()); + if(lenDir > 0) + CHKiRet(strm.SetDir(psSF, glbl.GetWorkDir(), lenDir)); CHKiRet(strm.SettOperationsMode(psSF, STREAMMODE_WRITE_TRUNC)); CHKiRet(strm.SetsType(psSF, STREAMTYPE_FILE_SINGLE)); CHKiRet(strm.SetFName(psSF, pInfo->pszStateFile, strlen((char*) pInfo->pszStateFile))); |