Changeset 8251

Timestamp:

Jan 23, 2008, 7:33:13 AM (17 years ago)

Author:

Gary Byers

Message:

some other CREATE-FILE :IF-EXISTS cases, just in case

File:

• branches/working-0711/ccl/level-1/l1-files.lisp (modified) (2 diffs)

branches/working-0711/ccl/level-1/l1-files.lisp

@@ -184 +184 @@
 
 (defun create-file (path &key (if-exists :error) (create-directory t))
-  (native-to-pathname (%create-file path :if-exists if-exists
+  (let* ((p (%create-file path :if-exists if-exists
                                       :create-directory create-directory)))
+    (and p
+         (native-to-pathname p))))
+
 (defun %create-file (path &key
                          (if-exists :error)
@@ -195 +198 @@
   (assert (or (eql if-exists :overwrite)
               (null if-exists)
+              (eq if-exists :error)
               (not (probe-file path))) ()
           "~s ~s not implemented yet" :if-exists if-exists)
   (let* ((unix-name (native-translated-namestring path))
          (fd (fd-open unix-name (logior #$O_WRONLY #$O_CREAT #$O_TRUNC
-                                        (if (null if-exists)
+                                        (if (or (null if-exists)
+                                                (eq if-exists :error))
                                           #$O_EXCL
                                           0)))))
     (if (< fd 0)
-      (if (eql fd (- #$EEXIST))         ;#$O_EXCL was set and file existed
+      (if (and (null if-exists)
+               (eql fd (- #$EEXIST)))
         (return-from %create-file nil)
         (signal-file-error fd path))