summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-06-01 10:08:31 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-06-01 10:08:33 +0200
commit8e5a534df784ab91ffde55ed5038e66e8dbb36c8 (patch)
tree4aa319f27aa7b3dbe31b77b8e18abb4e1cb59395
parenta8de37dbef75665b6bdd98e9ce54f9fb20484785 (diff)
downloadbarebox-8e5a534df784ab91ffde55ed5038e66e8dbb36c8.tar.gz
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 <s.hauer@pengutronix.de>
-rw-r--r--arch/sandbox/os/common.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 192917a..8cf0873 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;
}