Changeset 14404

Timestamp:

Nov 3, 2010, 7:09:15 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

Update %RMDIR to remove a trailing #\/ at the lisp level, instead of
doing C-style tricks.

On a Windows system, WITH-FILENAME-CSTRS produces a UTF-16LE-encoded
string, where each character corresponds to (at least) two bytes.

Consider the following case:

(defparameter *name* (format nil "c:/~czz/" #\u+2f2f))
(%mkdir *name* #o666)
(%rmdir *name*) => returns non-zero

The trailing #\/ is at index 6. The old code would therefore look at
byte offset 6, which, in this contrived example, is #x2f, or in other
words, (char-code #\/). The code replacs it with a #\null, and
confusion ensues.

File:

• trunk/source/level-1/linux-files.lisp (modified) (1 diff)

trunk/source/level-1/linux-files.lisp

@@ -296 +296 @@
 (defun %rmdir (name)
   (let* ((last (1- (length name))))
+    (when (and (>= last 0)
+               (eql (char name last) #\/))
+      (setq name (subseq name 0 last)))
     (with-filename-cstrs ((name name))
-      (when (and (>= last 0)
-                 (eql (%get-byte name last) (char-code #\/)))
-        (setf (%get-byte name last) 0))
       (int-errno-call (#+windows-target #__wrmdir #-windows-target #_rmdir  name)))))