From 03d96cc1bd804d4335db41611f8c094511ed112c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 23 Oct 2008 13:18:00 -0500 Subject: [PATCH] rename name to mount-point --- basis/io/windows/files/files.factor | 2 +- basis/unix/statfs/linux/linux.factor | 2 +- basis/unix/statfs/macosx/macosx.factor | 2 +- basis/unix/statfs/netbsd/netbsd.factor | 2 +- core/io/files/files.factor | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basis/io/windows/files/files.factor b/basis/io/windows/files/files.factor index d7b0b49dd1..3fb8029ee7 100644 --- a/basis/io/windows/files/files.factor +++ b/basis/io/windows/files/files.factor @@ -274,7 +274,7 @@ M: winnt file-system-info ( path -- file-system-info ) swap *ulonglong >>total-bytes swap *ulonglong >>free-space swap >>type - swap >>name ; + swap >>mount-point ; : find-first-volume ( word -- string handle ) MAX_PATH 1+ dup length diff --git a/basis/unix/statfs/linux/linux.factor b/basis/unix/statfs/linux/linux.factor index 5e6e5360ef..aae8d09145 100644 --- a/basis/unix/statfs/linux/linux.factor +++ b/basis/unix/statfs/linux/linux.factor @@ -37,7 +37,7 @@ M: linux mounted [ mount-point>> file-system-info ] keep { [ file-system-name>> >>device-name ] - [ mount-point>> >>name ] + [ mount-point>> >>mount-point ] [ type>> >>type ] } cleave ] map ; diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor index e065fc6118..6bf09fcdc0 100644 --- a/basis/unix/statfs/macosx/macosx.factor +++ b/basis/unix/statfs/macosx/macosx.factor @@ -135,7 +135,7 @@ M: macosx >file-system-info ( byte-array -- file-system-info ) [ statfs64-f_bavail ] [ statfs64-f_bsize ] bi * >>free-space ] - [ statfs64-f_mntonname utf8 alien>string >>name ] + [ statfs64-f_mntonname utf8 alien>string >>mount-point ] [ statfs64-f_bsize >>block-size ] [ statfs64-f_iosize >>io-size ] diff --git a/basis/unix/statfs/netbsd/netbsd.factor b/basis/unix/statfs/netbsd/netbsd.factor index 5aff13cceb..56c632edb4 100644 --- a/basis/unix/statfs/netbsd/netbsd.factor +++ b/basis/unix/statfs/netbsd/netbsd.factor @@ -69,7 +69,7 @@ M: netbsd >file-system-info ( byte-array -- netbsd-file-system-info ) [ statvfs-f_owner >>owner ] [ statvfs-f_spare >>spare ] [ statvfs-f_fstypename utf8 alien>string >>file-system-type-name ] - [ statvfs-f_mntonname utf8 alien>string >>name ] + [ statvfs-f_mntonname utf8 alien>string >>mount-point ] [ statvfs-f_mntfromname utf8 alien>string >>mount-from ] } cleave ; diff --git a/core/io/files/files.factor b/core/io/files/files.factor index f643f4ca3c..9899f5a014 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 device-name name type free-space ; +TUPLE: file-system-info device-name mount-point type free-space ; HOOK: file-system-info os ( path -- file-system-info )