ibus: complete setup before publication
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
#include "../ibus.c"
|
||||
#include "../cutest/cutest.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
void testengineinit(int);
|
||||
void testenginehandle(Keyreq*);
|
||||
void* testengineowner(void);
|
||||
@@ -67,6 +69,83 @@ cleanup:
|
||||
CT_CHECK(t, rmdir(root) == 0);
|
||||
}
|
||||
|
||||
void
|
||||
ibus_startup_requires_ownership(struct ct *t)
|
||||
{
|
||||
char root[] = "/tmp/strans-ibus-startup.XXXXXX";
|
||||
char busdir[128], ibusdir[128], path[512], *old, *saved;
|
||||
struct stat st;
|
||||
int i, made, rv;
|
||||
|
||||
made = 0;
|
||||
busdir[0] = '\0';
|
||||
ibusdir[0] = '\0';
|
||||
path[0] = '\0';
|
||||
old = getenv("XDG_CONFIG_HOME");
|
||||
saved = old == nil ? nil : strdup(old);
|
||||
if(old != nil && !CT_CHECK(t, saved != nil))
|
||||
return;
|
||||
if(!CT_CHECK(t, mkdtemp(root) != nil))
|
||||
goto cleanup;
|
||||
made = 1;
|
||||
if(!CT_CHECK(t, snprintf(busdir, sizeof busdir, "%s/ibus/bus", root)
|
||||
< (int)sizeof busdir) ||
|
||||
!CT_CHECK(t, snprintf(ibusdir, sizeof ibusdir, "%s/ibus", root)
|
||||
< (int)sizeof ibusdir) ||
|
||||
!CT_CHECK(t, setenv("XDG_CONFIG_HOME", root, 1) == 0) ||
|
||||
!CT_CHECK(t, buildaddrpath(path, sizeof path) == 0))
|
||||
goto cleanup;
|
||||
|
||||
memset(watches, 0, sizeof watches);
|
||||
for(i = 0; i < nelem(watches); i++)
|
||||
watches[i] = (DBusWatch*)1;
|
||||
nwatches = nelem(watches);
|
||||
rv = ibusinit();
|
||||
CT_EQ_INT(t, -1, rv);
|
||||
CT_EQ_PTR(t, nil, srv);
|
||||
CT_CHECK(t, lstat(path, &st) < 0 && errno == ENOENT);
|
||||
if(rv == 0){
|
||||
dbus_server_disconnect(srv);
|
||||
dbus_server_unref(srv);
|
||||
srv = nil;
|
||||
unlinkaddr();
|
||||
atexitdont(unlinkaddr);
|
||||
}
|
||||
|
||||
memset(watches, 0, sizeof watches);
|
||||
nwatches = 0;
|
||||
while(atexit(unlinkaddr))
|
||||
continue;
|
||||
CT_EQ_INT(t, -1, ibusinit());
|
||||
CT_EQ_PTR(t, nil, srv);
|
||||
CT_CHECK(t, lstat(path, &st) < 0 && errno == ENOENT);
|
||||
cleanup:
|
||||
if(srv != nil){
|
||||
dbus_server_disconnect(srv);
|
||||
dbus_server_unref(srv);
|
||||
srv = nil;
|
||||
}
|
||||
unlinkaddr();
|
||||
atexitdont(unlinkaddr);
|
||||
memset(watches, 0, sizeof watches);
|
||||
nwatches = 0;
|
||||
addrfile[0] = '\0';
|
||||
if(saved != nil){
|
||||
setenv("XDG_CONFIG_HOME", saved, 1);
|
||||
free(saved);
|
||||
}else
|
||||
unsetenv("XDG_CONFIG_HOME");
|
||||
if(made){
|
||||
if(path[0] != '\0')
|
||||
unlink(path);
|
||||
if(busdir[0] != '\0')
|
||||
CT_CHECK(t, rmdir(busdir) == 0 || errno == ENOENT);
|
||||
if(ibusdir[0] != '\0')
|
||||
CT_CHECK(t, rmdir(ibusdir) == 0 || errno == ENOENT);
|
||||
CT_CHECK(t, rmdir(root) == 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
enginepump(void *arg)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user