diff options
| -rw-r--r-- | include/nftables.h | 2 | ||||
| -rw-r--r-- | src/erec.c | 11 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/scanner.l | 3 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/nftables.h b/include/nftables.h index c992d302..b55e1440 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -113,7 +113,7 @@ struct input_descriptor { const char *name; union { const char *data; - int fd; + FILE *fp; }; unsigned int lineno; unsigned int column; @@ -118,7 +118,7 @@ void erec_print(FILE *f, const struct error_record *erec, const struct location *loc = erec->locations, *iloc; const struct input_descriptor *indesc = loc->indesc, *tmp; const char *line = NULL; /* silence gcc */ - char buf[1024]; + char buf[1024] = {}; char *pbuf = NULL; unsigned int i, end; int l, ret; @@ -131,14 +131,13 @@ void erec_print(FILE *f, const struct error_record *erec, *strchrnul(line, '\n') = '\0'; break; case INDESC_FILE: - memset(buf, 0, sizeof(buf)); - orig_offset = lseek(indesc->fd, 0, SEEK_CUR); - lseek(indesc->fd, loc->line_offset, SEEK_SET); - ret = read(indesc->fd, buf, sizeof(buf) - 1); + orig_offset = ftell(indesc->fp); + fseek(indesc->fp, loc->line_offset, SEEK_SET); + ret = fread(buf, 1, sizeof(buf) - 1, indesc->fp); if (ret > 0) *strchrnul(buf, '\n') = '\0'; line = buf; - lseek(indesc->fd, orig_offset, SEEK_SET); + fseek(indesc->fp, orig_offset, SEEK_SET); break; case INDESC_INTERNAL: case INDESC_NETLINK: @@ -428,8 +428,8 @@ int main(int argc, char * const *argv) if (nft_run(&nft, nf_sock, scanner, &state, &msgs) != 0) rc = NFT_EXIT_FAILURE; out: - scanner_destroy(scanner); erec_print_list(stderr, &msgs, nft.debug_mask); + scanner_destroy(scanner); xfree(buf); cache_release(&nft.cache); iface_cache_release(); diff --git a/src/scanner.l b/src/scanner.l index d50e2b67..25e4eb1c 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -634,7 +634,7 @@ static struct error_record *scanner_push_file(void *scanner, const char *filenam state->indesc->location = *loc; state->indesc->type = INDESC_FILE; state->indesc->name = xstrdup(filename); - state->indesc->fd = fileno(f); + state->indesc->fp = f; init_pos(state); return NULL; } @@ -866,6 +866,7 @@ void scanner_destroy(struct parser_state *scanner) if (inpdesc && inpdesc->name) { xfree(inpdesc->name); inpdesc->name = NULL; + fclose(inpdesc->fp); } yypop_buffer_state(scanner); } while (state->indesc_idx--); |