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

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Fix typo in unix-mkdtemp
by Raymond Toy (＠rtoy) 03 Feb '25

03 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 144065ee by Raymond Toy at 2025-02-03T10:16:16-08:00 Fix typo in unix-mkdtemp We were returning from `unix-mkstemp` instead of `unix-mkdtemp`. - - - - - 1 changed file: - src/code/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2957,7 +2957,7 @@ returned." ;; Make sure the template is valid. (unless (check-template template) - (return-from unix-mkstemp + (return-from unix-mkdtemp (values nil einval))) (let* ((format (if (eql *filename-encoding* :null) :iso8859-1 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/144065ee00adb189d558ddd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/144065ee00adb189d558ddd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] 2 commits: Enforce 6 X's in template for mkstemp/mkdtemp
by Raymond Toy (＠rtoy) 03 Feb '25

03 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 3b6909fe by Raymond Toy at 2025-02-03T07:26:09-08:00 Enforce 6 X's in template for mkstemp/mkdtemp Our API enforces the template to have exactly 6 X's at the end of the template. This is only a problem on Darwin which allows 0 or more X's. Also re-enable the tests for too few X's on Darwin and add tests for too many X's. - - - - - 2759e80f by Raymond Toy at 2025-02-03T07:28:50-08:00 Add tests for template that doesn't end in X's. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2904,6 +2904,15 @@ (function (* char)))) c-string)) +(defun check-template (template) + ;; Make sure the template ends with exactly 6 X's and no more. + (let ((last-non-x (position-if-not #'(lambda (c) + (char= c #\X)) + template + :from-end t))) + (and last-non-x + (= last-non-x (- (length template) 7))))) + (defun unix-mkstemp (template) _N"Generates a unique temporary file name from TEMPLATE, and creates and opens the file. On success, the corresponding file descriptor @@ -2911,6 +2920,10 @@ code is returned. The last six characters of the template must be \"XXXXXX\"." + ;; Make sure the template is valid. + (unless (check-template template) + (return-from unix-mkstemp + (values nil einval))) (let* ((format (if (eql *filename-encoding* :null) :iso8859-1 *filename-encoding*)) @@ -2942,6 +2955,10 @@ If the directory cannot be created NIL and the UNIX error code is returned." + ;; Make sure the template is valid. + (unless (check-template template) + (return-from unix-mkstemp + (values nil einval))) (let* ((format (if (eql *filename-encoding* :null) :iso8859-1 *filename-encoding*)) ===================================== tests/unix.lisp ===================================== @@ -47,18 +47,29 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) -;; Darwin allows any number of X's (including 0!) in the template but -;; Linux requires exactly 6. Hence skip this test. -#-darwin (define-test mkstemp.bad-template (:tag :issues) (multiple-value-bind (fd errno) (unix::unix-mkstemp "test-") ;; The template doesn't have enough X's so the FD should be NIL, ;; and a positive Unix errno value should be returned. - ;; - ;; Note that Darwin allows any number of X's (including 0!) in the - ;; template but Linux requires exactly 6. + (assert-false fd) + (assert-true (and (integerp errno) (plusp errno))))) + +(define-test mkstemp.bad-template.2 + (:tag :issues) + (multiple-value-bind (fd errno) + (unix::unix-mkstemp "test-XXXXXXX") + ;; The template has too many X's so the FD should be NIL, and a + ;; positive Unix errno value should be returned. + (assert-false fd) + (assert-true (and (integerp errno) (plusp errno))))) + +(define-test mkstemp.bad-template.3 + (:tag :issues) + (multiple-value-bind (fd errno) + (unix::unix-mkstemp "test-XXXXXXa") + ;; The template doesn't end in X's (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) @@ -100,9 +111,6 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) -;; Darwin allows any number of X's (including 0!) in the template but -;; Linux requires exactly 6. Hence skip this test. -#-darwin (define-test mkdtemp.bad-template (:tag :issues) (multiple-value-bind (result errno) @@ -111,3 +119,19 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) +(define-test mkdtemp.bad-template.2 + (:tag :issues) + (multiple-value-bind (result errno) + (unix::unix-mkdtemp "dir-XXXXXXX") + ;; Too many X's in template. + (assert-false result) + (assert-true (and (integerp errno) (plusp errno))))) + +(define-test mkdtemp.bad-template.2 + (:tag :issues) + (multiple-value-bind (result errno) + (unix::unix-mkdtemp "dir-XXXXXXa") + ;; Template doesn't end in X's + (assert-false result) + (assert-true (and (integerp errno) (plusp errno))))) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7275edf3ac0d0ab37d1dc7… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7275edf3ac0d0ab37d1dc7… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Disable bad template tests on Darwin
by Raymond Toy (＠rtoy) 03 Feb '25

03 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 7275edf3 by Raymond Toy at 2025-02-02T16:01:15-08:00 Disable bad template tests on Darwin Darwin bizarrely allows 0(!) or more X's in the template, so our test for a bad template can't work on Darwin. Disable them. - - - - - 1 changed file: - tests/unix.lisp Changes: ===================================== tests/unix.lisp ===================================== @@ -47,6 +47,9 @@ (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin allows any number of X's (including 0!) in the template but +;; Linux requires exactly 6. Hence skip this test. +#-darwin (define-test mkstemp.bad-template (:tag :issues) (multiple-value-bind (fd errno) @@ -54,9 +57,8 @@ ;; The template doesn't have enough X's so the FD should be NIL, ;; and a positive Unix errno value should be returned. ;; - ;; Note that Darwin allows any number of X's in the template but - ;; Linux requires exactly 6. Just test with no X's to handle all - ;; OSes. + ;; Note that Darwin allows any number of X's (including 0!) in the + ;; template but Linux requires exactly 6. (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) @@ -98,6 +100,9 @@ (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) +;; Darwin allows any number of X's (including 0!) in the template but +;; Linux requires exactly 6. Hence skip this test. +#-darwin (define-test mkdtemp.bad-template (:tag :issues) (multiple-value-bind (result errno) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7275edf3ac0d0ab37d1dc79… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/7275edf3ac0d0ab37d1dc79… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] 3 commits: Simplify mkdtemp and fix error in mkstemp
by Raymond Toy (＠rtoy) 02 Feb '25

02 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 544a6787 by Raymond Toy at 2025-02-01T15:59:09-08:00 Simplify mkdtemp and fix error in mkstemp Since mkdtemp returns a pointer to the resulting directory name, we can convert that to the desired lisp string. In mkstemp, we were converting the resulting buffer to a string but we had `:end (1- length)`. It should be `:end length` to get all the characters. - - - - - 0111bb50 by Raymond Toy at 2025-02-01T16:34:20-08:00 Add tests with template with non-ascii char Add a test for mkstemp and mkdtemp where the template name contains a non-ascii char (lower case alpha) to test the we convert the returned name to a Lisp string correctly. - - - - - 6e0378ea by Raymond Toy at 2025-02-01T16:35:27-08:00 Need to convert the return result of mkdtemp Forgot that we need to encode the result to a proper UTF-16 Lisp string. - - - - - 2 changed files: - src/code/unix.lisp - tests/unix.lisp Changes: ===================================== src/code/unix.lisp ===================================== @@ -2930,7 +2930,7 @@ ;; Convert the array of octets in BUFFER back to ;; a Lisp string. (stream:octets-to-string buffer - :end (1- length) + :end length :external-format format)) (sys:vector-sap buffer)))) @@ -2965,6 +2965,4 @@ ;; resulting name. Otherwise, return NIL and the errno. (if (null-alien result) (values nil (unix-errno)) - (values (stream:octets-to-string buffer - :end (1- length) - :external-format format)))))) + (%file->name (cast result c-call:c-string)))))) ===================================== tests/unix.lisp ===================================== @@ -17,6 +17,26 @@ (when fd (unix:unix-unlink name))))) +(define-test mkstemp.name-returned.2 + (:tag :issues) + (let ((unix::*filename-encoding* :utf-8) + fd name) + (unwind-protect + (progn + ;; Temp name starts with a lower case alpha character. + (let* ((template (concatenate 'string (string #\u+3b1) + "test-XXXXXX")) + (x-posn (position #\X template))) + (multiple-value-setq (fd name) + (unix::unix-mkstemp template)) + (assert-true fd) + (assert-false (search "XXXXXX" name) + name) + (assert-true (string= name template :end1 x-posn :end2 x-posn) + name))) + (when fd + (unix:unix-unlink name))))) + (define-test mkstemp.bad-path (:tag :issues) (multiple-value-bind (fd errno) @@ -52,6 +72,25 @@ (when name (unix:unix-rmdir name))))) +(define-test mkdtemp.name-returned.2 + (:tag :issues) + (let ((unix::*filename-encoding* :utf-8) + name) + (unwind-protect + (progn + ;; Temp name starts with a lower case alpha character. + (let* ((template (concatenate 'string (string #\u+3b1) + "dir-XXXXXX")) + (x-posn (position #\X template))) + (setf name (unix::unix-mkdtemp template)) + ;; Verify that the dir name no longer has X's. + (assert-true (stringp name)) + (assert-false (search "XXXXXX" name)) + (assert-true (string= name template :end1 x-posn :end2 x-posn) + name x-posn))) + (when name + (unix:unix-rmdir name))))) + (define-test mkdtemp.bad-path (:tag :issues) (multiple-value-bind (result errno) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/15501db4886ad26a943e1c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/15501db4886ad26a943e1c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-375-mkstemp-return-filename] Update bad template tests for Darwin
by Raymond Toy (＠rtoy) 01 Feb '25

01 Feb '25

Raymond Toy pushed to branch issue-375-mkstemp-return-filename at cmucl / cmucl Commits: 15501db4 by Raymond Toy at 2025-02-01T09:11:11-08:00 Update bad template tests for Darwin Darwin seems to require at least one X in the template, unlike Linux which requires 6. Update the test for bad templates for both mkstemp and mkdtemp to have no X's in the template. - - - - - 1 changed file: - tests/unix.lisp Changes: ===================================== tests/unix.lisp ===================================== @@ -30,9 +30,13 @@ (define-test mkstemp.bad-template (:tag :issues) (multiple-value-bind (fd errno) - (unix::unix-mkstemp "test-XXXXX") + (unix::unix-mkstemp "test-") ;; The template doesn't have enough X's so the FD should be NIL, ;; and a positive Unix errno value should be returned. + ;; + ;; Note that Darwin allows any number of X's in the template but + ;; Linux requires exactly 6. Just test with no X's to handle all + ;; OSes. (assert-false fd) (assert-true (and (integerp errno) (plusp errno))))) @@ -58,7 +62,8 @@ (define-test mkdtemp.bad-template (:tag :issues) (multiple-value-bind (result errno) - (unix::unix-mkdtemp "dir-XXXXX") + (unix::unix-mkdtemp "dir-") + ;; No X's in template, like for mkstemp.bad-template test. (assert-false result) (assert-true (and (integerp errno) (plusp errno))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/15501db4886ad26a943e1c0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/15501db4886ad26a943e1c0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-375-mkstemp-return-filename
by Raymond Toy (＠rtoy) 01 Feb '25

01 Feb '25

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

1 0