January 2025 - cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Fix typo in exporting with-temporary-file/directory stuff
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 2c0e07e6 by Raymond Toy at 2025-01-01T13:44:19-08:00 Fix typo in exporting with-temporary-file/directory stuff - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1719,8 +1719,9 @@ "STRING-ENCODE" "STRING-DECODE" "SET-SYSTEM-EXTERNAL-FORMAT") ;; Temporary files/directories - "WITH-TEMPORARY-FILE" - "WITH-TEMPORARY-DIRECTORY") + (:export + "WITH-TEMPORARY-FILE" + "WITH-TEMPORARY-DIRECTORY")) (defpackage "STREAM" (:import-from "SYSTEM" "LISP-STREAM") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2c0e07e6eb887375b62270a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2c0e07e6eb887375b62270a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Export with-temporary-{file,directory}
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 14c6f722 by Raymond Toy at 2025-01-01T11:29:01-08:00 Export with-temporary-{file,directory} - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1717,7 +1717,10 @@ "DESCRIBE-EXTERNAL-FORMAT" "LIST-ALL-EXTERNAL-FORMATS" "STRING-ENCODE" "STRING-DECODE" - "SET-SYSTEM-EXTERNAL-FORMAT")) + "SET-SYSTEM-EXTERNAL-FORMAT") + ;; Temporary files/directories + "WITH-TEMPORARY-FILE" + "WITH-TEMPORARY-DIRECTORY") (defpackage "STREAM" (:import-from "SYSTEM" "LISP-STREAM") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/14c6f72214d97ef1a38b658… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/14c6f72214d97ef1a38b658… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Add unix-mkdtemp and with-temporary-directory
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 146b616f by Raymond Toy at 2025-01-01T11:24:46-08:00 Add unix-mkdtemp and with-temporary-directory Add `unix-mkdtemp` as a very basic interface to `mkdtemp` that returns the name of the directory. The macro `ext:with-temporary-directory` creates a temporary directory with the given prefix and executes the body with the name of the directory. On completion, the directory is removed. - - - - - 2 changed files: - src/code/extensions.lisp - src/code/unix.lisp Changes: ===================================== src/code/extensions.lisp ===================================== @@ -22,7 +22,8 @@ read-char-no-edit listen-skip-whitespace concat-pnames iterate once-only collect do-anonymous undefined-value required-argument define-hash-cache defun-cached - cache-hash-eq do-hash)) + cache-hash-eq do-hash + with-temporary-file)) (import 'lisp::whitespace-char-p) @@ -622,7 +623,7 @@ decoding-error encoding-error) &parse-body (forms decls)) - "A temporary file is opened using the Open-args and bound to the + _N"A temporary file is opened using the Open-args and bound to the variable Var. The name of the temporary file uses Template-prefix for the name. If the temporary file cannot be opened, the forms are not evaluated. The Forms are executed, and when they terminate, @@ -639,19 +640,19 @@ (template (gensym "TEMPLATE-"))) `(let* ((,template (concatenate 'string - ,template-prefix - "XXXXXX")) - (,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) - :auto-close t - :file ,template - :output t - :input t - :element-type ',element-type - :external-format ,external-format - :decoding-error ,decoding-error - :encoding-error ,encoding-error - :buffering ,buffering)) - (,abortp t)) + ,template-prefix + "XXXXXX")) + (,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) + :auto-close t + :file ,template + :output t + :input t + :element-type ',element-type + :external-format ,external-format + :decoding-error ,decoding-error + :encoding-error ,encoding-error + :buffering ,buffering)) + (,abortp t)) ,@decls (unwind-protect (multiple-value-prog1 @@ -659,3 +660,21 @@ (setq ,abortp nil)) (when ,var (close ,var :abort ,abortp)))))) + +;; WITH-TEMPORARY-DIRECTORY -- Public +(defmacro with-temporary-directory ((var template-prefix) + &parse-body (forms decls)) + _N"Create a temporary directory using Template-prefix as the name of the directory." + (let ((template (gensym "TEMPLATE-"))) + `(let ((,template (concatenate 'string ,template-prefix + "XXXXXX"))) + ,@decls + (let ((,var (unix::unix-mkdtemp ,template))) + (unless ,var + (error "Could not create temporary directory using template ~A" + ,template)) + (unwind-protect + (multiple-value-prog1 + (progn ,@forms))) + ;; Remove the directory + (unix:unix-rmdir ,var))))) ===================================== src/code/unix.lisp ===================================== @@ -2909,3 +2909,33 @@ (syscall ("mkstemp" c-call:c-string) result (copy-seq template))) + +(defun unix-mkdtemp (template) + _N"Generate a uniquely named temporary directory from Template, + which must have \"XXXXXX\" as the last six characters. The + directory is created with permissions 0700. The name of the + directory is returned." + (let* ((new-template (copy-seq template)) + (result (alien-funcall + (extern-alien "mkdtemp" + (function (* char) + c-call:c-string)) + new-template))) + (if (zerop (deref result 0)) + (values nil (unix-errno)) + (cast result c-call:c-string)))) + +(defun unix-mkdtemp (template) + _N"Generate a uniquely named temporary directory from Template, + which must have \"XXXXXX\" as the last six characters. The + directory is created with permissions 0700. The name of the + directory is returned." + (let* ((new-template (copy-seq template)) + (result (alien-funcall + (extern-alien "mkdtemp" + (function (* char) + c-call:c-string)) + new-template))) + (if (zerop (sap-int (alien-sap result))) + (values nil (unix-errno)) + (cast result c-string)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/146b616fc2a125d60205534… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/146b616fc2a125d60205534… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-364-add-mkstemp-mkdtemp] Clean up interface and implementation of with-temporary-file
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl Commits: 0f8de51f by Raymond Toy at 2025-01-01T10:37:58-08:00 Clean up interface and implementation of with-temporary-file Explicitly define the allowed keyword args. Update docstring accordingly. - - - - - 1 changed file: - src/code/extensions.lisp Changes: ===================================== src/code/extensions.lisp ===================================== @@ -614,20 +614,43 @@ `(lisp::pointer-hash ,x)) ;;; WITH-TEMPORARY-FILE -- Public -(defmacro with-temporary-file ((var template-prefix &rest open-args) &parse-body (forms decls)) +(defmacro with-temporary-file ((var template-prefix + &key + (element-type 'base-char) + (external-format :default) + (buffering :full) + decoding-error + encoding-error) + &parse-body (forms decls)) "A temporary file is opened using the Open-args and bound to the variable Var. The name of the temporary file uses Template-prefix for the name. If the temporary file cannot be opened, the forms are not evaluated. The Forms are executed, and when they terminate, - normally or otherwise, the file is closed and deleted." + normally or otherwise, the file is closed. + + Defined keywords: + :element-type - Type of object to read or write. Default BASE-CHAR + :external-format - An external format name + :buffering - Buffering to use for the file. Must be one of + :NONE, :LINE, :FULL + :decoding-error - How to handle decoding errors. See OPEN + :encoding-error - How to handle encoding errors. See OPEN" (let ((abortp (gensym)) (template (gensym "TEMPLATE-"))) + `(let* ((,template (concatenate 'string ,template-prefix "XXXXXX")) (,var (lisp::make-fd-stream (unix::unix-mkstemp ,template) + :auto-close t :file ,template - ,@open-args)) + :output t + :input t + :element-type ',element-type + :external-format ,external-format + :decoding-error ,decoding-error + :encoding-error ,encoding-error + :buffering ,buffering)) (,abortp t)) ,@decls (unwind-protect View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0f8de51f7cb454d13a87218… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0f8de51f7cb454d13a87218… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-364-add-mkstemp-mkdtemp
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed new branch issue-364-add-mkstemp-mkdtemp at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-364-add-mkstemp-mkd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #135: (unix-namestring ".") should be "./"
by Raymond Toy (＠rtoy) 01 Jan '25

01 Jan '25

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 0a51daf2 by Raymond Toy at 2025-01-01T04:58:21+00:00 Fix #135: (unix-namestring ".") should be "./" - - - - - fbe6f2d6 by Raymond Toy at 2025-01-01T04:58:21+00:00 Merge branch 'issue-135-unix-namestring-dot' into 'master' Fix #135: (unix-namestring ".") should be "./" Closes #135 See merge request cmucl/cmucl!94 - - - - - 2 changed files: - src/code/filesys.lisp - tests/issues.lisp Changes: ===================================== src/code/filesys.lisp ===================================== @@ -721,7 +721,7 @@ verify-existence follow-links nil function)) (:relative - (%enumerate-directories "" (cdr directory) pathname + (%enumerate-directories "./" (cdr directory) pathname verify-existence follow-links nil function))) (%enumerate-files "" pathname verify-existence function)))) @@ -1110,11 +1110,6 @@ optionally keeping some of the most recent old versions." :pathname file :format-control (intl:gettext "~S doesn't exist.") :format-arguments (list file))) - ;; unix-namestring converts "." to "". Convert it back to - ;; "." so we can stat the current directory. (Perhaps - ;; that's a bug in unix-namestring?) - (when (zerop (length name)) - (setf name ".")) (let (author) (unwind-protect (progn ===================================== tests/issues.lisp ===================================== @@ -707,6 +707,33 @@ ".txt") *test-path*)))) +(define-test issue.135 + (:tag :issues) + (assert-equalp "./" (ext:unix-namestring ".")) + (unwind-protect + (progn + ;; Create a test file in the current directory. + ;; unix-namestring requires files to exist to be able to + ;; return the namestring. + (with-open-file (f1 "foo.txt" + :direction :output + :if-exists :supersede) + (print "foo" f1)) + ;; Check unix-namestring and verify that converting the + ;; namestring to a pathname results in the same pathname + ;; object as expected. + (let ((foo (ext:unix-namestring "foo.txt"))) + (assert-equalp "foo.txt" foo) + (assert-equalp (make-pathname :name "foo" :type "txt") + (pathname foo))) + (let ((bar (ext:unix-namestring "src/code/filesys.lisp"))) + (assert-equalp "./src/code/filesys.lisp" bar) + (assert-equalp (make-pathname :directory '(:relative "src" "code") + :name "filesys" + :type "lisp") + (pathname bar)))) + (assert-true (delete-file "foo.txt")))) + (define-test issue.139-default-external-format (:tag :issues) (assert-eq :utf-8 stream:*default-external-format*) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5d83f1356e1072ab08e642… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5d83f1356e1072ab08e642… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0