Permalink
Browse files

Merge branch 'master' into mswinmt

  • Loading branch information...
2 parents 1fad714 + 6548750 commit 73190fb77662470ecc124d73489280df936f2cad @akovalenko committed Jan 18, 2012
Showing with 12 additions and 4 deletions.
  1. +3 −2 contrib/sb-posix/interface.lisp
  2. +2 −2 contrib/sb-posix/posix-tests.lisp
  3. +7 −0 src/runtime/bsd-os.c
@@ -770,8 +770,9 @@ not supported."
result)))
(export 'utime :sb-posix)
(defun utime (filename &optional access-time modification-time)
- (let ((fun (extern-alien "utime" (function int (c-string :not-null t)
- (* alien-utimbuf))))
+ (let ((fun (extern-alien #-netbsd "utime" #+netbsd "_utime"
+ (function int (c-string :not-null t)
+ (* alien-utimbuf))))
(name (filename filename)))
(if (not (and access-time modification-time))
(alien-funcall fun name nil)
@@ -174,15 +174,15 @@
(typep
(sb-posix:syscall-errno c)
'(member
- #+bsd
+ #+(or darwin openbsd)
#.sb-posix:eisdir
#+win32
#.sb-posix::eacces
#+win32
#.sb-posix::enotempty
#+sunos
#.sb-posix::einval
- #-(or bsd win32 sunos)
+ #-(or darwin openbsd win32 sunos)
#.sb-posix::ebusy)))) t)
(deftest rmdir.error.4
View
@@ -22,6 +22,7 @@
#include <sys/param.h>
#include <sys/file.h>
#include <unistd.h>
+#include <utime.h>
#include <assert.h>
#include <errno.h>
#include "sbcl.h"
@@ -342,6 +343,12 @@ _readdir(DIR *dirp)
return readdir(dirp);
}
+int
+_utime(const char *file, const struct utimbuf *timep)
+{
+ return utime(file, timep);
+}
+
/* Used in sb-bsd-sockets. */
int
_socket(int domain, int type, int protocol)

0 comments on commit 73190fb

Please sign in to comment.