From 25537c3d3b9b68af91573dec39d1f46c3d97f735 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Fri, 10 Dec 2021 09:16:08 -0800 Subject: Checkin: small sprawling updates Small touches to multiple locations in base. Nothing major --- src/cmd/core/basename.c | 1 + src/cmd/core/cat.c | 5 +++-- src/cmd/core/date.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/cmd') diff --git a/src/cmd/core/basename.c b/src/cmd/core/basename.c index 6b84812..0015f5c 100644 --- a/src/cmd/core/basename.c +++ b/src/cmd/core/basename.c @@ -32,5 +32,6 @@ main(int argc, char *argv[]) p[n] = 0; } sys·write(1,p,str·len(p),&x); + sys·write(1,"\n",1, &x); return 0; } diff --git a/src/cmd/core/cat.c b/src/cmd/core/cat.c index aeed1be..92b082d 100644 --- a/src/cmd/core/cat.c +++ b/src/cmd/core/cat.c @@ -11,15 +11,16 @@ usage(void) static void cat(int fd, char *s) { + int err; intptr nr, nw; char buf[8192]; - while(!(sys·read(fd, buf, sizeof(buf), &nr))){ + while(!(err=sys·read(fd, buf, sizeof(buf), &nr)) && nr>0){ if(sys·write(1, buf, nr, &nw) || nr != nw) fmt·panic("write error copying %s: %r", s); } - if(nr<0) + if(err) fmt·panic("error reading %s: %r", s); } diff --git a/src/cmd/core/date.c b/src/cmd/core/date.c index 225333f..09ec39a 100644 --- a/src/cmd/core/date.c +++ b/src/cmd/core/date.c @@ -1,6 +1,5 @@ #include #include -#include static void usage(void) -- cgit v1.2.1