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

awk: bring back ENVIRON[] support

Browse source
This commit is contained in:
cinap_lenrek 2016-05-02 00:34:23 +02:00
parent 79fbfbff48
commit 42a7fcabb0
2 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/awk/proto.h
View file

@ -77,7 +77,7 @@ extern Node *itonp(int);
extern void syminit(void); extern void syminit(void);
extern void arginit(int, char **); extern void arginit(int, char **);
extern void envinit(char **); extern void envinit(void);
extern Array *makesymtab(int); extern Array *makesymtab(int);
extern void freesymtab(Cell *); extern void freesymtab(Cell *);
extern void freeelem(Cell *, char *); extern void freeelem(Cell *, char *);

43
sys/src/cmd/awk/tran.c
View file

@ -113,24 +113,35 @@ void arginit(int ac, char **av) /* set up ARGV and ARGC */
} }
} }
void envinit(char **envp) /* set up ENVIRON variable */ void envinit(void) /* set up ENVIRON variable */
{ {
Cell *cp; int fd, i, n;
char *p; char *k, *v;
Dir *buf;
cp = setsymtab("ENVIRON", "", 0.0, ARR, symtab);
ENVtab = makesymtab(NSYMTAB); ENVtab = makesymtab(NSYMTAB);
cp->sval = (char *) ENVtab; if ((fd = open("/env", OREAD)) < 0)
for ( ; *envp; envp++) { return;
if ((p = strchr(*envp, '=')) == nil)
buf = nil;
while((n = dirread(fd, &buf)) > 0) {
for (i = 0; i < n; i++) {
k = buf[i].name;
if(strncmp(k, "fn#", 3) == 0)
continue; continue;
*p++ = 0; /* split into two strings at = */ if ((v = getenv(k)) == nil)
if (is_number(p)) continue;
setsymtab(*envp, p, atof(p), STR|NUM, ENVtab); if (is_number(v))
setsymtab(k, v, atof(v), STR|NUM, ENVtab);
else else
setsymtab(*envp, p, 0.0, STR, ENVtab); setsymtab(k, v, 0.0, STR, ENVtab);
p[-1] = '='; /* restore in case env is passed down to a shell */ free(v);
} }
free(buf);
buf = nil;
}
close(fd);
} }
Array *makesymtab(int n) /* make a new symbol table */ Array *makesymtab(int n) /* make a new symbol table */
@ -210,9 +221,15 @@ Cell *setsymtab(char *n, char *s, Awkfloat f, unsigned t, Array *tp)
if (p == nil) if (p == nil)
FATAL("out of space for symbol table at %s", n); FATAL("out of space for symbol table at %s", n);
p->nval = tostring(n); p->nval = tostring(n);
p->sval = s ? tostring(s) : tostring("");
p->fval = f; p->fval = f;
if(tp == symtab && strcmp(n, "ENVIRON") == 0 && !safe) {
envinit();
p->sval = (char *) ENVtab;
p->tval = ARR;
} else {
p->sval = s ? tostring(s) : tostring("");
p->tval = t; p->tval = t;
}
p->csub = CUNK; p->csub = CUNK;
p->ctype = OCELL; p->ctype = OCELL;
tp->nelemt++; tp->nelemt++;