From 8e5a534df784ab91ffde55ed5038e66e8dbb36c8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 1 Jun 2017 10:08:31 +0200 Subject: sandbox: Fix registering file/fifo consoles barebox_register_console() uses xzalloc which requires the malloc pool to be initialized, so call it during the second option parsing when this is already done. Signed-off-by: Sascha Hauer --- arch/sandbox/os/common.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'arch/sandbox/os') diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 192917ac22..8cf0873130 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -359,24 +359,6 @@ int main(int argc, char *argv[]) exit(1); } break; - case 'O': - fd = open(optarg, O_WRONLY); - if (fd < 0) { - perror("open"); - exit(1); - } - - barebox_register_console(-1, fd); - break; - case 'I': - fd = open(optarg, O_RDWR); - if (fd < 0) { - perror("open"); - exit(1); - } - - barebox_register_console(fd, -1); - break; case 'x': sdl_xres = strtoul(optarg, NULL, 0); break; @@ -384,7 +366,7 @@ int main(int argc, char *argv[]) sdl_yres = strtoul(optarg, NULL, 0); break; default: - exit(1); + break; } } @@ -421,6 +403,24 @@ int main(int argc, char *argv[]) if (ret) exit(1); break; + case 'O': + fd = open(optarg, O_WRONLY); + if (fd < 0) { + perror("open"); + exit(1); + } + + barebox_register_console(-1, fd); + break; + case 'I': + fd = open(optarg, O_RDWR); + if (fd < 0) { + perror("open"); + exit(1); + } + + barebox_register_console(fd, -1); + break; default: break; } -- cgit v1.2.3