diff options
Diffstat (limited to 'emu/port')
| -rw-r--r-- | emu/port/devdraw.c | 8 | ||||
| -rw-r--r-- | emu/port/main.c | 8 | ||||
| -rw-r--r-- | emu/port/win-x11-old.c | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/emu/port/devdraw.c b/emu/port/devdraw.c index d267f275..bc6d6352 100644 --- a/emu/port/devdraw.c +++ b/emu/port/devdraw.c @@ -1990,14 +1990,6 @@ drawqunlock(void) } void -drawxflush(Rectangle r) /* used by X11 only */ -{ - qlock(&sdraw.q); - flushmemscreen(r); - qunlock(&sdraw.q); -} - -void interf(void) { /* force it to load */ diff --git a/emu/port/main.c b/emu/port/main.c index 64f87f4e..f4cb9490 100644 --- a/emu/port/main.c +++ b/emu/port/main.c @@ -162,7 +162,7 @@ option(int argc, char *argv[], void (*badusage)(void)) tkfont = EARGF(badusage()); break; case 'r': /* Set inferno root */ - strncpy(rootdir, EARGF(badusage()), sizeof(rootdir)-1); + strecpy(rootdir, rootdir+sizeof(rootdir), EARGF(badusage())); break; case '7': /* use 7 bit colormap in X */ xtblbit = 1; @@ -230,11 +230,15 @@ putenvqv(char *name, char **v, int n, int conf) void main(int argc, char *argv[]) { - char *opt; + char *opt, *p; char *enva[20]; int envc; + quotefmtinstall(); savestartup(argc, argv); + /* set default root now, so either $EMU or -r can override it later */ + if((p = getenv("INFERNO")) != nil || (p = getenv("ROOT")) != nil) + strecpy(rootdir, rootdir+sizeof(rootdir), p); opt = getenv("EMU"); if(opt != nil && *opt != '\0') { enva[0] = "emu"; diff --git a/emu/port/win-x11-old.c b/emu/port/win-x11-old.c index aebcf199..e06d455c 100644 --- a/emu/port/win-x11-old.c +++ b/emu/port/win-x11-old.c @@ -633,7 +633,9 @@ xexpose(XEvent *e) r.min.y = xe->y; r.max.x = xe->x + xe->width; r.max.y = xe->y + xe->height; - drawxflush(r); + drawqlock(); + flushmemscreen(r); + drawqunlock(); } |