va_start(args, format);
ret = vasprintf(&errMsg, format, args);
+ va_end(args);
if (ret == -1) {
ERR("String allocation failed in xml error handler");
return;
}
- va_end(args);
fprintf(stderr, "XML Error: %s", errMsg);
free(errMsg);
goto end;
}
- for (i = 0; i < (sizeof(domains) / sizeof(*domain)); i++) {
+ for (i = 0; i < (sizeof(domains) / sizeof(domains[0])); i++) {
domain = domains[i];
if (!domain) {
continue;
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
+ if (kernel_domain) {
+ /* Same domain seen twice, invalid! */
+ goto domain_init_error;
+ }
kernel_domain = domain;
break;
case LTTNG_DOMAIN_UST:
+ if (ust_domain) {
+ /* Same domain seen twice, invalid! */
+ goto domain_init_error;
+ }
ust_domain = domain;
break;
case LTTNG_DOMAIN_JUL:
+ if (jul_domain) {
+ /* Same domain seen twice, invalid! */
+ goto domain_init_error;
+ }
jul_domain = domain;
break;
default:
struct session_config_validation_ctx *validation_ctx, int override)
{
int ret, session_found = !session_name;
- struct stat sb;
DIR *directory = NULL;
assert(path);
assert(validation_ctx);
- ret = stat(path, &sb);
- if (ret) {
- ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
- goto end;
+ directory = opendir(path);
+ if (!directory) {
+ if (errno != ENOTDIR) {
+ ret = -LTTNG_ERR_LOAD_IO_FAIL;
+ goto end;
+ }
}
- if (S_ISDIR(sb.st_mode)) {
+ if (directory) {
struct dirent *entry;
struct dirent *result;
char *file_path = NULL;
goto end;
}
- directory = opendir(path);
- if (!directory) {
- ret = -LTTNG_ERR_LOAD_IO_FAIL;
- free(entry);
- goto end;
- }
-
file_path = zmalloc(PATH_MAX);
if (!file_path) {
ret = -LTTNG_ERR_NOMEM;
file_path[path_len++] = '/';
}
+ ret = 0;
/* Search for *.lttng files */
while (!readdir_r(directory, entry, &result) && result) {
size_t file_name_len = strlen(result->d_name);