diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-04-13 14:30:56 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-04-13 14:30:56 -0400 |
| commit | 94e3f93395de538d73826e128281a3ea9591a5a9 (patch) | |
| tree | 45257e4b024537c5e0e5a3037a99ea9765583c99 /extension/readdir.c | |
| parent | c4300d657ba49db0b6d0f0884f41a29622edc58b (diff) | |
| parent | a4b59faf911743b30f2e6e979c4f9c1ea0669ac3 (diff) | |
| download | egawk-94e3f93395de538d73826e128281a3ea9591a5a9.tar.gz egawk-94e3f93395de538d73826e128281a3ea9591a5a9.tar.bz2 egawk-94e3f93395de538d73826e128281a3ea9591a5a9.zip | |
Merge branch 'master' into select
Diffstat (limited to 'extension/readdir.c')
| -rw-r--r-- | extension/readdir.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/extension/readdir.c b/extension/readdir.c index 061fe27f..7bcabcb0 100644 --- a/extension/readdir.c +++ b/extension/readdir.c @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2012, 2013 the Free Software Foundation, Inc. + * Copyright (C) 2012-2014 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. @@ -67,6 +67,10 @@ #define _(msgid) gettext(msgid) #define N_(msgid) msgid +#ifndef PATH_MAX +#define PATH_MAX 1024 /* a good guess */ +#endif + static const gawk_api_t *api; /* for convenience macros to work */ static awk_ext_id_t *ext_id; static const char *ext_version = "readdir extension: version 1.0"; @@ -89,6 +93,7 @@ static const char * ftype(struct dirent *entry, const char *dirname) { #ifdef DT_BLK + (void) dirname; /* silence warnings */ switch (entry->d_type) { case DT_BLK: return "b"; case DT_CHR: return "c"; @@ -158,6 +163,7 @@ get_inode(struct dirent *entry, const char *dirname) } return 0; #else + (void) dirname; /* silence warnings */ return entry->d_ino; #endif } @@ -215,6 +221,7 @@ dir_get_record(char **out, awk_input_buf_t *iobuf, int *errcode, *out = the_dir->buf; + *rt_start = NULL; *rt_len = 0; /* set RT to "" */ return len; } @@ -232,8 +239,8 @@ dir_close(awk_input_buf_t *iobuf) the_dir = (open_directory_t *) iobuf->opaque; closedir(the_dir->dp); - free(the_dir->buf); - free(the_dir); + gawk_free(the_dir->buf); + gawk_free(the_dir); iobuf->fd = -1; } |