Undo binary-breaking struct _uzistat rearrangement.

diff --git a/Kernel/syscall_fs.c b/Kernel/syscall_fs.c
index ac86884..2c8056a 100644 (file)
--- a/Kernel/syscall_fs.c
+++ b/Kernel/syscall_fs.c
@@ -134,10 +134,9 @@ arg_t _fstat(void)
 /* Utility for stat and fstat */
 int stcpy(inoptr ino, char *buf)
 {
-       int err = uput((char *) &(ino->c_node.i_size),    buf + 0,         5*4);
-       err |=    uput((char *) &(ino->c_dev),            buf + 5*4,       2*2);
-       err |=    uput((char *) &(ino->c_node.i_mode),    buf + 5*4 + 2*2, 4*2);
-       err |=    uput((char *) &(ino->c_node.i_addr[0]), buf + 5*4 + 6*2, 1*2);
+       int err = uput((char *) &(ino->c_dev), buf, 12);
+       err |= uput((char *) &(ino->c_node.i_addr[0]), buf + 12, 2);
+       err |= uput((char *) &(ino->c_node.i_size), buf + 14, 16);
        return err;
 }
 

diff --git a/Library/include/syscalls.h b/Library/include/syscalls.h
index dd501ee..3adde78 100644 (file)
--- a/Library/include/syscalls.h
+++ b/Library/include/syscalls.h
@@ -15,13 +15,6 @@ extern int syscall(int callno, ...);
 
 struct  _uzistat
 {
-       /* For alignment reasons, arrange this structure with largest objects
-        * first. */
-       uint32_t   st_size;
-       uint32_t   st_atime;
-       uint32_t   st_mtime;
-       uint32_t   st_ctime;
-       uint32_t   st_timeh;    /* Time high bytes */
        int16_t    st_dev;
        uint16_t   st_ino;
        uint16_t   st_mode;
@@ -29,6 +22,11 @@ struct  _uzistat
        uint16_t   st_uid;
        uint16_t   st_gid;
        uint16_t   st_rdev;
+       uint32_t   st_size;
+       uint32_t   st_atime;
+       uint32_t   st_mtime;
+       uint32_t   st_ctime;
+       uint32_t   st_timeh;    /* Time high bytes */
 };
 
 struct _uzisysinfoblk {