[PATCH 1/2] sandbox: move add_image for env in second getopt

[PATCH 1/2] sandbox: move add_image for env in second getopt

[Alexander Aring]

Function add_image needs a allocated malloc space.
This is only available in the second getopt loop.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 arch/sandbox/os/common.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 0dedfe1..8c7679a 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -311,11 +311,6 @@ int main(int argc, char *argv[])
 		case 'i':
 			break;
 		case 'e':
-			sprintf(str, "env%d", envno);
-			ret = add_image(optarg, str);
-			if (ret)
-				exit(1);
-			envno++;
 			break;
 		case 'O':
 			fd = open(optarg, O_WRONLY);
@@ -376,6 +371,13 @@ int main(int argc, char *argv[])
 				exit(1);
 			fdno++;
 			break;
+		case 'e':
+			sprintf(str, "env%d", envno);
+			ret = add_image(optarg, str);
+			if (ret)
+				exit(1);
+			envno++;
+			break;
 		default:
 			break;
 		}
-- 
1.7.12.2


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

[PATCH 2/2] sandbox: fix malloc argument string

[Alexander Aring]

Fix malloc argument string.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 arch/sandbox/os/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 8c7679a..db347e2 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -403,7 +403,7 @@ static void print_usage(const char *prgname)
 "Usage: %s [OPTIONS]\n"
 "Start barebox.\n\n"
 "Options:\n\n"
-"  -m, "
+"  -m, --malloc=<size>	Start sandbox with a specified malloc-space size in bytes.\n"
 "  -i, --image=<file>   Map an image file to barebox. This option can be given\n"
 "                       multiple times. The files will show up as\n"
 "                       /dev/fd0 ... /dev/fdx under barebox.\n"
-- 
1.7.12.2


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

Re: [PATCH 1/2] sandbox: move add_image for env in second getopt

[Sascha Hauer]

On Fri, Oct 12, 2012 at 07:38:12PM +0200, Alexander Aring wrote:
> Function add_image needs a allocated malloc space.
> This is only available in the second getopt loop.
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>

Applied, thanks

Sascha

> ---
>  arch/sandbox/os/common.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
> index 0dedfe1..8c7679a 100644
> --- a/arch/sandbox/os/common.c
> +++ b/arch/sandbox/os/common.c
> @@ -311,11 +311,6 @@ int main(int argc, char *argv[])
>  		case 'i':
>  			break;
>  		case 'e':
> -			sprintf(str, "env%d", envno);
> -			ret = add_image(optarg, str);
> -			if (ret)
> -				exit(1);
> -			envno++;
>  			break;
>  		case 'O':
>  			fd = open(optarg, O_WRONLY);
> @@ -376,6 +371,13 @@ int main(int argc, char *argv[])
>  				exit(1);
>  			fdno++;
>  			break;
> +		case 'e':
> +			sprintf(str, "env%d", envno);
> +			ret = add_image(optarg, str);
> +			if (ret)
> +				exit(1);
> +			envno++;
> +			break;
>  		default:
>  			break;
>  		}
> -- 
> 1.7.12.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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