X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Funix.lisp;h=b0e1811a7a0fb3e5568e2965241d0e544c6843da;hb=d4c7ab04ed10729a2cfa3321f4382d8a218ad958;hp=9199ccb9daa06cf83d7e2eeafa22f64d749e3b47;hpb=f6c58711c58ee05502fefc6c176a2533b18021bb;p=sbcl.git diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 9199ccb..b0e1811 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -293,14 +293,14 @@ ;; a constant. Going the grovel_headers route doesn't seem to be ;; helpful, either, as Solaris doesn't export PATH_MAX from ;; unistd.h. - #!-(or linux openbsd freebsd sunos osf1 darwin) (,stub,) - #!+(or linux openbsd freebsd sunos osf1 darwin) + #!-(or linux openbsd freebsd netbsd sunos osf1 darwin) (,stub,) + #!+(or linux openbsd freebsd netbsd sunos osf1 darwin) (or (newcharstar-string (alien-funcall (extern-alien "getcwd" (function (* char) (* char) size-t)) nil - #!+(or linux openbsd freebsd darwin) 0 + #!+(or linux openbsd freebsd netbsd darwin) 0 #!+(or sunos osf1) 1025)) (simple-perror "getcwd"))) @@ -390,12 +390,6 @@ (cast buf c-string) (cast buf (* char)) 256))) -;;; Write the core image of the file described by FD to disk. -(defun unix-fsync (fd) - (declare (type unix-fd fd)) - (void-syscall ("fsync" int) fd)) - - (defun unix-setsid () (int-syscall ("setsid"))) @@ -556,14 +550,14 @@ ;;; longer than 32 bits anyway, right?":-| (define-alien-type nil (struct wrapped_stat - (st-dev unsigned-long) ; would be dev-t in a real stat + (st-dev unsigned-int) ; would be dev-t in a real stat (st-ino ino-t) (st-mode mode-t) (st-nlink nlink-t) (st-uid uid-t) (st-gid gid-t) - (st-rdev unsigned-long) ; would be dev-t in a real stat - (st-size unsigned-long) ; would be off-t in a real stat + (st-rdev unsigned-int) ; would be dev-t in a real stat + (st-size unsigned-int) ; would be off-t in a real stat (st-blksize unsigned-long) (st-blocks unsigned-long) (st-atime time-t) @@ -651,19 +645,13 @@ (define-alien-routine get-timezone sb!alien:void (when sb!alien:long :in) - (minutes-west sb!alien:int :out) + (seconds-west sb!alien:int :out) (daylight-savings-p sb!alien:boolean :out)) -(defun unix-get-minutes-west (secs) - (multiple-value-bind (ignore minutes dst) (get-timezone secs) +(defun unix-get-seconds-west (secs) + (multiple-value-bind (ignore seconds dst) (get-timezone secs) (declare (ignore ignore) (ignore dst)) - (values minutes))) - -(defun unix-get-timezone (secs) - (multiple-value-bind (ignore minutes dst) (get-timezone secs) - (declare (ignore ignore) (ignore minutes)) - (values (deref unix-tzname (if dst 1 0))))) - + (values seconds))) ;;;; sys/time.h @@ -782,13 +770,6 @@ previous timer after the body has finished executing" (progn ,@body)))))) - -(defconstant ENOENT 2) ; Unix error code, "No such file or directory" -(defconstant EINTR 4) ; Unix error code, "Interrupted system call" -(defconstant EIO 5) ; Unix error code, "I/O error" -(defconstant EEXIST 17) ; Unix error code, "File exists" -(defconstant ESPIPE 29) ; Unix error code, "Illegal seek" -(defconstant EWOULDBLOCK 11) ; Unix error code, "Operation would block" ;;; FIXME: Many Unix error code definitions were deleted from the old ;;; CMU CL source code here, but not in the exports of SB-UNIX. I ;;; (WHN) hope that someday I'll figure out an automatic way to detect @@ -796,7 +777,6 @@ previous timer after the body has finished executing" ;;; enough of them all in one place here that they should probably be ;;; removed by hand. - ;;;; support routines for dealing with Unix pathnames (defun unix-file-kind (name &optional check-for-links)