Further fixes to newline escaping

Addresses issue described in https://github.com/fish-shell/fish-shell/issues/347#issuecomment-10650443
This commit is contained in:
ridiculousfish 2012-11-23 12:03:36 -08:00
parent 654010f639
commit bf27cb1f5e
3 changed files with 16 additions and 13 deletions

View File

@ -24,6 +24,12 @@ bar"
echo 'foo\
bar'
for i in \
a b c
echo $i
end
# Simple alias tests
function foo

View File

@ -10,6 +10,9 @@ foobar
foobar
foo\
bar
a
b
c
Test 2 pass
Test pass
Test 3 pass

View File

@ -491,12 +491,9 @@ wchar_t tok_last_quote(tokenizer_t *tok)
Test if a character is whitespace. Differs from iswspace in that it
does not consider a newline to be whitespace.
*/
static int my_iswspace(wchar_t c)
static bool my_iswspace(wchar_t c)
{
if (c == L'\n')
return 0;
else
return iswspace(c);
return c != L'\n' && iswspace(c);
}
@ -531,19 +528,16 @@ void tok_next(tokenizer_t *tok)
while (1)
{
if (my_iswspace(*(tok->buff)))
if (tok->buff[0] == L'\\' && tok->buff[1] == L'\n')
{
tok->buff += 2;
}
else if (my_iswspace(tok->buff[0]))
{
tok->buff++;
}
else
{
if ((*(tok->buff) == L'\\') &&(*(tok->buff+1) == L'\n'))
{
tok->last_pos = tok->buff - tok->orig_buff;
tok->buff+=2;
tok->last_type = TOK_END;
return;
}
break;
}
}