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

stop fiddling with path construction.

Browse source 
There's fd2path, which gives back the full path directly.
This makes the code even simpler.
This commit is contained in:
Ori Bernstein 2020-05-13 18:50:01 -07:00
parent d332f8a9b5
commit ed4645979c
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/src/cmd/yacc.c
View file

@ -143,7 +143,7 @@ Biobuf* foutput; /* y.output file */
/* communication variables between various I/O routines */ /* communication variables between various I/O routines */
char* infile; /* input file name */ char* infile; /* input file name */
char* inpath; /* input full path */ char inpath[1024]; /* input full path */
int numbval; /* value of an input number */ int numbval; /* value of an input number */
char tokname[NAMESIZE+UTFmax+1]; /* input token name, slop for runes and 0 */ char tokname[NAMESIZE+UTFmax+1]; /* input token name, slop for runes and 0 */
@ -1185,7 +1185,7 @@ setup(int argc, char *argv[])
long c, t; long c, t;
int i, j, lev, ty, ytab, *p; int i, j, lev, ty, ytab, *p;
int vflag, dflag, stem; int vflag, dflag, stem;
char actnm[8], *stemc, dirbuf[512]; char actnm[8], *stemc;
ytab = 0; ytab = 0;
vflag = 0; vflag = 0;
@ -1231,16 +1231,12 @@ setup(int argc, char *argv[])
if(argc < 1) if(argc < 1)
error("no input file"); error("no input file");
dirbuf[0] = '\0';
infile = argv[0]; infile = argv[0];
if(infile[0] != '/' && getwd(dirbuf, sizeof dirbuf)==nil) finput = Bopen(infile, OREAD);
error("cannot get cwd");
inpath = smprint("%s/%s", dirbuf, infile);
cleanname(inpath);
finput = Bopen(inpath, OREAD);
if(finput == 0) if(finput == 0)
error("cannot open '%s'", argv[0]); error("cannot open '%s'", argv[0]);
if(fd2path(Bfildes(finput), inpath, sizeof(inpath)) == -1)
error("cannot get path for %s", infile);
Blethal(finput, nil); Blethal(finput, nil);
cnamp = cnames; cnamp = cnames;