Fix stat so io test will finish

diff --git a/basis/unix/ffi/freebsd/freebsd.factor b/basis/unix/ffi/freebsd/freebsd.factor
index 820e050344040804f53ef043722c9e933e5f32aa..780898e3e74ee726e9d761b682ef989952c5395d 100644 (file)
--- a/basis/unix/ffi/freebsd/freebsd.factor
+++ b/basis/unix/ffi/freebsd/freebsd.factor
@@ -1,11 +1,18 @@
 USING: alien.c-types alien.syntax classes.struct unix.types unix.ffi.bsd ;
 IN: unix.ffi
 
+CONSTANT: AF_INET 2
+ALIAS: PF_INET AF_INET
 CONSTANT: AF_INET6 28
 ALIAS: PF_INET6 AF_INET6
 
 CONSTANT: FD_SETSIZE 1024
 
+STRUCT: sockaddr
+    { sa_len uchar }
+    { sa_family __uint8_t }
+    { sa_data char[14] } ;
+
 STRUCT: addrinfo
     { flags int }
     { family int }

diff --git a/basis/unix/getfsstat/freebsd/freebsd.factor b/basis/unix/getfsstat/freebsd/freebsd.factor
index b13226f5ee711d5d2cb2a1328478b67673bd20a1..78696b95e9c51081bf0e434fbe0d8919869670bc 100644 (file)
--- a/basis/unix/getfsstat/freebsd/freebsd.factor
+++ b/basis/unix/getfsstat/freebsd/freebsd.factor
@@ -8,5 +8,5 @@ CONSTANT: MNT_LAZY    3   ! push data not written by filesystem syncer
 CONSTANT: MNT_SUSPEND 4   ! suspend file system after sync
 
 
-FUNCTION-ALIAS: getfsstat int getfsstat ( statfs* buf, long bufsize, int flags ) 
-FUNCTION-ALIAS: getmntinfo int getmntinfo ( statfs **mntbufp, int flags ) 
+FUNCTION:  int getfsstat ( statfs* buf, long bufsize, int flags ) 
+FUNCTION:  int getmntinfo ( statfs **mntbufp, int flags ) 

diff --git a/basis/unix/kqueue/freebsd/freebsd.factor b/basis/unix/kqueue/freebsd/freebsd.factor
index 148974e4ac2efd41b248f0195d142e0745458c52..2b9bf2c54e420cc09082c29f92bda974ccee6e38 100644 (file)
--- a/basis/unix/kqueue/freebsd/freebsd.factor
+++ b/basis/unix/kqueue/freebsd/freebsd.factor
@@ -2,13 +2,13 @@ USING: alien.c-types alien.syntax classes.struct unix.types unix.time ;
 IN: unix.kqueue
 
 STRUCT: kevent
-    { ident  ulong }
+    { ident  __uint64_t }
     { filter short }
     { flags  ushort }
     { fflags uint }
-    { data __uint64_t }
+    { data __int64_t }
     { udata  void* } 
-    { ext[4] __uint64_t } ;
+    { ext __uint64_t[4] } ;
 
 FUNCTION-ALIAS: kevent-func int kevent ( int kq, kevent* changelist, int nchanges, kevent* eventlist, int nevents, timespec* timeout )
 

diff --git a/basis/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor
index 9a6416c22ba984ebcd8aedbb54e1d735eb977e92..30b4ee1e9b0e542a9d3eecf20e2174069fb2c6c9 100644 (file)
--- a/basis/unix/stat/freebsd/freebsd.factor
+++ b/basis/unix/stat/freebsd/freebsd.factor
@@ -6,15 +6,19 @@ IN: unix.stat
 
 ! stat64 structure
 
+STRUCT: fbsd-timespec
+    { tv_sec __int32_t }
+    { tv_nsec long } ;
+    
 STRUCT: stat
     { st_dev dev_t }
     { st_ino ino_t }
     { st_nlink nlink_t }
     { st_mode mode_t }
-    { st_pading0 __int16_t }
+    { st_padding0 __int16_t }
     { st_uid uid_t }
     { st_gid gid_t }
-    { st_pading1 __int32_t }
+    { st_padding1 __int32_t }
     { st_rdev dev_t }
     { st_atimespec timespec }
     { st_mtimespec timespec }

diff --git a/basis/unix/statfs/freebsd/freebsd.factor b/basis/unix/statfs/freebsd/freebsd.factor
index 13c797d5cff2c7c60d480902186e04d8f3bc198b..085b8d9bf2b6c70c8738569b03496ad88cc3e3df 100644 (file)
--- a/basis/unix/statfs/freebsd/freebsd.factor
+++ b/basis/unix/statfs/freebsd/freebsd.factor
@@ -8,22 +8,22 @@ CONSTANT: MNAMELEN        1024            ! size of on/from name bufs
 CONSTANT: STAFS_VERSION 0x20140518
 
 STRUCT: statfs
-    { f_version uint32_t }
-    { f_type uint32_t }
-    { f_flags uint64_t }
-    { f_bsize uint64_t }
-    { f_iosize uint64_t }
-    { f_blocks uint64_t }
-    { f_bfree uint64_t }
-    { f_bavail int64_t }
-    { f_files uint64_t }
-    { f_ffree int64_t }
-    { f_syncwrites uint64_t }
-    { f_asyncwrites uint64_t }
-    { f_syncreads uint64_t }
-    { f_asyncreads uint64_t }
-    { f_spare uint64_t[10] }
-    { f_namemax uint32_t }
+    { f_version __uint32_t }
+    { f_type __uint32_t }
+    { f_flags __uint64_t }
+    { f_bsize __uint64_t }
+    { f_iosize __uint64_t }
+    { f_blocks __uint64_t }
+    { f_bfree __uint64_t }
+    { f_bavail __int64_t }
+    { f_files __uint64_t }
+    { f_ffree __int64_t }
+    { f_syncwrites __uint64_t }
+    { f_asyncwrites __uint64_t }
+    { f_syncreads __uint64_t }
+    { f_asyncreads __uint64_t }
+    { f_spare __uint64_t[10] }
+    { f_namemax __uint32_t }
     { f_owner uid_t }
     { f_fsid fsid_t }
     { f_charspare char[80] }

diff --git a/basis/unix/types/freebsd/freebsd.factor b/basis/unix/types/freebsd/freebsd.factor
index e3c738b93ef144ce2e8d7cec79999c4d5f18a991..6f2d8e9201677a2882cbc05d201a05b8073e35db 100644 (file)
--- a/basis/unix/types/freebsd/freebsd.factor
+++ b/basis/unix/types/freebsd/freebsd.factor
@@ -6,10 +6,10 @@ TYPEDEF: uint     __uint32_t
 TYPEDEF: int      __int32_t
 TYPEDEF: longlong __int64_t
 
-TYPEDEF: __int32_t  dev_t
-TYPEDEF: __uint32_t ino_t
+TYPEDEF: __uint64_t  dev_t
+TYPEDEF: __uint64_t ino_t
 TYPEDEF: __uint16_t mode_t
-TYPEDEF: __uint16_t nlink_t
+TYPEDEF: __uint64_t nlink_t
 TYPEDEF: __uint32_t uid_t
 TYPEDEF: __uint32_t gid_t
 TYPEDEF: __int64_t  off_t
@@ -20,4 +20,6 @@ TYPEDEF: __uint32_t fflags_t
 TYPEDEF: long       ssize_t
 TYPEDEF: int        pid_t
 TYPEDEF: long       time_t
+TYPEDEF: __uint64_t fsblkcnt_t
+TYPEDEF: __uint64_t fsfilcnt_t