SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed xkbcomp command line, for real this time

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-02-25 16:58:28 +02:00
parent e325dcdb0f
commit 8bd1d46ac6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xkb/ddxLoad.c
View File

@@ -143,18 +143,18 @@ RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
}
if (asprintf(&buf,
"cat %s | \"%s%sxkbcomp\" -I%s/usr/share/X11/xkb -w %d %s -xkm \"%s\" "
"\"%s%sxkbcomp\" -I%s/usr/share/X11/xkb -w %d %s -xkm \"%s/%s\" "
"-em1 %s -emp %s -eml %s \"%s%s.xkm\" 2>%s/popen-stderr.txt",
xkmfile,
xkbbindir, xkbbindirsep,
(getenv("SECURE_STORAGE_DIR") ? getenv("SECURE_STORAGE_DIR") : ""),
getenv("SECURE_STORAGE_DIR"),
((xkbDebugFlags < 2) ? 1 :
((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)),
xkbbasedirflag ? xkbbasedirflag : "",
getenv("SECURE_STORAGE_DIR"),
xkmfile,
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
xkm_output_dir, keymap,
getenv("SECURE_STORAGE_DIR") ? getenv("SECURE_STORAGE_DIR") : ".") == -1)
getenv("SECURE_STORAGE_DIR")) == -1)
buf = NULL;
free(xkbbasedirflag);