diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-07-24 11:38:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-07-24 11:38:01 +0200 |
| commit | 7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0 (patch) | |
| tree | 4bf26b42e0157d62ac70c38bd783a3b35e83ecc3 /runtime/stream.c | |
| parent | 0253f5ea381d1ff5da162359e16ec7c010fc18a3 (diff) | |
| parent | f043778bdc23c7b2baf18c1fc35ba47fa4d8386c (diff) | |
| download | rsyslog-7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0.tar.gz rsyslog-7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0.tar.bz2 rsyslog-7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0.zip | |
Merge branch 'v5-stable' into v6-stablev6.2.2.with.unreleased.fixes
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 6b88d3f4..bb1a0a42 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -16,7 +16,7 @@ * it turns out to be problematic. Then, we need to quasi-refcount the number of accesses * to the object. * - * Copyright 2008, 2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -361,7 +361,7 @@ static rsRetVal strmCloseFile(strm_t *pThis) pThis->fdDir = -1; } - if(pThis->bDeleteOnClose) { + if(pThis->bDeleteOnClose && pThis->pszCurrFName != NULL) { if(unlink((char*) pThis->pszCurrFName) == -1) { char errStr[1024]; int err = errno; @@ -369,14 +369,12 @@ static rsRetVal strmCloseFile(strm_t *pThis) DBGPRINTF("error %d unlinking '%s' - ignored: %s\n", errno, pThis->pszCurrFName, errStr); } - } - - pThis->iCurrOffs = 0; /* we are back at begin of file */ - if(pThis->pszCurrFName != NULL) { free(pThis->pszCurrFName); /* no longer needed in any case (just for open) */ pThis->pszCurrFName = NULL; } + pThis->iCurrOffs = 0; /* we are back at begin of file */ + RETiRet; } |