trinity/overgrown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dj(1): make Io_write handle prec and rec

Browse Source
This commit is contained in:
dtb 2024-07-04 19:36:32 -06:00
parent fc0d9e374b
commit f8c0e0570c
Signed by: trinity
GPG Key ID: 34C0543BBB6AF81B
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dj.c
View File

@ -72,30 +72,34 @@ static int write_flags = O_WRONLY | O_CREAT;
static struct Io * static struct Io *
Io_read(struct Io *io){ Io_read(struct Io *io){
assert(io->bs > 0);
io->bytes += (io->bufuse = read(io->fd, io->buf, io->bs)); io->bytes += (io->bufuse = read(io->fd, io->buf, io->bs));
assert(io->bufuse <= io->bs); assert(io->bufuse <= io->bs);
if(io->bufuse != 0){ io->prec += (0 < io->bufuse && io->bufuse < io->bs);
if(io->bufuse < io->bs) io->rec += (io->bufuse == io->bs);
++io->prec;
else /* if(io->bufuse == io->bs) */
++io->rec;
}
return io; return io;
} }
/* Writes io->bufuse units from io->buf to io->fd, permuting any unwritten /* Writes io->bufuse (>0) units from io->buf to io->fd, permuting any unwritten
* bytes to the start of io->buf and updating io->bufuse. If io->bufuse doesn't * bytes to the start of io->buf and updating io->bufuse. If io->bufuse doesn't
* change, errno will probably be set. Returns io. */ * change, errno will probably be set. Returns io. */
static struct Io * static struct Io *
Io_write(struct Io *io){ Io_write(struct Io *io){
int t; int t;
assert(io->bufuse > 0);
assert(io->bufuse <= io->bs);
if((t = write(io->fd, io->buf, io->bufuse)) > 0) if((t = write(io->fd, io->buf, io->bufuse)) > 0)
memmove(io->buf, io->buf + t, (io->bufuse -= t)); memmove(io->buf, io->buf + t, (io->bufuse -= t));
io->bytes += t; io->bytes += t;
io->prec += (t > 0 && io->bufuse > 0);
io->rec += (t > 0 && io->bufuse == 0);
return io; return io;
} }
@ -322,19 +326,17 @@ int main(int argc, char *argv[]){
t = io[1].bufuse; t = io[1].bufuse;
if(Io_write(&io[1])->bufuse == t && !noerror) if(Io_write(&io[1])->bufuse == t && !noerror)
Io_write(&io[1]); /* second chance */ Io_write(&io[1]); /* second chance */
if(t == io[1].bufuse){ /* no more love */ if(io[1].bufuse == t){ /* no more love */
count = 1; count = 1;
break; break;
}else if(t > io[1].bufuse && io[1].bufuse > 0){ }
io[1].prec += 1;
if(0 < io[1].bufuse && io[1].bufuse < t){
fprintf(stderr, "%s: Partial write:\n\t", program_name); fprintf(stderr, "%s: Partial write:\n\t", program_name);
fprintio(stderr, fmt, io); fprintio(stderr, fmt, io);
if(!noerror) if(!noerror)
count = 1; count = 1;
}else if(io[1].bufuse == 0 && t < io[1].bs) }
++io[1].prec;
else
++io[1].rec;
}while(io[0].bufuse > 0); }while(io[0].bufuse > 0);
}while(count == 0 || --count > 0); }while(count == 0 || --count > 0);