mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libseat: Better error reporting from open_seat

Browse source
This commit is contained in:
Kenny Levinsen 2020-10-11 20:30:24 +02:00
parent 7d785ea993
commit 29ba210958
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libseat/libseat.c
View file

@ -40,23 +40,40 @@ struct libseat *libseat_open_seat(struct libseat_seat_listener *listener, void *
log_init(); log_init();
char *backend_type = getenv("LIBSEAT_BACKEND"); char *backend_type = getenv("LIBSEAT_BACKEND");
if (backend_type != NULL) {
const struct named_backend *iter = impls;
while (iter->backend != NULL && strcmp(backend_type, iter->name) != 0) {
iter++;
}
if (iter == NULL || iter->backend == NULL) {
log_errorf("No backend matched name '%s'", backend_type);
errno = EINVAL;
return NULL;
}
struct libseat *backend = iter->backend->open_seat(listener, data);
if (backend == NULL) {
log_errorf("Backend '%s' failed to open seat: %s", iter->name,
strerror(errno));
return NULL;
}
log_infof("Seat opened with backend '%s'", iter->name);
return backend;
}
struct libseat *backend = NULL; struct libseat *backend = NULL;
for (const struct named_backend *iter = impls; iter->backend != NULL; iter++) { for (const struct named_backend *iter = impls; iter->backend != NULL; iter++) {
if (backend_type != NULL && strcmp(backend_type, iter->name) != 0) {
continue;
}
log_infof("Trying backend '%s'", iter->name);
backend = iter->backend->open_seat(listener, data); backend = iter->backend->open_seat(listener, data);
if (backend != NULL) { if (backend != NULL) {
log_infof("Seat opened with backend '%s'", iter->name); log_infof("Seat opened with backend '%s'", iter->name);
break;
}
}
if (backend == NULL) {
errno = ENOSYS;
}
return backend; return backend;
} }
log_infof("Backend '%s' failed to open seat, skipping", iter->name);
}
log_error("No backend was able to open a seat");
errno = ENOSYS;
return NULL;
}
int libseat_disable_seat(struct libseat *seat) { int libseat_disable_seat(struct libseat *seat) {
assert(seat && seat->impl); assert(seat && seat->impl);