d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed for OUTSEEK (by C. Verstoep)

Browse source
This commit is contained in:
ceriel 1990-12-11 10:38:22 +00:00
parent 007151ef1d
commit 159d8ec57d
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/src/object/wr.c
View file

@ -33,14 +33,18 @@ static int offcnt;
__wr_flush(ptr) __wr_flush(ptr)
register struct fil *ptr; register struct fil *ptr;
{ {
if (ptr->pnow > ptr->pbegin) {
#ifdef OUTSEEK #ifdef OUTSEEK
if (currpos != ptr->currpos) { /* seek to correct position even if we aren't going to write now */
lseek(ptr->fd, ptr->currpos, 0); if (currpos != ptr->currpos) {
} currpos = lseek(ptr->fd, ptr->currpos, 0);
}
#endif #endif
if (ptr->pnow > ptr->pbegin) {
wr_bytes(ptr->fd, ptr->pbegin, (long)(ptr->pnow - ptr->pbegin)); wr_bytes(ptr->fd, ptr->pbegin, (long)(ptr->pnow - ptr->pbegin));
ptr->currpos += ptr->pnow - ptr->pbegin; ptr->currpos += ptr->pnow - ptr->pbegin;
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
if (ptr < &__parts[PARTEMIT+SECTCNT]) { if (ptr < &__parts[PARTEMIT+SECTCNT]) {
offset[sectionnr] = ptr->currpos; offset[sectionnr] = ptr->currpos;
} }
@ -48,9 +52,6 @@ __wr_flush(ptr)
ptr->cnt = WBUFSIZ; ptr->cnt = WBUFSIZ;
ptr->pnow = ptr->pbuf; ptr->pnow = ptr->pbuf;
ptr->pbegin = ptr->pbuf; ptr->pbegin = ptr->pbuf;
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
} }
static OUTWRITE(p, b, n) static OUTWRITE(p, b, n)
@ -71,6 +72,9 @@ static OUTWRITE(p, b, n)
n -= i; n -= i;
b += i; b += i;
ptr->currpos += i; ptr->currpos += i;
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
if (ptr < &__parts[PARTEMIT+SECTCNT]) { if (ptr < &__parts[PARTEMIT+SECTCNT]) {
offset[sectionnr] = ptr->currpos; offset[sectionnr] = ptr->currpos;
} }
@ -94,6 +98,9 @@ static OUTWRITE(p, b, n)
b += m; b += m;
n &= WBUFSIZ - 1; n &= WBUFSIZ - 1;
ptr->currpos += m; ptr->currpos += m;
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
if (ptr < &__parts[PARTEMIT+SECTCNT]) { if (ptr < &__parts[PARTEMIT+SECTCNT]) {
offset[sectionnr] = ptr->currpos; offset[sectionnr] = ptr->currpos;
} }
@ -109,9 +116,6 @@ static OUTWRITE(p, b, n)
} }
ptr->pnow = pn; ptr->pnow = pn;
} }
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
} }
} }
@ -267,13 +271,16 @@ wr_outsect(s)
currpos = lseek(ptr->fd, ptr->currpos, 0); currpos = lseek(ptr->fd, ptr->currpos, 0);
#endif #endif
wr_bytes(ptr->fd, ptr->pbegin, (long)(ptr->pnow - ptr->pbegin)); wr_bytes(ptr->fd, ptr->pbegin, (long)(ptr->pnow - ptr->pbegin));
#ifdef OUTSEEK
currpos += ptr->pnow - ptr->pbegin;
#endif
ptr->currpos += ptr->pnow - ptr->pbegin; ptr->currpos += ptr->pnow - ptr->pbegin;
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
offset[sectionnr] = ptr->currpos; offset[sectionnr] = ptr->currpos;
if (offset[s] != ptr->currpos) { if (offset[s] != ptr->currpos) {
ptr->currpos = lseek(ptr->fd, offset[s], 0); ptr->currpos = lseek(ptr->fd, offset[s], 0);
#ifdef OUTSEEK
currpos = ptr->currpos;
#endif
} }
ptr->cnt = WBUFSIZ - ((int)offset[s] & (WBUFSIZ-1)); ptr->cnt = WBUFSIZ - ((int)offset[s] & (WBUFSIZ-1));
ptr->pbegin = ptr->pbuf + (WBUFSIZ - ptr->cnt); ptr->pbegin = ptr->pbuf + (WBUFSIZ - ptr->cnt);