[PATCH 1/1] hush: return exit code a real instead of 0/1 only

[PATCH 1/1] hush: return exit code a real instead of 0/1 only

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/hush.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hush.c b/common/hush.c
index 602f8f1..3e89a11 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1639,7 +1639,7 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
 		b_free(&temp);
 	} while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP));   /* loop on syntax errors, return on EOF */
 
-	return (code != 0) ? 1 : 0;
+	return code;
 }
 
 static int parse_string_outer(struct p_context *ctx, const char *s, int flag)
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/1] hush: return exit code a real instead of 0/1 only

[Sascha Hauer]

On Fri, Feb 15, 2013 at 07:25:05PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  common/hush.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/hush.c b/common/hush.c
> index 602f8f1..3e89a11 100644
> --- a/common/hush.c
> +++ b/common/hush.c
> @@ -1639,7 +1639,7 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
>  		b_free(&temp);
>  	} while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP));   /* loop on syntax errors, return on EOF */
>  
> -	return (code != 0) ? 1 : 0;
> +	return code;

This breaks the exit command.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/1] hush: return exit code a real instead of 0/1 only

[Jean-Christophe PLAGNIOL-VILLARD]

On 19:36 Fri 15 Feb     , Sascha Hauer wrote:
> On Fri, Feb 15, 2013 at 07:25:05PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> >  common/hush.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/common/hush.c b/common/hush.c
> > index 602f8f1..3e89a11 100644
> > --- a/common/hush.c
> > +++ b/common/hush.c
> > @@ -1639,7 +1639,7 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
> >  		b_free(&temp);
> >  	} while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP));   /* loop on syntax errors, return on EOF */
> >  
> > -	return (code != 0) ? 1 : 0;
> > +	return code;
> 
> This breaks the exit command.
so how can we get the correct exit code of a shell any idea?

Best Regards,
J.
> 
> Sascha
> 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/1] hush: return exit code a real instead of 0/1 only

[Sascha Hauer]

On Fri, Feb 15, 2013 at 08:06:10PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 19:36 Fri 15 Feb     , Sascha Hauer wrote:
> > On Fri, Feb 15, 2013 at 07:25:05PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > >  common/hush.c |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/common/hush.c b/common/hush.c
> > > index 602f8f1..3e89a11 100644
> > > --- a/common/hush.c
> > > +++ b/common/hush.c
> > > @@ -1639,7 +1639,7 @@ static int parse_stream_outer(struct p_context *ctx, struct in_str *inp, int fla
> > >  		b_free(&temp);
> > >  	} while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP));   /* loop on syntax errors, return on EOF */
> > >  
> > > -	return (code != 0) ? 1 : 0;
> > > +	return code;
> > 
> > This breaks the exit command.
> so how can we get the correct exit code of a shell any idea?

Maybe it could be stored in struct p_context.

But beware, changes to this code have many non obvious side effects.
They require a good amount of testing. So if you send another patch in
five minutes I won't look at it.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox