diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:34:08 -0700 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:34:08 -0700 |
commit | 87472f58b4cd47762a7b134f0d8521cabc739cae (patch) | |
tree | 2d34c0db0a6ce1b7d3b9e3bcbe8635f4be6b1d3a /runtime | |
parent | ed9fd3541f07929008a64f5b6ea3bcce70e62c25 (diff) | |
parent | f76b826989cea5fdfbb7b313557775cf082a398e (diff) | |
download | rsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.tar.gz rsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.tar.xz rsyslog-87472f58b4cd47762a7b134f0d8521cabc739cae.zip |
Merge branch 'v5-beta' into v5-devel
Conflicts:
Makefile.am
plugins/imfile/imfile.c
runtime/stream.c
tests/tcpflood.c
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/stream.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 7f965029..6b3040d8 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -214,7 +214,7 @@ doPhysOpen(strm_t *pThis) iFlags |= O_NONBLOCK; } - pThis->fd = open((char*)pThis->pszCurrFName, iFlags, pThis->tOpenMode); + pThis->fd = open((char*)pThis->pszCurrFName, iFlags | O_LARGEFILE, pThis->tOpenMode); DBGPRINTF("file '%s' opened as #%d with mode %d\n", pThis->pszCurrFName, pThis->fd, (int) pThis->tOpenMode); if(pThis->fd == -1) { @@ -1184,7 +1184,7 @@ finalize_it: * is invalidated. * rgerhards, 2008-01-12 */ -static rsRetVal strmSeek(strm_t *pThis, off_t offs) +static rsRetVal strmSeek(strm_t *pThis, off64_t offs) { DEFiRet; @@ -1194,9 +1194,9 @@ static rsRetVal strmSeek(strm_t *pThis, off_t offs) strmOpenFile(pThis); else strmFlushInternal(pThis); - int i; - DBGOPRINT((obj_t*) pThis, "file %d seek, pos %ld\n", pThis->fd, (long) offs); - i = lseek(pThis->fd, offs, SEEK_SET); // TODO: check error! + long long i; + DBGOPRINT((obj_t*) pThis, "file %d seek, pos %llu\n", pThis->fd, (long long unsigned) offs); + i = lseek64(pThis->fd, offs, SEEK_SET); // TODO: check error! pThis->iCurrOffs = offs; /* we are now at *this* offset */ pThis->iBufPtr = 0; /* buffer invalidated */ @@ -1473,7 +1473,7 @@ static rsRetVal strmSerialize(strm_t *pThis, strm_t *pStrm) { DEFiRet; int i; - int64 ll; + int64 l; ISOBJ_TYPE_assert(pThis, strm); ISOBJ_TYPE_assert(pStrm, strm); @@ -1495,8 +1495,8 @@ static rsRetVal strmSerialize(strm_t *pThis, strm_t *pStrm) i = pThis->tOpenMode; objSerializeSCALAR_VAR(pStrm, tOpenMode, INT, i); - ll = pThis->iCurrOffs; - objSerializeSCALAR_VAR(pStrm, iCurrOffs, INT64, ll); + l = pThis->iCurrOffs; + objSerializeSCALAR_VAR(pStrm, iCurrOffs, INT64, l); CHKiRet(obj.EndSerialize(pStrm)); |