Commit 3e8370b028ae5e0d4389c6488cf009c9d2df53e6
2012-08-03T03:11:19
context: Maintain list of failed include paths Keep around a list of paths we tried to add but couldn't. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/src/context.c b/src/context.c
index 81c008b..c9d90bd 100644
--- a/src/context.c
+++ b/src/context.c
@@ -45,6 +45,7 @@ struct xkb_context {
void *user_data;
darray(char *) includes;
+ darray(char *) failed_includes;
/* xkbcomp needs to assign sequential IDs to XkbFile's it creates. */
unsigned file_id;
@@ -62,26 +63,30 @@ xkb_context_include_path_append(struct xkb_context *ctx, const char *path)
int err;
char *tmp;
+ tmp = strdup(path);
+ if (!tmp)
+ goto err;
+
err = stat(path, &stat_buf);
if (err != 0)
- return 0;
+ goto err;
if (!S_ISDIR(stat_buf.st_mode))
- return 0;
+ goto err;
#if defined(HAVE_EACCESS)
if (eaccess(path, R_OK | X_OK) != 0)
- return 0;
+ goto err;
#elif defined(HAVE_EUIDACCESS)
if (euidaccess(path, R_OK | X_OK) != 0)
- return 0;
+ goto err;
#endif
- tmp = strdup(path);
- if (!tmp)
- return 0;
-
darray_append(ctx->includes, tmp);
return 1;
+
+err:
+ darray_append(ctx->failed_includes, tmp);
+ return 0;
}
/**
@@ -118,9 +123,12 @@ xkb_context_include_path_clear(struct xkb_context *ctx)
char **path;
darray_foreach(path, ctx->includes)
- free(*path);
-
+ free(*path);
darray_free(ctx->includes);
+
+ darray_foreach(path, ctx->failed_includes)
+ free(*path);
+ darray_free(ctx->failed_includes);
}
/**