summaryrefslogtreecommitdiff
path: root/hw/xquartz/quartzStartup.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-28 15:52:24 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-28 15:55:01 -0700
commitd5ab89f4f1acbe2614036e8934122185ac0f81ee (patch)
tree89da8c01491a1265e8409d6a5731e723bea8fcdf /hw/xquartz/quartzStartup.c
parent0c2312b21b6700c1425baccaf9c26150b4f0fd6a (diff)
XQuartz: Unset CFProcessPath... blech
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
Diffstat (limited to 'hw/xquartz/quartzStartup.c')
-rw-r--r--hw/xquartz/quartzStartup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 7b6a1a6fa..a4472e659 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -98,6 +98,12 @@ int main(int argc, char **argv, char **envp) {
int i;
int fd[2];
+ /* Unset CFProcessPath, so our children don't inherit this kludge we need
+ * to load our nib. If an xterm gets this set, then it fails to
+ * 'open hi.txt' properly.
+ */
+ unsetenv("CFProcessPath");
+
// Make a pipe to pass events
assert( pipe(fd) == 0 );
darwinEventReadFD = fd[0];