From 278b55ee5766553eb37b0776b02424b022f5dbf5 Mon Sep 17 00:00:00 2001 From: erg Date: Wed, 22 Oct 2008 20:04:10 -0500 Subject: [PATCH] include mount point in file-system-info --- basis/unix/statfs/linux/linux.factor | 5 ++++- basis/unix/statfs/statfs.factor | 5 ----- core/io/files/files.factor | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/basis/unix/statfs/linux/linux.factor b/basis/unix/statfs/linux/linux.factor index 6f4b1d619d..caf2e8334c 100644 --- a/basis/unix/statfs/linux/linux.factor +++ b/basis/unix/statfs/linux/linux.factor @@ -33,4 +33,7 @@ frequency pass-number ; [ mtab-csv>mtab-entry ] map ; M: linux mounted - parse-mtab [ mount-point>> file-system-info ] map ; + parse-mtab [ + mount-point>> + [ file-system-info ] keep >>name + ] map ; diff --git a/basis/unix/statfs/statfs.factor b/basis/unix/statfs/statfs.factor index 20010370ae..e77ef37b0f 100644 --- a/basis/unix/statfs/statfs.factor +++ b/basis/unix/statfs/statfs.factor @@ -4,11 +4,6 @@ USING: sequences system vocabs.loader combinators accessors kernel math.order sorting ; IN: unix.statfs -TUPLE: mounted block-size io-size blocks blocks-free -blocks-available files files-free file-system-id owner type -flags filesystem-subtype file-system-type-name mount-on -mount-from ; - TUPLE: file-system-info root-directory total-free-size total-size ; HOOK: >file-system-info os ( struct -- statfs ) diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 1f6a48b50e..fd45343043 100644 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -184,7 +184,7 @@ SYMBOL: +unknown+ ! File-system -TUPLE: file-system-info mount-on free-space ; +TUPLE: file-system-info name free-space ; HOOK: file-system-info os ( path -- file-system-info )