From b48327d357e0818d1a6ae2a064cfa7d1567e1242 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Sun, 5 Dec 2021 15:17:44 -0800 Subject: feat(huge): huge refactor (in progress). Commented out libc includes to uncover all explicit dependencies. A large fraction has now been ported over (no testing). I did not port over the command line tools, such as the rc shell. These will be done independently - as of now I just want the library to stand independent. Compilation currently fails due to the lack of math functions. --- src/base/io/flush.c | 2 +- src/base/io/getc.c | 2 +- src/base/io/read.c | 2 +- src/base/io/readuntil.c | 2 +- src/base/io/write.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/base/io') diff --git a/src/base/io/flush.c b/src/base/io/flush.c index ff970b4..7aa0933 100644 --- a/src/base/io/flush.c +++ b/src/base/io/flush.c @@ -10,7 +10,7 @@ io·flush(io·Header *io) if((ni = io->cap + io->olen)) return 0; - sys·write(io->fd, ni, io->b, &no); + sys·write(io->fd, io->b, ni, &no); if(no!=ni){ io->pos += ni; diff --git a/src/base/io/getc.c b/src/base/io/getc.c index 0f0d62e..758f98d 100644 --- a/src/base/io/getc.c +++ b/src/base/io/getc.c @@ -24,7 +24,7 @@ loop: * pre-catenated from the previous read to allow for ungets */ mem·move(io->b-io·BufUngets, io·BufUngets, io->e-io·BufUngets); - if(sys·read(io->fd, io->cap, io->b, &nr)){ + if(sys·read(io->fd, io->b, io->cap, &nr)){ io->state = io·BufNil; return io·BufEof; } diff --git a/src/base/io/read.c b/src/base/io/read.c index a972c3e..b13fde7 100644 --- a/src/base/io/read.c +++ b/src/base/io/read.c @@ -20,7 +20,7 @@ io·read(io·Header *io, intptr len, void *buf) break; /* get more bytes */ - if(sys·read(io->fd, io->cap, io->b, &nr)){ + if(sys·read(io->fd, io->b, io->cap, &nr)){ io->state = io·BufNil; break; } diff --git a/src/base/io/readuntil.c b/src/base/io/readuntil.c index 3fe3925..58e3d1e 100644 --- a/src/base/io/readuntil.c +++ b/src/base/io/readuntil.c @@ -33,7 +33,7 @@ io·readuntil(io·Header *io, int delim) /* write to the buffer while we search for delim */ b = (char *)io->b + i; while(i < io->cap){ - if(sys·read(io->fd, io->cap-i, b, &j) || j == 0){ + if(sys·read(io->fd, b, io->cap-i, &j) || j == 0){ mem·move(io->e-i, i, io->b); io->nread = +i; io->ilen = -i; diff --git a/src/base/io/write.c b/src/base/io/write.c index 554aa88..68f70c5 100644 --- a/src/base/io/write.c +++ b/src/base/io/write.c @@ -17,7 +17,7 @@ io·write(io·Header *io, intptr len, void *buf) if(n == 0){ if(io->state != io·BufWtr) return io·BufEof; - switch(sys·write(io->fd, io->cap, io->b, &nw)){ + switch(sys·write(io->fd, io->b, io->cap, &nw)){ case 0: if(nw != io->cap) goto error; io->pos += nw; -- cgit v1.2.1