libdraw: make newwindow() unmount the old window
newwindow() used to mount the new window directly on /dev, resulting in the old window and the new one being mounted over each other. we now try to unmount the old window from /dev first, mount new window to /mnt/wsys (replacing the old) and then bind /mnt/wsys before /dev. if theres no /mnt/wsys, just mount window directly before /dev.
This commit is contained in:
parent
40cf5957e0
commit
0be917ff4d
1 changed files with 8 additions and 3 deletions
|
@ -14,14 +14,19 @@ newwindow(char *str)
|
|||
if(wsys == nil)
|
||||
return -1;
|
||||
fd = open(wsys, ORDWR);
|
||||
free(wsys);
|
||||
if(fd < 0)
|
||||
if(fd < 0){
|
||||
free(wsys);
|
||||
return -1;
|
||||
}
|
||||
rfork(RFNAMEG);
|
||||
unmount(wsys, "/dev"); /* drop reference to old window */
|
||||
free(wsys);
|
||||
if(str)
|
||||
snprint(buf, sizeof buf, "new %s", str);
|
||||
else
|
||||
strcpy(buf, "new");
|
||||
return mount(fd, -1, "/dev", MBEFORE, buf);
|
||||
if(mount(fd, -1, "/mnt/wsys", MREPL, buf) < 0)
|
||||
return mount(fd, -1, "/dev", MBEFORE, buf);
|
||||
return bind("/mnt/wsys", "/dev", MBEFORE);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue