From 7ff6ea0f70307d4b82e6df69eb1310a6e27aa4ad Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sat, 2 May 2020 17:05:17 +0200 Subject: libdraw: fix mount() error handling in newwindow() --- sys/src/libdraw/newwindow.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'sys/src/libdraw/newwindow.c') diff --git a/sys/src/libdraw/newwindow.c b/sys/src/libdraw/newwindow.c index 7b385a322..2fb708bef 100644 --- a/sys/src/libdraw/newwindow.c +++ b/sys/src/libdraw/newwindow.c @@ -25,8 +25,15 @@ newwindow(char *str) snprint(buf, sizeof buf, "new %s", str); else strcpy(buf, "new"); - if(mount(fd, -1, "/mnt/wsys", MREPL, buf) < 0) - return mount(fd, -1, "/dev", MBEFORE, buf); - return bind("/mnt/wsys", "/dev", MBEFORE); + if(mount(fd, -1, "/mnt/wsys", MREPL, buf) == -1){ + if(mount(fd, -1, "/dev", MBEFORE, buf) == -1){ + close(fd); + return -1; + } + } else { + if(bind("/mnt/wsys", "/dev", MBEFORE) == -1) + return -1; + } + return 0; } -- cgit v1.2.3