Merge branch 'master' of git://factorcode.org/git/factor into struct-updates

diff --combined basis/io/files/info/unix/netbsd/netbsd.factor
index 7c282583a1c96c2ef0e072af05626a1465c4ab27,4ba85bd305b349d6c827d7b57459d1483ffe8885..65c2d1d03c6e15b2ad47cd13a578cd0f0b5d2cdf
mode 100644,100644..100755
--- 1/basis/io/files/info/unix/netbsd/netbsd.factor
--- 2/basis/io/files/info/unix/netbsd/netbsd.factor
+++ b/basis/io/files/info/unix/netbsd/netbsd.factor
@@@ -4,7 -4,7 +4,7 @@@ USING: alien.syntax kernel unix.stat ma
  combinators system io.backend accessors alien.c-types
  io.encodings.utf8 alien.strings unix.types io.files.unix
  io.files io.files.info unix.statvfs.netbsd unix.getfsstat.netbsd arrays
--grouping sequences io.encodings.utf8 classes.struct
++grouping sequences io.encodings.utf8 classes.struct struct-arrays
  io.files.info.unix ;
  IN: io.files.info.unix.netbsd
  
@@@ -47,6 -47,6 +47,6 @@@ M: netbsd statvfs>file-system-info ( fi
  
  M: netbsd file-systems ( -- array )
      f 0 0 getvfsstat dup io-error
-     \ statvfs <c-array> dup dup length 0 getvfsstat io-error
-     \ statvfs heap-size group
-     [ f_mntonname>> utf8 alien>string file-system-info ] map ;
 -    \ statvfs <c-type-array>
++    \ statvfs <struct-array>
+     [ dup length 0 getvfsstat io-error ]
+     [ [ f_mntonname>> utf8 alien>string file-system-info ] map ] bi ;

diff --combined basis/io/files/info/unix/openbsd/openbsd.factor
index 242938a47c0be6cd0f26dc80ec44c16668028f05,c1a93476866616a44d11a21ba21988ccf60421f5..c3671391b94bfb3e61e86b311ed8c430bcbb782c
mode 100644,100644..100755
--- 1/basis/io/files/info/unix/openbsd/openbsd.factor
--- 2/basis/io/files/info/unix/openbsd/openbsd.factor
+++ b/basis/io/files/info/unix/openbsd/openbsd.factor
@@@ -4,7 -4,7 +4,7 @@@ USING: accessors alien.c-types alien.st
  combinators io.backend io.files io.files.info io.files.unix kernel math
  sequences system unix unix.getfsstat.openbsd grouping
  unix.statfs.openbsd unix.statvfs.openbsd unix.types
--arrays io.files.info.unix classes.struct ;
++arrays io.files.info.unix classes.struct struct-arrays ;
  IN: io.files.unix.openbsd
  
  TUPLE: freebsd-file-system-info < unix-file-system-info
@@@ -47,6 -47,6 +47,6 @@@ M: openbsd statvfs>file-system-info ( f
  
  M: openbsd file-systems ( -- seq )
      f 0 0 getfsstat dup io-error
-     \ statfs <c-array> dup dup length 0 getfsstat io-error 
-     \ statfs heap-size group 
-     [ f_mntonname>> alien>native-string file-system-info ] map ;
+     \ statfs <c-type-array>
+     [ dup length 0 getvfsstat io-error ]
+     [ [ f_mntonname>> utf8 alien>string file-system-info ] map ] bi ;