xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sam: add $%dot (thanks kvik)

Browse source
This commit is contained in:
Sigrid 2020-03-09 13:21:50 +01:00
parent 50791b8755
commit 27f36483d4
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/sam/sam.h
View file

@ -400,3 +400,5 @@ void outTsl(Hmesg, int, long);
void outTsv(Hmesg, int, vlong); void outTsv(Hmesg, int, vlong);
void outflush(void); void outflush(void);
int needoutflush(void); int needoutflush(void);
Posn nlcount(File *f, Posn p0, Posn p1);

32
sys/src/cmd/sam/shell.c
View file

@ -10,6 +10,36 @@ void checkerrs(void);
Buffer cmdbuf; Buffer cmdbuf;
int cmdbufpos; int cmdbufpos;
static void
updateenv(File *f)
{
static int fd = -1;
int n;
char buf[64], *p, *e;
if(f == nil){
putenv("%", "");
putenv("%dot", "");
return;
}
p = Strtoc(&f->name);
putenv("%", p);
free(p);
p = buf;
e = buf+sizeof(buf);
p = seprint(p, e, "%lud", 1+nlcount(f, 0, f->dot.r.p1));
p = seprint(p+1, e, "%lud", f->dot.r.p1);
p = seprint(p+1, e, "%lud", f->dot.r.p2);
n = p - buf;
if(fd == -1)
if((fd = create("/env/%dot", OWRITE, 0666)) < 0)
fprint(2, "updateenv create: %r\n");
if(write(fd, buf, n) != n)
fprint(2, "updateenv write: %r\n");
}
int int
plan9(File *f, int type, String *s, int nest) plan9(File *f, int type, String *s, int nest)
{ {
@ -93,7 +123,7 @@ plan9(File *f, int type, String *s, int nest)
close(0); /* so it won't read from terminal */ close(0); /* so it won't read from terminal */
open("/dev/null", 0); open("/dev/null", 0);
} }
putenv("%", f == nil ? "" : Strtoc(&f->name)); updateenv(f);
execl(SHPATH, SH, "-c", Strtoc(&plan9cmd), nil); execl(SHPATH, SH, "-c", Strtoc(&plan9cmd), nil);
exits("exec"); exits("exec");
} }