From 7e31ac8efc369ce6cd69e44f188441c45bb11a77 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sun, 17 Jun 2001 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2001-06-17 --- bitsy/devpcmcia.c | 1 + bitsy/devsac.c | 2 +- port/cis.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bitsy/devpcmcia.c b/bitsy/devpcmcia.c index 6870934e8ce568c4225ac5acc70f3ad30d6a84d3..2656bd1074d6cff27cf99f67d24a7c70a5d99835 100644 --- a/bitsy/devpcmcia.c +++ b/bitsy/devpcmcia.c @@ -329,6 +329,7 @@ pcmctlwrite(char *p, long n, ulong, PCMslot *sp) } /* configure device */ + cf.type = nil; kstrdup(&cf.type, cmd->f[2]); cf.mem = (ulong)sp->mem; cf.port = (ulong)sp->regs; diff --git a/bitsy/devsac.c b/bitsy/devsac.c index 102c853fd5ca06eb57794a63bed602bfea07007b..e6bb8a9d05fe3835c2832d8317da98779445e0ea 100644 --- a/bitsy/devsac.c +++ b/bitsy/devsac.c @@ -231,7 +231,7 @@ sacwalk(Chan *c, Chan *nc, char **name, int nname) if(sac == nil) { if(j == 0) error(Enonexist); - strncpy(up->error, Enonexist, NAMELEN); + strncpy(up->error, Enonexist, ERRMAX); break; } pathtoqid(getl(sac->qid), &nc->qid); diff --git a/port/cis.c b/port/cis.c index 0cf824c44d2c4751c19b38b8dd8c7d977d0f46fd..a3113f4fd2d6842e928b451bf4ca8033e8144b76 100644 --- a/port/cis.c +++ b/port/cis.c @@ -304,7 +304,7 @@ iospaces(Cisdat *cis, PCMconftab *ct) nio = (c&0xf)+1; for(i = 0; i < nio; i++){ ct->io[i].start = getlong(cis, (c>>4)&0x3); - ct->io[0].len = getlong(cis, (c>>6)&0x3); + ct->io[i].len = getlong(cis, (c>>6)&0x3); } ct->nio = nio; }