diff options
Diffstat (limited to 'hw/xfree86/utils/xorgcfg/startx.c')
| -rw-r--r-- | hw/xfree86/utils/xorgcfg/startx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 038f21d38..9b70b70fd 100644 --- a/hw/xfree86/utils/xorgcfg/startx.c +++ b/hw/xfree86/utils/xorgcfg/startx.c @@ -64,10 +64,10 @@ startx(void) */ if (XFree86_path) c_pos = XmuSnprintf(commandline, sizeof(commandline), - "%s/XFree86 :8 -configure ",XFree86_path); + "%s/"__XSERVERNAME__" :8 -configure ",XFree86_path); else c_pos = XmuSnprintf(commandline, sizeof(commandline), - "%s/bin/XFree86 :8 -configure ", XFree86Dir); + "%s/bin/"__XSERVERNAME__" :8 -configure ", XFree86Dir); if (XF86Module_path && ((len = sizeof(commandline) - c_pos) > 0)) c_pos += XmuSnprintf(commandline + c_pos,len, " -modulepath %s",XF86Module_path); @@ -87,9 +87,9 @@ startx(void) home = "/"; #ifndef QNX4 - XmuSnprintf(filename, sizeof(filename), "%s/XF86Config.new", home); + XmuSnprintf(filename, sizeof(filename), "%s/"__XCONFIGFILE__".new", home); #else - XmuSnprintf(filename, sizeof(filename), "//%d%s/XF86Config.new", + XmuSnprintf(filename, sizeof(filename), "//%d%s/"__XCONFIGFILE__".new", getnid(), home); #endif @@ -106,9 +106,9 @@ startx(void) char path[PATH_MAX]; /* Don't change to X! see above */ if (XFree86_path) - XmuSnprintf(path, sizeof(path), "%s/XFree86", XFree86_path); + XmuSnprintf(path, sizeof(path), "%s/"__XSERVERNAME__, XFree86_path); else - XmuSnprintf(path, sizeof(path), "%s/bin/XFree86", XFree86Dir); + XmuSnprintf(path, sizeof(path), "%s/bin/"__XSERVERNAME__, XFree86Dir); execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail", "-xf86config", XF86Config_path, (void *)NULL); exit(-127); |