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

cs: avoid crash on startup if the working directory does not exist

Browse Source 
Closes #3793
This commit is contained in:
Matthew Flatt 2021-04-21 11:07:59 -06:00
parent 9753eb6fb0
commit 725a7e353c
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
racket/src/cs/io.sls
View File

@ -532,7 +532,7 @@
(include "include.ss") (include "include.ss")
(include-generated "io.scm") (include-generated "io.scm")
;; Initialize: ;; Initialize:
(set-log-system-message! (lambda (level str) (set-log-system-message! (lambda (level str)
(1/log-message (|#%app| 1/current-logger) level str #f))) (1/log-message (|#%app| 1/current-logger) level str #f)))
(set-error-display-eprintf! (lambda (fmt . args) (set-error-display-eprintf! (lambda (fmt . args)

15
racket/src/cs/schemified/io.scm
View File

@ -30352,11 +30352,16 @@
(define set-run-file! (lambda (p_0) (set! run-file p_0))) (define set-run-file! (lambda (p_0) (set! run-file p_0)))
(define orig-dir (define orig-dir
(let ((os-host-dir_0 (let ((os-host-dir_0
(|#%app| (let ((dir_0
rktio_to_bytes (|#%app|
(|#%app| rktio_get_current_directory
rktio_get_current_directory (unsafe-place-local-ref cell.1))))
(unsafe-place-local-ref cell.1))))) (if (vector? dir_0)
(let ((tmp_0 (system-path-convention-type)))
(if (eq? tmp_0 'unix)
#vu8(47)
(if (eq? tmp_0 'windows) #vu8(67 58 92) (void))))
(|#%app| rktio_to_bytes dir_0)))))
(let ((os-dir_0 (1/path->directory-path (host-> os-host-dir_0)))) (let ((os-dir_0 (1/path->directory-path (host-> os-host-dir_0))))
(let ((tmp_0 (system-type 'os))) (let ((tmp_0 (system-type 'os)))
(if (eq? tmp_0 'windows) (if (eq? tmp_0 'windows)

9
racket/src/io/path/system.rkt
View File

@ -71,7 +71,14 @@
(define orig-dir (define orig-dir
(let () (let ()
(define os-host-dir (rktio_to_bytes (rktio_get_current_directory rktio))) (define os-host-dir (let ([dir (rktio_get_current_directory rktio)])
(if (rktio-error? dir)
;; If there's an error getting the current directory,
;; just use a root directory
(case (system-path-convention-type)
[(unix) #"/"]
[(windows) #"C:\\"])
(rktio_to_bytes dir))))
(define os-dir (path->directory-path (host-> os-host-dir))) (define os-dir (path->directory-path (host-> os-host-dir)))
(case (system-type 'os) (case (system-type 'os)
[(windows) os-dir] [(windows) os-dir]