From 24fcf8248fad6fd5dead83db8b8c155517a463f0 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 22 Jul 2000 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2000-07-22 --- boot/key.c | 6 +++--- pc/devusb.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/key.c b/boot/key.c index 7846812efb47bd212fe5e0a81842470d3309a54c..f78db141a1fea56cee934b03b0e1e1e6c5990154 100644 --- a/boot/key.c +++ b/boot/key.c @@ -85,17 +85,17 @@ key(int islocal, Method *mp) /* set host's key */ if(writefile("#c/key", safe->machkey, DESKEYLEN) < 0) - fatal("#c/key"); + warning("#c/key"); /* set host's owner (and uid of current process) */ if(writefile("#c/hostowner", safe->authid, strlen(safe->authid)) < 0) - fatal("#c/hostowner"); + warning("#c/hostowner"); /* set host's domain */ if(*safe->authdom == 0) strcpy(safe->authdom, "plan9"); if(writefile("#c/hostdomain", safe->authdom, strlen(safe->authdom)) < 0) - fatal("#c/hostdomain"); + warning("#c/hostdomain"); } typedef struct Dosboot Dosboot; diff --git a/pc/devusb.c b/pc/devusb.c index f9b90af224c30719bfcd7349881798e728ce589f..ecb3bf03d6fc33e20c66f590131032fda65f4aef 100644 --- a/pc/devusb.c +++ b/pc/devusb.c @@ -1689,10 +1689,10 @@ usbread(Chan *c, void *a, long n, vlong offset) free(s); nexterror(); } - l = snprint(s, READSTR, "%s %d %d %d\n", devstates[d->state], d->class, d->subclass, d->proto); + l = snprint(s, READSTR, "%s %d.%d.%d\n", devstates[d->state], d->class, d->subclass, d->proto); for(i=0; iep); i++) if((e = d->ep[i]) != nil) /* TO DO: freeze e */ - l += snprint(s+l, READSTR-l, "%2d class 0x%2.2ux subclass 0x%2.2ux proto 0x%2.2ux bytes %10lud blocks %10lud\n", i, e->class, e->subclass, e->proto, e->nbytes, e->nblocks); + l += snprint(s+l, READSTR-l, "%2d %ud.%ud.%ud bytes %10lud blocks %10lud\n", i, e->class, e->subclass, e->proto, e->nbytes, e->nblocks); n = readstr(offset, a, n, s); poperror(); free(s);