From 5a7ac3965db72b3bd94cb526278eaf0950a30115 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 8 Sep 2009 17:05:05 -0500 Subject: [PATCH] use raw pathnames for file-systems word --- basis/io/files/info/windows/windows.factor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor index 7ecd46f7e7..27fbae0324 100755 --- a/basis/io/files/info/windows/windows.factor +++ b/basis/io/files/info/windows/windows.factor @@ -129,8 +129,7 @@ ERROR: not-absolute-path ; [ first Letter? ] } 1&& [ 2 head "\\" append ] [ not-absolute-path ] if ; -M: winnt file-system-info ( path -- file-system-info ) - normalize-path root-directory +: (file-system-info) ( path -- file-system-info ) dup [ volume-information ] [ file-system-space ] bi \ win32-file-system-info new swap *ulonglong >>free-space @@ -144,6 +143,9 @@ M: winnt file-system-info ( path -- file-system-info ) swap >>mount-point calculate-file-system-info ; +M: winnt file-system-info ( path -- file-system-info ) + normalize-path root-directory (file-system-info) ; + : volume>paths ( string -- array ) 16384 tuck dup length 0 dup [ GetVolumePathNamesForVolumeName 0 = ] dip swap [ @@ -180,7 +182,7 @@ M: winnt file-system-info ( path -- file-system-info ) M: winnt file-systems ( -- array ) find-volumes [ volume>paths ] map concat [ - [ file-system-info ] + [ (file-system-info) ] [ drop \ file-system-info new swap >>mount-point ] recover ] map ;