diff options
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rw-r--r-- | extension/readdir.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 5ab0207b..f5167c01 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2012-08-03 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * readdir.c (dir_get_record): Fix for systems where ino_t is + 64 bit even on 32 bit systems (cygwin). + 2012-08-01 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (man_MANS): Add man page files so that they diff --git a/extension/readdir.c b/extension/readdir.c index bba07ef4..2c25a95b 100644 --- a/extension/readdir.c +++ b/extension/readdir.c @@ -125,7 +125,7 @@ dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode, { DIR *dp; struct dirent *dirent; - size_t len; + int len; open_directory_t *the_dir; /* @@ -148,15 +148,13 @@ dir_get_record(char **out, struct iobuf_public *iobuf, int *errcode, return EOF; } + len = sprintf(the_dir->buf, "%llu/%s", + (unsigned long long) dirent->d_ino, + dirent->d_name); if (do_ftype) - sprintf(the_dir->buf, "%ld/%s/%s", - dirent->d_ino, dirent->d_name, ftype(dirent)); - else - sprintf(the_dir->buf, "%ld/%s", - dirent->d_ino, dirent->d_name); + len += sprintf(the_dir->buf + len, "/%s", ftype(dirent)); *out = the_dir->buf; - len = strlen(the_dir->buf); *rt_len = 0; /* set RT to "" */ return len; |