diff options
| author | rsc <devnull@localhost> | 2003-09-30 19:05:50 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2003-09-30 19:05:50 +0000 |
| commit | 522b0689c340d26feeac360640bf7e2e0582353c (patch) | |
| tree | ba3a550c28684be3b3997899528a110c4e9cd91a /src/cmd/sam/xec.c | |
| parent | 2df2758496b2ab508d349208449f04d85ae2eb2c (diff) | |
| download | plan9port-522b0689c340d26feeac360640bf7e2e0582353c.tar.gz plan9port-522b0689c340d26feeac360640bf7e2e0582353c.zip | |
Reorg
Diffstat (limited to 'src/cmd/sam/xec.c')
| -rw-r--r-- | src/cmd/sam/xec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/sam/xec.c b/src/cmd/sam/xec.c index 42acab0e..b4c68bdb 100644 --- a/src/cmd/sam/xec.c +++ b/src/cmd/sam/xec.c @@ -231,7 +231,7 @@ s_cmd(File *f, Cmd *cp) j = c-'0'; if(sel.p[j].p2-sel.p[j].p1>BLOCKSIZE) error(Elongtag); - bufread(f, sel.p[j].p1, genbuf, sel.p[j].p2-sel.p[j].p1); + bufread(&f->b, sel.p[j].p1, genbuf, sel.p[j].p2-sel.p[j].p1); Strinsert(&genstr, tmprstr(genbuf, (sel.p[j].p2-sel.p[j].p1)), genstr.n); }else Straddc(&genstr, c); @@ -240,7 +240,7 @@ s_cmd(File *f, Cmd *cp) else{ if(sel.p[0].p2-sel.p[0].p1>BLOCKSIZE) error(Elongrhs); - bufread(f, sel.p[0].p1, genbuf, sel.p[0].p2-sel.p[0].p1); + bufread(&f->b, sel.p[0].p1, genbuf, sel.p[0].p2-sel.p[0].p1); Strinsert(&genstr, tmprstr(genbuf, (int)(sel.p[0].p2-sel.p[0].p1)), genstr.n); @@ -390,15 +390,15 @@ display(File *f) p1 = addr.r.p1; p2 = addr.r.p2; - if(p2 > f->_.nc){ - fprint(2, "bad display addr p1=%ld p2=%ld f->_.nc=%d\n", p1, p2, f->_.nc); /*ZZZ should never happen, can remove */ - p2 = f->_.nc; + if(p2 > f->b.nc){ + fprint(2, "bad display addr p1=%ld p2=%ld f->b.nc=%d\n", p1, p2, f->b.nc); /*ZZZ should never happen, can remove */ + p2 = f->b.nc; } while(p1 < p2){ np = p2-p1; if(np>BLOCKSIZE-1) np = BLOCKSIZE-1; - bufread(f, p1, genbuf, np); + bufread(&f->b, p1, genbuf, np); genbuf[np] = 0; c = Strtoc(tmprstr(genbuf, np+1)); if(downloaded) |