diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 3 | ||||
| -rw-r--r-- | extension/readdir.c | 6 | ||||
| -rw-r--r-- | extension/rwarray.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 6b7c2bce..22b72019 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -8,6 +8,9 @@ * stack.h, stack.c: New files. * Makefile.am: Update list of files. + * readdir.c (dir_can_take_file): Use members in iobuf. + * rwarray.c (do_writea): Initialize fp to NULL. + 2012-08-03 Andrew J. Schorr <aschorr@telemetry-investments.com> * readdir.c (dir_get_record): Fix for systems where ino_t is diff --git a/extension/readdir.c b/extension/readdir.c index 2c25a95b..c28764e8 100644 --- a/extension/readdir.c +++ b/extension/readdir.c @@ -184,14 +184,10 @@ dir_close(struct iobuf_public *iobuf) static int dir_can_take_file(const IOBUF_PUBLIC *iobuf) { - struct stat sbuf; - int fd; - if (iobuf == NULL) return 0; - fd = iobuf->fd; - return (fd >= 0 && fstat(fd, & sbuf) >= 0 && S_ISDIR(sbuf.st_mode)); + return (iobuf->fd != INVALID_HANDLE && S_ISDIR(iobuf->sbuf.st_mode)); } /* diff --git a/extension/rwarray.c b/extension/rwarray.c index e45a499e..0eca9779 100644 --- a/extension/rwarray.c +++ b/extension/rwarray.c @@ -93,7 +93,7 @@ static awk_value_t * do_writea(int nargs, awk_value_t *result) { awk_value_t filename, array; - FILE *fp; + FILE *fp = NULL; uint32_t major = MAJOR; uint32_t minor = MINOR; |