diff options
| -rw-r--r-- | sys/src/cmd/cpp/include.c | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/sys/src/cmd/cpp/include.c b/sys/src/cmd/cpp/include.c index 399fe8c97..c7511d9c8 100644 --- a/sys/src/cmd/cpp/include.c +++ b/sys/src/cmd/cpp/include.c @@ -47,27 +47,39 @@ doinclude(Tokenrow *trp) if (fname[0]=='/') { fd = open(fname, 0); strcpy(iname, fname); - } else for (fd=-1,i=NINCLUDE-1; i>=0; i--) { - ip = &includelist[i]; - if (ip->file==NULL || ip->deleted || (angled && ip->always==0)) - continue; - if (strlen(fname)+strlen(ip->file)+2 > sizeof(iname)) - continue; - strcpy(iname, ip->file); - strcat(iname, "/"); - strcat(iname, fname); - if ((fd = open(iname, 0)) >= 0) - break; - } - if(fd < 0) { - strcpy(iname, cursource->filename); - p = strrchr(iname, '/'); - if(p != NULL) { - *p = '\0'; + } 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]; + if (ip->file==NULL || ip->deleted || (angled && ip->always==0)) + continue; + if (strlen(fname)+strlen(ip->file)+2 > sizeof(iname)) + continue; + strcpy(iname, ip->file); strcat(iname, "/"); strcat(iname, fname); fd = open(iname, 0); } + if (fd<0 && angled) { + strcpy(iname, cursource->filename); + p = strrchr(iname, '/'); + if(p != NULL) { + *p = '\0'; + strcat(iname, "/"); + strcat(iname, fname); + fd = open(iname, 0); + } + } } if ( Mflag>1 || !angled&&Mflag==1 ) { write(1,objname,strlen(objname)); |