diff options
| author | Sergio Luis O. B. Correia <sergio@larces.uece.br> | 2009-11-17 09:02:47 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-11-17 09:02:47 -0800 |
| commit | bae4f5085ea1e6db89c7df8e2075eab44d9c512e (patch) | |
| tree | 14d826454bd471125ef2daa1f7e6eeed5abfa85a | |
| parent | 27c3147676ae373cc8b9fc0ba982163fcc4d7f48 (diff) | |
| download | go-bae4f5085ea1e6db89c7df8e2075eab44d9c512e.tar.gz go-bae4f5085ea1e6db89c7df8e2075eab44d9c512e.zip | |
cmd/cc: Fix -I switch to handle a path with blankspaces correctly
Currently, -I switch can't deal with a path containing spaces.
This commit simplify setinclude(), by removing the special case
of a string that had spaces. After this change, setinclude() will
merely add the given directories to the include path, if it does
not yet exist, and this approach works.
Will be needed for solving issue 115.
R=agl1, rsc, iant2, r
https://golang.org/cl/155059
| -rw-r--r-- | src/cmd/cc/lex.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c index 428ba55ad9..118efd2311 100644 --- a/src/cmd/cc/lex.c +++ b/src/cmd/cc/lex.c @@ -1517,16 +1517,11 @@ void setinclude(char *p) { int i; - char *e; - - while(*p != 0) { - e = strchr(p, ' '); - if(e != 0) - *e = '\0'; + if(*p != 0) { for(i=1; i < ninclude; i++) if(strcmp(p, include[i]) == 0) - break; + return; if(i >= ninclude) include[ninclude++] = p; @@ -1536,9 +1531,6 @@ setinclude(char *p) exits("ninclude"); } - if(e == 0) - break; - p = e+1; } } |