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

Conflicts:
	basis/unix/statfs/netbsd/netbsd.factor

diff --cc basis/io/unix/files/files.factor
Simple merge

diff --cc basis/unix/statfs/netbsd/netbsd.factor
index 30f258ca8d33323abc2d51dd9e5ba11534e8891a,d8a4bdc1380a79cfa3943584e4a936f6edc19bce..5617ca7533a9acf2cf527290e523fdc17b089f77
--- 1/basis/unix/statfs/netbsd/netbsd.factor
--- 2/basis/unix/statfs/netbsd/netbsd.factor
+++ b/basis/unix/statfs/netbsd/netbsd.factor
@@@ -4,5 -4,75 +4,3 @@@ USING: alien.syntax kernel unix.stat ma
  combinators system io.backend accessors alien.c-types
  io.encodings.utf8 alien.strings unix.types unix.statfs io.files ;
  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_MNAMELEN } "f_mntonname" }
 -    { { "char" _VFS_MNAMELEN } "f_mntfromname" } ;
 -
 -FUNCTION: int statvfs ( char* path, statvfs* buf ) ;
 -
 -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
 -fsidx fsid namemax owner spare fstype mnotonname mntfromname
 -file-system-type-name mount-from ;
--
 -M: netbsd >file-system-info ( byte-array -- netbsd-file-system-info )
 -    [ \ netbsd-file-system-info new ] dip
 -    {
 -        [
 -            [ statvfs-f_bsize ]
 -            [ statvfs-f_bavail ] bi * >>free-space
 -        ]
 -        [ statvfs-f_flag >>flag ]
 -        [ statvfs-f_bsize >>bsize ]
 -        [ statvfs-f_frsize >>frsize ]
 -        [ statvfs-f_iosize >>io-size ]
 -        [ statvfs-f_blocks >>blocks ]
 -        [ statvfs-f_bfree >>blocks-free ]
 -        [ statvfs-f_favail >>blocks-available ]
 -        [ statvfs-f_fresvd >>blocks-reserved ]
 -        [ statvfs-f_files >>files ]
 -        [ statvfs-f_ffree >>ffree ]
 -        [ statvfs-f_syncreads >>sync-reads ]
 -        [ statvfs-f_syncwrites >>sync-writes ]
 -        [ statvfs-f_asyncreads >>async-reads ]
 -        [ statvfs-f_asyncwrites >>async-writes ]
 -        [ statvfs-f_fsidx >>fsidx ]
 -        [ statvfs-f_namemax >>namemax ]
 -        [ statvfs-f_owner >>owner ]
 -        [ statvfs-f_spare >>spare ]
 -        [ statvfs-f_fstypename utf8 alien>string >>file-system-type-name ]
 -        [ statvfs-f_mntonname utf8 alien>string >>mount-point ]
 -        [ statvfs-f_mntfromname utf8 alien>string >>mount-from ]
 -    } cleave ;
--
 -M: netbsd file-system-info
 -    normalize-path "statvfs" <c-object> tuck statvfs io-error 
 -    >file-system-info ;