diff options
| author | fergus.henderson@gmail.com <fergus.henderson@gmail.com@01de4be4-8c4a-0410-9132-4925637da917> | 2012-04-09 22:20:35 +0000 |
|---|---|---|
| committer | fergus.henderson@gmail.com <fergus.henderson@gmail.com@01de4be4-8c4a-0410-9132-4925637da917> | 2012-04-09 22:20:35 +0000 |
| commit | b01ee33071f0ec0d1bc3fbfc71d8d46feac3df02 (patch) | |
| tree | 01a3212c4be57b5a03beb84db7d20f20ca00b972 /include_server | |
| parent | 72166724241f7f71d1e16e911bd2e5facebe3019 (diff) | |
| download | distcc-b01ee33071f0ec0d1bc3fbfc71d8d46feac3df02.tar.gz | |
Fix issue 104 <http://code.google.com/p/distcc/issues/detail?id=104>:
handle header file names containing commas.
git-svn-id: http://distcc.googlecode.com/svn/trunk@764 01de4be4-8c4a-0410-9132-4925637da917
Diffstat (limited to 'include_server')
| -rwxr-xr-x | include_server/parse_file.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include_server/parse_file.py b/include_server/parse_file.py index bc6374e..ac9720f 100755 --- a/include_server/parse_file.py +++ b/include_server/parse_file.py @@ -92,8 +92,8 @@ DIRECTIVE_RE = re.compile(r""" ( ((?P<include> include_next | include | import) \s* - ( "(?P<quote> (\w|[_/.+-])*)" | # "bar/foo.h" - <(?P<angle> (\w|[_/.+-])*)> | # <stdio.h> + ( "(?P<quote> (\w|[_/.,+-])*)" | # "bar/foo.h" + <(?P<angle> (\w|[_/.,+-])*)> | # <stdio.h> (?P<expr> .*?)) # expr, match . minimally ) | @@ -111,8 +111,8 @@ DIRECTIVE_RE = re.compile(r""" INCLUDE_STRING_RE = re.compile(r""" ^ \s* - ( "\s*(?P<quote> (\w|[\\_/.+-])*)\s*" | - <\s*(?P<angle> (\w|[\\_/.+-])*)\s*> + ( "\s*(?P<quote> (\w|[\\_/.,+-])*)\s*" | + <\s*(?P<angle> (\w|[\\_/.,+-])*)\s*> ) \s* $ |