[gawk-diffs] [SCM] gawk branch, extgawk, updated. 66693943a96ef1d0c0a991c3780dabc0071d6233

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, extgawk has been updated
       via  66693943a96ef1d0c0a991c3780dabc0071d6233 (commit)
      from  022ad6523bf98e8c2a272a06787be6931e7f3457 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=66693943a96ef1d0c0a991c3780dabc0071d6233

commit 66693943a96ef1d0c0a991c3780dabc0071d6233
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Aug 3 06:30:39 2012 +0300

    Fix readdir.c for cygwin.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 5ab0207..f5167c0 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * Makefile.am (man_MANS): Add man page files so that they
diff --git a/extension/readdir.c b/extension/readdir.c
index bba07ef..2c25a95 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;

-----------------------------------------------------------------------

Summary of changes:
 extension/ChangeLog |    5 +++++
 extension/readdir.c |   12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
gawk