From 164f8ccb678b8db3971c201b844b71f352ee919c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 10 Dec 2008 14:28:22 -0600 Subject: [PATCH 1/2] parse the fsid_t for the rest of the platforms --- basis/io/unix/files/freebsd/freebsd.factor | 5 +++-- basis/io/unix/files/linux/linux.factor | 5 +++-- basis/io/unix/files/netbsd/netbsd.factor | 4 ++-- basis/io/unix/files/openbsd/openbsd.factor | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/basis/io/unix/files/freebsd/freebsd.factor b/basis/io/unix/files/freebsd/freebsd.factor index 3786a82b55..7fa03a97cd 100644 --- a/basis/io/unix/files/freebsd/freebsd.factor +++ b/basis/io/unix/files/freebsd/freebsd.factor @@ -3,7 +3,8 @@ USING: accessors alien.c-types alien.syntax combinators io.backend io.files io.unix.files kernel math system unix unix.statfs.freebsd unix.statvfs.freebsd unix.getfsstat.freebsd -sequences grouping alien.strings io.encodings.utf8 ; +sequences grouping alien.strings io.encodings.utf8 +specialized-arrays.direct.uint ; IN: io.unix.files.freebsd TUPLE: freebsd-file-system-info < unix-file-system-info @@ -32,7 +33,7 @@ M: freebsd statfs>file-system-info ( file-system-info statvfs -- file-system-inf [ statfs-f_asyncreads >>asyncreads ] [ statfs-f_namemax >>name-max ] [ statfs-f_owner >>owner ] - [ statfs-f_fsid >>id ] + [ statfs-f_fsid 2 >array >>id ] [ statfs-f_fstypename utf8 alien>string >>type ] [ statfs-f_mntfromname utf8 alien>string >>device-name ] [ statfs-f_mntonname utf8 alien>string >>mount-point ] diff --git a/basis/io/unix/files/linux/linux.factor b/basis/io/unix/files/linux/linux.factor index 3e4e1c043a..cbdfbce1ce 100644 --- a/basis/io/unix/files/linux/linux.factor +++ b/basis/io/unix/files/linux/linux.factor @@ -3,7 +3,8 @@ USING: accessors alien.c-types alien.syntax combinators csv io.backend io.encodings.utf8 io.files io.streams.string io.unix.files kernel math.order namespaces sequences sorting -system unix unix.statfs.linux unix.statvfs.linux ; +system unix unix.statfs.linux unix.statvfs.linux +specialized-arrays.direct.uint ; IN: io.unix.files.linux TUPLE: linux-file-system-info < unix-file-system-info @@ -23,7 +24,7 @@ M: linux statfs>file-system-info ( struct -- statfs ) [ statfs64-f_bavail >>blocks-available ] [ statfs64-f_files >>files ] [ statfs64-f_ffree >>files-free ] - [ statfs64-f_fsid >>id ] + [ statfs64-f_fsid 2 >array >>id ] [ statfs64-f_namelen >>namelen ] [ statfs64-f_frsize >>preferred-block-size ] ! [ statfs64-f_spare >>spare ] diff --git a/basis/io/unix/files/netbsd/netbsd.factor b/basis/io/unix/files/netbsd/netbsd.factor index 23717b41a4..702d8443e4 100644 --- a/basis/io/unix/files/netbsd/netbsd.factor +++ b/basis/io/unix/files/netbsd/netbsd.factor @@ -4,7 +4,7 @@ USING: alien.syntax kernel unix.stat math unix combinators system io.backend accessors alien.c-types io.encodings.utf8 alien.strings unix.types io.unix.files io.files unix.statvfs.netbsd unix.getfsstat.netbsd -grouping sequences io.encodings.utf8 ; +grouping sequences io.encodings.utf8 specialized-arrays.direct.uint ; IN: io.unix.files.netbsd TUPLE: netbsd-file-system-info < unix-file-system-info @@ -35,7 +35,7 @@ M: netbsd statvfs>file-system-info ( file-system-info statvfs -- file-system-inf [ statvfs-f_syncwrites >>sync-writes ] [ statvfs-f_asyncreads >>async-reads ] [ statvfs-f_asyncwrites >>async-writes ] - [ statvfs-f_fsidx >>idx ] + [ statvfs-f_fsidx 2 >array >>idx ] [ statvfs-f_fsid >>id ] [ statvfs-f_namemax >>name-max ] [ statvfs-f_owner >>owner ] diff --git a/basis/io/unix/files/openbsd/openbsd.factor b/basis/io/unix/files/openbsd/openbsd.factor index 8c8f7c154b..51c5c4fe10 100644 --- a/basis/io/unix/files/openbsd/openbsd.factor +++ b/basis/io/unix/files/openbsd/openbsd.factor @@ -3,7 +3,8 @@ USING: accessors alien.c-types alien.strings alien.syntax combinators io.backend io.files io.unix.files kernel math sequences system unix unix.getfsstat.openbsd grouping -unix.statfs.openbsd unix.statvfs.openbsd unix.types ; +unix.statfs.openbsd unix.statvfs.openbsd unix.types +specialized-arrays.direct.uint ; IN: io.unix.files.openbsd TUPLE: freebsd-file-system-info < unix-file-system-info @@ -30,7 +31,7 @@ M: openbsd statfs>file-system-info ( file-system-info statfs -- file-system-info [ statfs-f_syncreads >>sync-reads ] [ statfs-f_asyncwrites >>async-writes ] [ statfs-f_asyncreads >>async-reads ] - [ statfs-f_fsid >>id ] + [ statfs-f_fsid 2 >array >>id ] [ statfs-f_namemax >>name-max ] [ statfs-f_owner >>owner ] ! [ statfs-f_spare >>spare ] From 2af947b08ec4f7de177ceea60021ce64eee659c0 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 10 Dec 2008 14:43:56 -0600 Subject: [PATCH 2/2] fix using for recent change --- basis/io/unix/files/freebsd/freebsd.factor | 2 +- basis/io/unix/files/linux/linux.factor | 2 +- basis/io/unix/files/netbsd/netbsd.factor | 2 +- basis/io/unix/files/openbsd/openbsd.factor | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/io/unix/files/freebsd/freebsd.factor b/basis/io/unix/files/freebsd/freebsd.factor index 7fa03a97cd..eaf217af62 100644 --- a/basis/io/unix/files/freebsd/freebsd.factor +++ b/basis/io/unix/files/freebsd/freebsd.factor @@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.syntax combinators io.backend io.files io.unix.files kernel math system unix unix.statfs.freebsd unix.statvfs.freebsd unix.getfsstat.freebsd sequences grouping alien.strings io.encodings.utf8 -specialized-arrays.direct.uint ; +specialized-arrays.direct.uint arrays ; IN: io.unix.files.freebsd TUPLE: freebsd-file-system-info < unix-file-system-info diff --git a/basis/io/unix/files/linux/linux.factor b/basis/io/unix/files/linux/linux.factor index cbdfbce1ce..c30855c3ee 100644 --- a/basis/io/unix/files/linux/linux.factor +++ b/basis/io/unix/files/linux/linux.factor @@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.syntax combinators csv io.backend io.encodings.utf8 io.files io.streams.string io.unix.files kernel math.order namespaces sequences sorting system unix unix.statfs.linux unix.statvfs.linux -specialized-arrays.direct.uint ; +specialized-arrays.direct.uint arrays ; IN: io.unix.files.linux TUPLE: linux-file-system-info < unix-file-system-info diff --git a/basis/io/unix/files/netbsd/netbsd.factor b/basis/io/unix/files/netbsd/netbsd.factor index 702d8443e4..82ac3dc70d 100644 --- a/basis/io/unix/files/netbsd/netbsd.factor +++ b/basis/io/unix/files/netbsd/netbsd.factor @@ -3,7 +3,7 @@ USING: alien.syntax kernel unix.stat math unix combinators system io.backend accessors alien.c-types io.encodings.utf8 alien.strings unix.types io.unix.files -io.files unix.statvfs.netbsd unix.getfsstat.netbsd +io.files unix.statvfs.netbsd unix.getfsstat.netbsd arrays grouping sequences io.encodings.utf8 specialized-arrays.direct.uint ; IN: io.unix.files.netbsd diff --git a/basis/io/unix/files/openbsd/openbsd.factor b/basis/io/unix/files/openbsd/openbsd.factor index 51c5c4fe10..e5e18b29ea 100644 --- a/basis/io/unix/files/openbsd/openbsd.factor +++ b/basis/io/unix/files/openbsd/openbsd.factor @@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.strings alien.syntax combinators io.backend io.files io.unix.files kernel math sequences system unix unix.getfsstat.openbsd grouping unix.statfs.openbsd unix.statvfs.openbsd unix.types -specialized-arrays.direct.uint ; +specialized-arrays.direct.uint arrays ; IN: io.unix.files.openbsd TUPLE: freebsd-file-system-info < unix-file-system-info