Align cwd and umask.
This commit is contained in:
parent
b4312d028c
commit
87d82f5011
|
@ -37,6 +37,8 @@
|
||||||
;;; Abstract out common code for create-{directory,fifo,hard-link,symlink}:
|
;;; Abstract out common code for create-{directory,fifo,hard-link,symlink}:
|
||||||
|
|
||||||
(define (create-file-thing fname makeit override? op-name syscall)
|
(define (create-file-thing fname makeit override? op-name syscall)
|
||||||
|
(with-cwd-aligned
|
||||||
|
(with-umask-aligned
|
||||||
(let ((query (lambda ()
|
(let ((query (lambda ()
|
||||||
(y-or-n? (string-append op-name ": " fname
|
(y-or-n? (string-append op-name ": " fname
|
||||||
" already exists. Delete")))))
|
" already exists. Delete")))))
|
||||||
|
@ -57,7 +59,7 @@
|
||||||
#f))))
|
#f))))
|
||||||
(if (list? result)
|
(if (list? result)
|
||||||
(apply errno-error result)
|
(apply errno-error result)
|
||||||
(if #f #f)))))
|
(if #f #f)))))))
|
||||||
|
|
||||||
;;;;;;;
|
;;;;;;;
|
||||||
|
|
||||||
|
@ -106,10 +108,11 @@
|
||||||
;;; us not to. That's life in the food chain.
|
;;; us not to. That's life in the food chain.
|
||||||
|
|
||||||
(define (rename-file old-fname new-fname . maybe-override?)
|
(define (rename-file old-fname new-fname . maybe-override?)
|
||||||
|
(with-cwd-aligned
|
||||||
(let ((override? (:optional maybe-override? #f)))
|
(let ((override? (:optional maybe-override? #f)))
|
||||||
(if (or (and override? (not (eq? override? 'query)))
|
(if (or (and override? (not (eq? override? 'query)))
|
||||||
(file-not-exists? new-fname)
|
(file-not-exists? new-fname)
|
||||||
(and override?
|
(and override?
|
||||||
(y-or-n? (string-append "rename-file:" new-fname
|
(y-or-n? (string-append "rename-file:" new-fname
|
||||||
" already exists. Delete"))))
|
" already exists. Delete"))))
|
||||||
(%rename-file old-fname new-fname))))
|
(%rename-file old-fname new-fname)))))
|
||||||
|
|
Loading…
Reference in New Issue