Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

	basis/unix/stat/netbsd/netbsd.factor

basis/unix/statfs/netbsd/netbsd.factor

@@ -5,11 +5,39 @@ combinators system io.backend accessors alien.c-types
 io.encodings.utf8 alien.strings ;
 IN: unix.statfs.netbsd
 
+: _VFS_NAMELEN    32   ; inline
+: _VFS_MNAMELEN   1024 ; inline
+
+C-STRUCT: statvfs
+    { "ulong"   "f_flag" }   
+    { "ulong"   "f_bsize" }
+    { "ulong"   "f_frsize" }  
+    { "ulong"   "f_iosize" }  
+    { "fsblkcnt_t" "f_blocks" }       
+    { "fsblkcnt_t" "f_bfree" } 
+    { "fsblkcnt_t" "f_bavail" }       
+    { "fsblkcnt_t" "f_bresvd" }       
+    { "fsfilcnt_t" "f_files" }
+    { "fsfilcnt_t" "f_ffree" }
+    { "fsfilcnt_t" "f_favail" }       
+    { "fsfilcnt_t" "f_fresvd" }       
+    { "uint64_t"   "f_syncreads" }    
+    { "uint64_t"   "f_syncwrites" }   
+    { "uint64_t"   "f_asyncreads" }   
+    { "uint64_t"   "f_asyncwrites" }  
+    { "fsid_t"    "f_fsidx" }
+    { "ulong"   "f_fsid" }
+    { "ulong"   "f_namemax" }      
+    { "uid_t"   "f_owner" }
+    { { "uint32_t" 4 } "f_spare" }     
+    { { "char" _VFS_NAMELEN } "f_fstypename" }
+    { { "char" _VFS_NAMELEN } "f_mntonname" }
+    { { "char" _VFS_NAMELEN } "f_mntfromname" } ;
+
 TUPLE: netbsd-file-system-info < file-system-info
 flag bsize frsize io-size
 blocks blocks-free blocks-available blocks-reserved
-files ffree
-sync-reads sync-writes async-reads async-writes
+files ffree sync-reads sync-writes async-reads async-writes
 fsidx fsid namemax owner spare fstype mnotonname mntfromname
 file-system-type-name mount-from ;
 

basis/unix/statfs/netbsd/tags.txt

@@ -0,0 +1 @@
+unportable

basis/unix/types/netbsd/netbsd.factor

@@ -17,7 +17,6 @@ TYPEDEF: long           ssize_t
 TYPEDEF: int            pid_t
 TYPEDEF: int            time_t
 
-
 TYPEDEF: __uint64_t    fsblkcnt_t
 TYPEDEF: fsblkcnt_t      __fsblkcnt_t