bug fixes from ASANO Masahiro <masano@tnes.nec.co.jp>.

diff --git a/db/fprint.c b/db/fprint.c
index 3e4a9bf80154d20538d709d837895bd64651a231..fb7fd4e8f81ea69bff97adcc47271f04e3d616f7 100644 (file)
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -161,7 +161,7 @@ fp_time(
             i++, bitpos += size) {
                if (array)
                        dbprintf("%d:", i + base);
-                t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(time_t)*8, 0);
+                t=(time_t)getbitval((char *)obj + byteize(bitpos), 0, sizeof(int32_t)*8, 0);
                c = ctime(&t);
                dbprintf("%24.24s", c);
                if (i < count - 1)

diff --git a/db/write.c b/db/write.c
index 32477f237a1965e836f9394dfcd6a110e96d8dab..3b4e678d73d4cc23b961b150454bdda6e67ccfae 100644 (file)
--- a/db/write.c
+++ b/db/write.c
@@ -277,7 +277,7 @@ bwrite_rrot(
 
        hold_region = xmalloc(shift);
        memcpy(hold_region, base+(len-shift), shift);
-       memcpy(base+shift, base, len-shift);
+       memmove(base+shift, base, len-shift);
        memcpy(base, hold_region, shift);
 }
 
@@ -295,7 +295,7 @@ bwrite_seq(
        int base;
        int range;
        int top;
-       char *buf = (char *)iocur_top->data;
+       char *buf;
 
        if (start == -1)
                start = 0;
@@ -325,6 +325,7 @@ bwrite_seq(
        }
 
        range = top - base;
+       buf = (char *)iocur_top->data + start;
 
        tmp = 0;
        for (i = start; i < start+len; i++) {
@@ -343,7 +344,7 @@ bwrite_random(
        int   to)
 {
        int i;
-       char *buf = (char *)iocur_top->data;
+       char *buf;
 
        if (start == -1)
                start = 0;
@@ -356,6 +357,8 @@ bwrite_random(
                         len, iocur_top->len);
        }
 
+       buf = (char *)iocur_top->data + start;
+
        for (i = start; i < start+len; i++)
                *buf++ = (char)lrand48();
 }

diff --git a/doc/CHANGES b/doc/CHANGES
index d9a49ee5ccf2e0abee29ceda15ad987299770967..2209599f87af5e1c1678ab2cddcb8be663fdbcec 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,7 @@
 [current cvs]
        - Update xfs_growfs man page
        - Don't build libxlog.a with DEBUG enabled
+       - xfs_db fixes from ASANO Masahiro at NEC
 
 xfsprogs-2.0.4 (17 April 2002)
        - Minor update sync'ing with kernel changes (less endian