diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-08-22 18:01:44 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-08-23 23:42:33 +0200 |
| commit | af038fcf186496ba07fe1cf59263b6741a0988da (patch) | |
| tree | a72b21a2d372ab7d8e14ada11eade07c9ff491ec /src/scanner.l | |
| parent | 7c43dc46179a6f85406eb861e970cbb06bac05d2 (diff) | |
src: add include_paths to struct nft_ctx
Not convenient to keep this as static for the upcoming library, so let's
move it where it belongs.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scanner.l b/src/scanner.l index b6ba32d8..d50e2b67 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -773,8 +773,8 @@ static bool search_in_include_path(const char *filename) filename[0] != '/'); } -int scanner_include_file(void *scanner, const char *filename, - const struct location *loc) +int scanner_include_file(struct nft_ctx *nft, void *scanner, + const char *filename, const struct location *loc) { struct parser_state *state = yyget_extra(scanner); struct error_record *erec; @@ -784,13 +784,13 @@ int scanner_include_file(void *scanner, const char *filename, if (search_in_include_path(filename)) { for (i = 0; i < INCLUDE_PATHS_MAX; i++) { - if (include_paths[i] == NULL) + if (nft->include_paths[i] == NULL) break; ret = snprintf(buf, sizeof(buf), "%s/%s", - include_paths[i], filename); + nft->include_paths[i], filename); if (ret < 0 || ret >= PATH_MAX) { erec = error(loc, "Too long file path \"%s/%s\"\n", - include_paths[i], filename); + nft->include_paths[i], filename); erec_queue(erec, state->msgs); return -1; } |