diff options
author | Russ Cox <rsc@swtch.com> | 2009-07-14 22:55:52 -0700 |
---|---|---|
committer | Russ Cox <rsc@swtch.com> | 2009-07-14 22:55:52 -0700 |
commit | e6c837d612cc884aa4fe68335c121c3dadddeebc (patch) | |
tree | 31c741d29c74726558268d17d8df1c3a3848646b /src/libdraw | |
parent | 76f90e51459082e3dd93f80e310635c6d37044e2 (diff) | |
parent | 76f90e51459082e3dd93f80e310635c6d37044e2 (diff) | |
download | plan9port-e6c837d612cc884aa4fe68335c121c3dadddeebc.tar.gz plan9port-e6c837d612cc884aa4fe68335c121c3dadddeebc.tar.bz2 plan9port-e6c837d612cc884aa4fe68335c121c3dadddeebc.zip |
merge
Diffstat (limited to 'src/libdraw')
-rw-r--r-- | src/libdraw/drawclient.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libdraw/drawclient.c b/src/libdraw/drawclient.c index 361cb0ac..f6cc5861 100644 --- a/src/libdraw/drawclient.c +++ b/src/libdraw/drawclient.c @@ -34,6 +34,7 @@ _displayconnect(Display *d) return -1; } if(pid == 0){ + char *devdraw; close(p[0]); dup(p[1], 0); dup(p[1], 1); @@ -54,9 +55,12 @@ _displayconnect(Display *d) * instead. */ putenv("NOLIBTHREADDAEMONIZE", "1"); + devdraw = getenv("DEVDRAW"); + if(devdraw == nil) + devdraw = "devdraw"; if(argv0 == nil) - argv0 = "devdraw"; - execl("devdraw", argv0, argv0, "(devdraw)", nil); + argv0 = devdraw; + execl(devdraw, argv0, argv0, "(devdraw)", nil); sysfatal("exec devdraw: %r"); } close(p[1]); |