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

cpp: search source file directory first for quoted #include (thanks Ori_B)

Browse source 
foo.c includes bar/bar.h, which includes "baz.h"; it wants bar/baz.h
meanwhile, it also includes meh/quux.h, which includes "baz.h"; it wants meh/baz.h
This commit is contained in:
cinap_lenrek 2015-07-13 00:54:56 +02:00
parent a5efa0e252
commit cd9da74cbc
1 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sys/src/cmd/cpp/include.c
View file

@ -47,7 +47,19 @@ doinclude(Tokenrow *trp)
if (fname[0]=='/') { if (fname[0]=='/') {
fd = open(fname, 0); fd = open(fname, 0);
strcpy(iname, fname); strcpy(iname, fname);
} else for (fd=-1,i=NINCLUDE-1; i>=0; i--) { } else {
fd = -1;
if (!angled) {
strcpy(iname, cursource->filename);
p = strrchr(iname, '/');
if (p != NULL) {
*p = '\0';
strcat(iname, "/");
strcat(iname, fname);
fd = open(iname, 0);
}
}
for (i=NINCLUDE-1; fd<0 && i>=0; i--) {
ip = &includelist[i]; ip = &includelist[i];
if (ip->file==NULL || ip->deleted || (angled && ip->always==0)) if (ip->file==NULL || ip->deleted || (angled && ip->always==0))
continue; continue;
@ -56,10 +68,9 @@ doinclude(Tokenrow *trp)
strcpy(iname, ip->file); strcpy(iname, ip->file);
strcat(iname, "/"); strcat(iname, "/");
strcat(iname, fname); strcat(iname, fname);
if ((fd = open(iname, 0)) >= 0) fd = open(iname, 0);
break;
} }
if(fd < 0) { if (fd<0 && angled) {
strcpy(iname, cursource->filename); strcpy(iname, cursource->filename);
p = strrchr(iname, '/'); p = strrchr(iname, '/');
if(p != NULL) { if(p != NULL) {
@ -69,6 +80,7 @@ doinclude(Tokenrow *trp)
fd = open(iname, 0); fd = open(iname, 0);
} }
} }
}
if ( Mflag>1 || !angled&&Mflag==1 ) { if ( Mflag>1 || !angled&&Mflag==1 ) {
write(1,objname,strlen(objname)); write(1,objname,strlen(objname));
write(1,iname,strlen(iname)); write(1,iname,strlen(iname));