From 5e75a765a4950e570cb550b561f256d1a38578d8 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 28 Oct 2009 17:25:00 -0500 Subject: [PATCH 1/3] fix using --- basis/opengl/debug/debug.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/opengl/debug/debug.factor b/basis/opengl/debug/debug.factor index cd0985b1b0..22d40cddc5 100644 --- a/basis/opengl/debug/debug.factor +++ b/basis/opengl/debug/debug.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff bsd license USING: accessors kernel namespaces parser tools.continuations -ui.backend ui.gadgets.worlds words ; +ui.backend ui.gadgets.worlds words sequences ; IN: opengl.debug SYMBOL: G-world From e376a0ece23d15547de19ff8e3d317c6ab1ab352 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 28 Oct 2009 17:25:50 -0500 Subject: [PATCH 2/3] (normalize-path) -> absolute-path, canonicalize-path -> resolve-symlinks --- basis/compiler/tests/alien.factor | 2 +- basis/editors/editors.factor | 2 +- basis/ftp/server/server-tests.factor | 2 +- basis/ftp/server/server.factor | 4 ++-- basis/images/testing/testing.factor | 2 +- basis/io/directories/directories-docs.factor | 2 +- basis/io/directories/directories.factor | 4 ++-- basis/io/directories/search/search.factor | 4 ++-- basis/io/files/info/unix/linux/linux.factor | 2 +- basis/io/files/links/unix/unix.factor | 2 +- basis/io/files/windows/nt/nt.factor | 2 +- basis/io/launcher/unix/unix.factor | 2 +- basis/io/launcher/windows/windows.factor | 2 +- basis/io/monitors/linux/linux.factor | 2 +- basis/io/monitors/recursive/recursive.factor | 2 +- basis/io/sockets/secure/openssl/openssl.factor | 8 ++++---- basis/io/sockets/unix/unix.factor | 2 +- basis/windows/shell32/shell32.factor | 2 +- core/io/pathnames/pathnames-docs.factor | 18 +++++++++--------- core/io/pathnames/pathnames-tests.factor | 2 +- core/io/pathnames/pathnames.factor | 16 ++++++++-------- extra/fuel/fuel.factor | 4 ++-- extra/fuel/xref/xref.factor | 2 +- extra/geo-ip/geo-ip.factor | 2 +- extra/mason/common/common.factor | 2 +- extra/space-invaders/space-invaders.factor | 2 +- misc/bash/cdfactor.sh | 2 +- 27 files changed, 49 insertions(+), 49 deletions(-) diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor index ef8cb5f0a4..04ee02a5d7 100755 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -12,7 +12,7 @@ IN: compiler.tests.alien << : libfactor-ffi-tests-path ( -- string ) - "resource:" (normalize-path) + "resource:" absolute-path { { [ os winnt? ] [ "libfactor-ffi-test.dll" ] } { [ os macosx? ] [ "libfactor-ffi-test.dylib" ] } diff --git a/basis/editors/editors.factor b/basis/editors/editors.factor index 4a6dd9b5be..feb19af040 100644 --- a/basis/editors/editors.factor +++ b/basis/editors/editors.factor @@ -28,7 +28,7 @@ SYMBOL: edit-hook require ; : edit-location ( file line -- ) - [ (normalize-path) ] dip edit-hook get-global + [ absolute-path ] dip edit-hook get-global [ call( file line -- ) ] [ no-edit-hook edit-location ] if* ; ERROR: cannot-find-source definition ; diff --git a/basis/ftp/server/server-tests.factor b/basis/ftp/server/server-tests.factor index 3484fb4474..515a64a094 100644 --- a/basis/ftp/server/server-tests.factor +++ b/basis/ftp/server/server-tests.factor @@ -11,7 +11,7 @@ IN: ftp.server.tests : create-test-file ( -- path ) test-file-contents "ftp.server" "test" make-unique-file - [ ascii set-file-contents ] keep canonicalize-path ; + [ ascii set-file-contents ] [ normalize-path ] bi ; : test-ftp-server ( quot -- ) '[ diff --git a/basis/ftp/server/server.factor b/basis/ftp/server/server.factor index c9518bdef1..7653a922ea 100644 --- a/basis/ftp/server/server.factor +++ b/basis/ftp/server/server.factor @@ -58,7 +58,7 @@ C: ftp-disconnect send-response ; : serving? ( path -- ? ) - canonicalize-path server get serving-directory>> head? ; + normalize-path server get serving-directory>> head? ; : can-serve-directory? ( path -- ? ) { [ exists? ] [ file-info directory? ] [ serving? ] } 1&& ; @@ -343,7 +343,7 @@ M: ftp-server handle-client* ( server -- ) : ( directory port -- server ) latin1 ftp-server new-threaded-server swap >>insecure - swap canonicalize-path >>serving-directory + swap normalize-path >>serving-directory "ftp.server" >>name 5 minutes >>timeout ; diff --git a/basis/images/testing/testing.factor b/basis/images/testing/testing.factor index 538f098df5..ce51fd4669 100644 --- a/basis/images/testing/testing.factor +++ b/basis/images/testing/testing.factor @@ -9,7 +9,7 @@ IN: images.testing > ] keep ] H{ } map>assoc (find-mount-point) ; ERROR: file-system-not-found ; diff --git a/basis/io/files/links/unix/unix.factor b/basis/io/files/links/unix/unix.factor index c9a651b484..f41adfa731 100644 --- a/basis/io/files/links/unix/unix.factor +++ b/basis/io/files/links/unix/unix.factor @@ -13,6 +13,6 @@ M: unix make-hard-link ( path1 path2 -- ) M: unix read-link ( path -- path' ) normalize-path read-symbolic-link ; -M: unix canonicalize-path ( path -- path' ) +M: unix resolve-symlinks ( path -- path' ) path-components "/" [ append-path dup exists? [ follow-links ] when ] reduce ; diff --git a/basis/io/files/windows/nt/nt.factor b/basis/io/files/windows/nt/nt.factor index 97754cf237..10c5710f7d 100755 --- a/basis/io/files/windows/nt/nt.factor +++ b/basis/io/files/windows/nt/nt.factor @@ -38,7 +38,7 @@ M: winnt root-directory? ( path -- ? ) TR: normalize-separators "/" "\\" ; M: winnt normalize-path ( string -- string' ) - (normalize-path) + absolute-path normalize-separators prepend-prefix ; diff --git a/basis/io/launcher/unix/unix.factor b/basis/io/launcher/unix/unix.factor index 5424ab4238..a9e3324986 100644 --- a/basis/io/launcher/unix/unix.factor +++ b/basis/io/launcher/unix/unix.factor @@ -71,7 +71,7 @@ IN: io.launcher.unix : spawn-process ( process -- * ) [ setup-priority ] [ 250 _exit ] recover [ setup-redirection ] [ 251 _exit ] recover - [ current-directory get (normalize-path) cd ] [ 252 _exit ] recover + [ current-directory get absolute-path cd ] [ 252 _exit ] recover [ setup-environment ] [ 253 _exit ] recover [ get-arguments exec-args-with-path ] [ 254 _exit ] recover 255 _exit ; diff --git a/basis/io/launcher/windows/windows.factor b/basis/io/launcher/windows/windows.factor index 39455da578..6cae50bd9e 100755 --- a/basis/io/launcher/windows/windows.factor +++ b/basis/io/launcher/windows/windows.factor @@ -129,7 +129,7 @@ M: windows current-process-handle ( -- handle ) M: windows run-process* ( process -- handle ) [ - current-directory get (normalize-path) cd + current-directory get absolute-path cd dup make-CreateProcess-args tuck fill-redirection diff --git a/basis/io/monitors/linux/linux.factor b/basis/io/monitors/linux/linux.factor index 3e1e919217..7653eaa84c 100644 --- a/basis/io/monitors/linux/linux.factor +++ b/basis/io/monitors/linux/linux.factor @@ -36,7 +36,7 @@ TUPLE: linux-monitor < monitor wd inotify watches ; inotify-fd -rot inotify_add_watch dup io-error dup check-existing ; : add-watch ( path mask mailbox -- monitor ) - [ [ (normalize-path) ] dip [ (add-watch) ] [ drop ] 2bi ] dip + [ [ absolute-path ] dip [ (add-watch) ] [ drop ] 2bi ] dip [ ] [ ] [ wd>> ] tri watches get set-at ; : check-inotify ( -- ) diff --git a/basis/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor index 75dfd234a8..33477abdb6 100644 --- a/basis/io/monitors/recursive/recursive.factor +++ b/basis/io/monitors/recursive/recursive.factor @@ -95,7 +95,7 @@ M: recursive-monitor dispose* ready>> ?promise ?linked drop ; : ( path mailbox -- monitor ) - [ (normalize-path) ] dip + [ absolute-path ] dip recursive-monitor new-monitor H{ } clone >>children >>ready diff --git a/basis/io/sockets/secure/openssl/openssl.factor b/basis/io/sockets/secure/openssl/openssl.factor index 400a44ea02..ac0be4e936 100644 --- a/basis/io/sockets/secure/openssl/openssl.factor +++ b/basis/io/sockets/secure/openssl/openssl.factor @@ -25,7 +25,7 @@ TUPLE: openssl-context < secure-context aliens sessions ; : load-certificate-chain ( ctx -- ) dup config>> key-file>> [ - [ handle>> ] [ config>> key-file>> (normalize-path) ] bi + [ handle>> ] [ config>> key-file>> absolute-path ] bi SSL_CTX_use_certificate_chain_file ssl-error ] [ drop ] if ; @@ -56,7 +56,7 @@ TUPLE: openssl-context < secure-context aliens sessions ; : use-private-key-file ( ctx -- ) dup config>> key-file>> [ - [ handle>> ] [ config>> key-file>> (normalize-path) ] bi + [ handle>> ] [ config>> key-file>> absolute-path ] bi SSL_FILETYPE_PEM SSL_CTX_use_PrivateKey_file ssl-error ] [ drop ] if ; @@ -66,8 +66,8 @@ TUPLE: openssl-context < secure-context aliens sessions ; [ handle>> ] [ config>> - [ ca-file>> dup [ (normalize-path) ] when ] - [ ca-path>> dup [ (normalize-path) ] when ] bi + [ ca-file>> dup [ absolute-path ] when ] + [ ca-path>> dup [ absolute-path ] when ] bi ] bi SSL_CTX_load_verify_locations ] [ handle>> SSL_CTX_set_default_verify_paths ] if ssl-error ; diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor index 3564b32890..5e9d50058a 100755 --- a/basis/io/sockets/unix/unix.factor +++ b/basis/io/sockets/unix/unix.factor @@ -163,7 +163,7 @@ M: local sockaddr-size drop sockaddr-un heap-size ; M: local empty-sockaddr drop sockaddr-un ; M: local make-sockaddr - path>> (normalize-path) + path>> absolute-path dup length 1 + max-un-path > [ "Path too long" throw ] when sockaddr-un AF_UNIX >>family diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor index bede62c813..08474d4bdd 100755 --- a/basis/windows/shell32/shell32.factor +++ b/basis/windows/shell32/shell32.factor @@ -88,7 +88,7 @@ FUNCTION: HINSTANCE ShellExecuteW ( HWND hwnd, LPCTSTR lpOperation, LPCTSTR lpFi ALIAS: ShellExecute ShellExecuteW : open-in-explorer ( dir -- ) - [ f "open" ] dip (normalize-path) f f SW_SHOWNORMAL ShellExecute drop ; + [ f "open" ] dip absolute-path f f SW_SHOWNORMAL ShellExecute drop ; : shell32-directory ( n -- str ) f swap f SHGFP_TYPE_DEFAULT diff --git a/core/io/pathnames/pathnames-docs.factor b/core/io/pathnames/pathnames-docs.factor index 889f2262a8..d722c71747 100644 --- a/core/io/pathnames/pathnames-docs.factor +++ b/core/io/pathnames/pathnames-docs.factor @@ -101,15 +101,15 @@ HELP: normalize-path } } ; -HELP: (normalize-path) +HELP: absolute-path { $values { "path" "a pathname string" } { "path'" "a pathname string" } } { $description "Prepends the " { $link current-directory } " to the pathname and resolves a " { $snippet "resource:" } " prefix, if present." } -{ $notes "On Windows NT platforms, this word does not prepend the Unicode path prefix." } ; +{ $notes "This word is exaclty the same as " { $link normalize-path } ", except on Windows NT platforms, where it does not prepend the Unicode path prefix. Most code should call " { $link normalize-path } " instead." } ; -HELP: canonicalize-path +HELP: resolve-symlinks { $values { "path" "a pathname string" } { "path'" "a new pathname string" } } { $description "Outputs a path where none of the path components are symlinks. This word is useful for determining the actual path on disk where a file is stored; the root of this absolute path is a mount point in the file-system." } { $notes "Most code should not need to call this word except in very special circumstances. One use case is finding the actual file-system on which a file is stored." } ; @@ -150,11 +150,11 @@ ARTICLE: "io.pathnames" "Pathnames" } "Literal pathnames:" { $subsections POSTPONE: P" } -"Low-level words:" -{ $subsections - normalize-path - (normalize-path) - canonicalize-path -} ; +"Normalizing pathnames for use with native APIs:" +{ $subsections normalize-path } +"Outputting an absolute path from a path:" +{ $subsection absolute-path } +"Removing symlinks from a path:" +{ $subsections resolve-symlinks } ; ABOUT: "io.pathnames" diff --git a/core/io/pathnames/pathnames-tests.factor b/core/io/pathnames/pathnames-tests.factor index 7a98a47f42..f23a1ac1f4 100644 --- a/core/io/pathnames/pathnames-tests.factor +++ b/core/io/pathnames/pathnames-tests.factor @@ -61,7 +61,7 @@ IN: io.pathnames.tests "." current-directory set ".." "resource-path" set [ "../core/bootstrap/stage2.factor" ] - [ "resource:core/bootstrap/stage2.factor" (normalize-path) ] + [ "resource:core/bootstrap/stage2.factor" absolute-path ] unit-test ] with-scope diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor index e8672e6771..25eefd1105 100644 --- a/core/io/pathnames/pathnames.factor +++ b/core/io/pathnames/pathnames.factor @@ -127,38 +127,38 @@ PRIVATE> : path-components ( path -- seq ) normalize-path path-separator split harvest ; -HOOK: canonicalize-path os ( path -- path' ) +HOOK: resolve-symlinks os ( path -- path' ) -M: object canonicalize-path normalize-path ; +M: object resolve-symlinks normalize-path ; : resource-path ( path -- newpath ) "resource-path" get prepend-path ; GENERIC: vocab-path ( path -- newpath ) -GENERIC: (normalize-path) ( path -- path' ) +GENERIC: absolute-path ( path -- path' ) -M: string (normalize-path) +M: string absolute-path "resource:" ?head [ trim-head-separators resource-path - (normalize-path) + absolute-path ] [ "vocab:" ?head [ trim-head-separators vocab-path - (normalize-path) + absolute-path ] [ current-directory get prepend-path ] if ] if ; M: object normalize-path ( path -- path' ) - (normalize-path) ; + absolute-path ; TUPLE: pathname string ; C: pathname -M: pathname (normalize-path) string>> (normalize-path) ; +M: pathname absolute-path string>> absolute-path ; M: pathname <=> [ string>> ] compare ; diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index ded10b66cb..d64ef41f8c 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -139,11 +139,11 @@ PRIVATE> : fuel-scaffold-vocab ( root name devname -- ) [ fuel-scaffold-name dup [ scaffold-vocab ] dip ] with-scope - dup require vocab-source-path (normalize-path) fuel-eval-set-result ; + dup require vocab-source-path absolute-path fuel-eval-set-result ; : fuel-scaffold-help ( name devname -- ) [ fuel-scaffold-name dup require dup scaffold-help ] with-scope - vocab-docs-path (normalize-path) fuel-eval-set-result ; + vocab-docs-path absolute-path fuel-eval-set-result ; : fuel-scaffold-get-root ( name -- ) find-vocab-root fuel-eval-set-result ; diff --git a/extra/fuel/xref/xref.factor b/extra/fuel/xref/xref.factor index c228901afb..39ba3bd2b3 100644 --- a/extra/fuel/xref/xref.factor +++ b/extra/fuel/xref/xref.factor @@ -11,7 +11,7 @@ IN: fuel.xref [ first (normalize-path) ] [ drop f ] if ] + [ dup length 0 > [ first absolute-path ] [ drop f ] if ] [ dup length 1 > [ second ] [ drop 1 ] if ] bi ; : get-loc ( object -- loc ) normalize-loc 2array ; diff --git a/extra/geo-ip/geo-ip.factor b/extra/geo-ip/geo-ip.factor index d07ed4b69c..f23848ce30 100644 --- a/extra/geo-ip/geo-ip.factor +++ b/extra/geo-ip/geo-ip.factor @@ -14,7 +14,7 @@ CONSTANT: db-url "http://software77.net/cgi-bin/ip-country/geo-ip.pl?action=down : download-db ( -- path ) db-path dup exists? [ db-url over ".gz" append download-to - { "gunzip" } over ".gz" append (normalize-path) suffix try-process + { "gunzip" } over ".gz" append absolute-path suffix try-process ] unless ; TUPLE: ip-entry from to registry assigned city cntry country ; diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor index 22e37f8a8c..fc5af2286c 100755 --- a/extra/mason/common/common.factor +++ b/extra/mason/common/common.factor @@ -23,7 +23,7 @@ HOOK: really-delete-tree os ( path -- ) M: windows really-delete-tree #! Workaround: Cygwin GIT creates read-only files for #! some reason. - [ { "chmod" "ug+rw" "-R" } swap (normalize-path) suffix short-running-process ] + [ { "chmod" "ug+rw" "-R" } swap absolute-path suffix short-running-process ] [ delete-tree ] bi ; diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor index cbe2241604..3cad1577a1 100755 --- a/extra/space-invaders/space-invaders.factor +++ b/extra/space-invaders/space-invaders.factor @@ -65,7 +65,7 @@ CONSTANT: SOUND-WALK4 7 CONSTANT: SOUND-UFO-HIT 8 : init-sound ( index cpu filename -- ) - canonicalize-path swapd [ sounds>> nth AL_BUFFER ] dip + normalize-path swapd [ sounds>> nth AL_BUFFER ] dip create-buffer-from-wav set-source-param ; : init-sounds ( cpu -- ) diff --git a/misc/bash/cdfactor.sh b/misc/bash/cdfactor.sh index cee2d3ac77..f6d4e174c4 100755 --- a/misc/bash/cdfactor.sh +++ b/misc/bash/cdfactor.sh @@ -3,7 +3,7 @@ # change directories to a factor module function cdfactor { code=$(printf "USING: io io.pathnames vocabs vocabs.loader ; " - printf "\"%s\" vocab-source-path (normalize-path) print" $1) + printf "\"%s\" vocab-source-path absolute-path print" $1) echo $code > $HOME/.cdfactor fn=$(factor $HOME/.cdfactor) dn=$(dirname $fn) From fa0fc7381ce668fdd5ee662d8e8f489441accf5f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 28 Oct 2009 17:33:02 -0500 Subject: [PATCH 3/3] try absolute-path on space-invaders to appease openal --- extra/space-invaders/space-invaders.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor index 3cad1577a1..7dedb66d67 100755 --- a/extra/space-invaders/space-invaders.factor +++ b/extra/space-invaders/space-invaders.factor @@ -65,7 +65,7 @@ CONSTANT: SOUND-WALK4 7 CONSTANT: SOUND-UFO-HIT 8 : init-sound ( index cpu filename -- ) - normalize-path swapd [ sounds>> nth AL_BUFFER ] dip + absolte-path swapd [ sounds>> nth AL_BUFFER ] dip create-buffer-from-wav set-source-param ; : init-sounds ( cpu -- )