Merge branch '2.4.2' into lexer2

This commit is contained in:
Paul Beckingham 2015-02-22 14:46:30 -05:00
commit e1c0d5b130
3 changed files with 7 additions and 4 deletions

View file

@ -8,6 +8,8 @@
(thanks to Renato Alves). (thanks to Renato Alves).
- Eliminated some code that is not UTF8-safe. - Eliminated some code that is not UTF8-safe.
- Removed pthreads linkage. - Removed pthreads linkage.
- Closed dangling pipes in execute (), resolving problems when a hook script
forks (thanks to Jens Erat).
------ current release --------------------------- ------ current release ---------------------------

View file

@ -770,7 +770,8 @@ bool Lexer2::isPath (std::string& token, Lexer2::Type& type)
else else
break; break;
if (! isWhitespace (_text[marker]) && if (_text[marker] &&
! isWhitespace (_text[marker]) &&
_text[marker] != '/') _text[marker] != '/')
{ {
utf8_next_char (_text, marker); utf8_next_char (_text, marker);