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

file->x: ignore file-size errors

Browse Source
This commit is contained in:
Ben Greenman 2020-02-25 14:24:54 -05:00 committed by Sam Tobin-Hochstadt
parent d52c845454
commit 098d4c789a
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/racket-test-core/tests/racket/filelib.rktl
View File

@ -29,17 +29,6 @@
(test #"\"\316\273\"" file->bytes tmp-name)
(test "\u03BB" file->value tmp-name)
(when (file-exists? tmp-name) (delete-file tmp-name))
(define-syntax-rule (err/rt-exists-test (op arg ...))
(err/rt-test (op arg ...) (check-exists 'op)))
(define (check-exists op)
(lambda (exn)
(regexp-match? (format "^~a: .* file-exists\\?" op) (exn-message exn))))
(err/rt-exists-test (file->value tmp-name))
(err/rt-exists-test (file->list tmp-name))
(err/rt-exists-test (file->string tmp-name))
(err/rt-exists-test (file->bytes tmp-name))
(err/rt-exists-test (file->lines tmp-name))
(err/rt-exists-test (file->bytes-lines tmp-name))
(delete-directory tmp-dir)
(define-syntax-rule (err/rt-chk-test (op arg ...))

17
racket/collects/racket/file.rkt
View File

@ -752,20 +752,19 @@
new (cons base new)))
(loop (cdr paths) (append (reverse new) r))))))))
(define (check-path-exists who f)
(define (check-path who f)
(unless (path-string? f)
(raise-argument-error who "path-string?" f))
(unless (file-exists? f)
(raise-argument-error who "file-exists?" f)))
(raise-argument-error who "path-string?" f)))
(define (check-file-mode who file-mode)
(unless (memq file-mode '(binary text))
(raise-argument-error who "(or/c 'binary 'text)" file-mode)))
(define (file->x who f file-mode read-x x-append)
(check-path-exists who f)
(check-path who f)
(check-file-mode who file-mode)
(let ([sz (file-size f)])
(let ([sz (with-handlers ([exn:fail:filesystem? (lambda (_) 0)])
(file-size f))])
(call-with-input-file* f #:mode file-mode
(lambda (in)
;; There's a good chance that `file-size' gets all the data:
@ -783,12 +782,12 @@
(file->x 'file->bytes f mode read-bytes bytes-append))
(define (file->value f #:mode [file-mode 'binary])
(check-path-exists 'file->value f)
(check-path 'file->value f)
(check-file-mode 'file->value file-mode)
(call-with-input-file* f #:mode file-mode read))
(define (file->list f [r read] #:mode [file-mode 'binary])
(check-path-exists 'file->list f)
(check-path 'file->list f)
(check-file-mode 'file->list file-mode)
(unless (and (procedure? r) (procedure-arity-includes? r 1))
(raise-argument-error 'file->list "(procedure-arity-includes/c 1)" r))
@ -796,7 +795,7 @@
(lambda (p) (for/list ([v (in-port r p)]) v))))
(define (file->x-lines who f line-mode file-mode read-line)
(check-path-exists who f)
(check-path who f)
(check-mode who line-mode)
(check-file-mode who file-mode)
(call-with-input-file* f #:mode file-mode