use bytes->string/locale to translate paths-as-bytes to strings
svn: r5318
This commit is contained in:
parent
2589d4fc0d
commit
89ce220ed9
|
@ -4,12 +4,9 @@
|
|||
(let* ([p (syntax-source stx)]
|
||||
[dir (and (path? p) (let-values ([(b _1 _2) (split-path p)]) b))]
|
||||
[name (and (path? dir)
|
||||
;; path->string + bytes->path is a hack to get a proper
|
||||
;; string because there is no path-element->string
|
||||
(path->string
|
||||
(bytes->path
|
||||
(bytes->string/locale
|
||||
(path-element->bytes
|
||||
(let-values ([(_1 p _2) (split-path dir)]) p)))))])
|
||||
(let-values ([(_1 p _2) (split-path dir)]) p))))])
|
||||
;; check that we are installed as a top-level collection (this is needed
|
||||
;; because there are some code bits (that depend on bindings from this
|
||||
;; file) that expect this to be true)
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
(define (path->pname path isdir?)
|
||||
(let* ([name (if (member (path->string path) '("." ".."))
|
||||
(path->string path) ; avoid segfault bug (PR8481)
|
||||
(bytes->string/utf-8 (path-element->bytes path)))]
|
||||
(bytes->string/locale (path-element->bytes path)))]
|
||||
[name (regexp-replace end-separators-rx name "")]
|
||||
[name (if (<= 199 (string-length name))
|
||||
(string-append (substring name 0 195) "...")
|
||||
|
|
Loading…
Reference in New Issue
Block a user