aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser.c
diff options
context:
space:
mode:
Diffstat (limited to 'parser.c')
-rw-r--r--parser.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/parser.c b/parser.c
index 83e88533..bec35383 100644
--- a/parser.c
+++ b/parser.c
@@ -1401,18 +1401,17 @@ static void parse_job_argument_list( process_t *p,
if( !skip )
{
- if( proc_is_count &&
- (al_get_count( args) == 1) &&
- ( parser_is_help( tok_last(tok), 0) ) )
+ if( ( proc_is_count ) &&
+ ( al_get_count( args) == 1) &&
+ ( parser_is_help( tok_last(tok), 0) ) &&
+ ( p->type == INTERNAL_BUILTIN ) )
{
/*
Display help for count
*/
- p->type = INTERNAL_BUILTIN;
- p->actual_cmd = L"count";
+ p->count_help_magic = 1;
}
-
switch( expand_string( j, wcsdup(tok_last( tok )), args, 0 ) )
{
case EXPAND_ERROR:
@@ -1421,9 +1420,9 @@ static void parse_job_argument_list( process_t *p,
if( error_code == 0 )
{
error( SYNTAX_ERROR,
- tok_get_pos( tok ),
- _(L"Could not expand string '%ls'"),
- tok_last(tok) );
+ tok_get_pos( tok ),
+ _(L"Could not expand string '%ls'"),
+ tok_last(tok) );
}
break;