GitLab

at 2025-01-01T04:58:21+00:00

Fix #135: (unix-namestring ".") should be "./"

Merge branch 'issue-135-unix-namestring-dot' into 'master'

Fix #135: (unix-namestring ".") should be "./"

Closes #135

See merge request cmucl/cmucl!94
 				   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))))

 		 :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

 		  ".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*)

Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

2 changed files:

Changes: