suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Careful when composing simplify-path' and expand-path'

Browse Source 
svn: r4478
This commit is contained in:
Eli Barzilay 2006-10-04 17:50:42 +00:00
parent c1cc293cd5
commit 9cb8f01a09
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/setup/dirs.ss
View File

@ -10,8 +10,10 @@
;; best to do some minor normalization. This is similar to what
;; "main-collects.ss" does. Again, this makes mzscheme expand paths
;; that begin with `~'.
;; Note: (expand-path (simplify-path P #f)) is bogus, if P is
;; "./~foo" or "~foo/.."
(define (system-path* what)
(expand-path (simplify-path (find-system-path what) #f)))
(simplify-path (expand-path (find-system-path what) #f)))
;; ----------------------------------------
;; "collects"

4
collects/setup/main-collects.ss
View File

@ -23,8 +23,10 @@
;; fine: getting rid of `.' and `..' (simplify-path) and collapsing
;; `//' to `/' (expand-path). Using `expand-path' also expands `~'
;; and `~user', but this should not be a problem in practice.
;; Note: (expand-path (simplify-path P)) is bogus, if P is "./~foo"
;; or "~foo/.."
(define (simplify-bytes-path bytes)
(path->bytes (expand-path (simplify-path (bytes->path bytes)))))
(path->bytes (simplify-path (expand-path (bytes->path bytes)))))
;; on Windows, turn backslashes to forward slashes
(define simplify-path*
(if (eq? 'windows (system-type))