Commit 18756c6d0e8f7420cd86fde428d800fa906cee9b
2018-06-29T12:11:35
revert the __xstat crap
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
diff --git a/cffi-stat.lisp b/cffi-stat.lisp
index dd5417e..a3766d0 100644
--- a/cffi-stat.lisp
+++ b/cffi-stat.lisp
@@ -71,68 +71,35 @@
(defun s-islnk (m) (= #o120000 (logand #o170000 (the fixnum m))))
(defun s-issock (m) (= #o140000 (logand #o170000 (the fixnum m))))
-(cond ((foreign-symbol-pointer "fstat")
- (defcfun ("fstat" c-fstat) :int
- (fd :int)
- (sb (:pointer (:struct stat))))
- (defmacro with-fstat ((var &optional (error-p t)) fd &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (c-fstat ,fd ,var))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "fstat"))))))))
- ((foreign-symbol-pointer "__fxstat")
- (defcfun ("__fxstat" c-__fxstat) :int
- (ver :int)
- (fd :int)
- (sb (:pointer (:struct stat))))
- (defmacro with-fstat ((var &optional (error-p t)) fd &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (c-__fxstat +stat-ver+ ,fd ,var))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "__fxstat")))))))))
-
-(cond ((foreign-symbol-pointer "stat")
- (defcfun ("stat" c-stat) :int
- (path :string)
- (sb (:pointer (:struct stat))))
- (defmacro with-stat ((var &optional (error-p t)) path &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (the fixnum (c-stat ,path ,var)))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "stat"))))))))
- ((foreign-symbol-pointer "__xstat")
- (defcfun ("__xstat" c-__xstat) :int
- (ver :int)
- (path :string)
- (sb (:pointer (:struct stat))))
- (defmacro with-stat ((var &optional (error-p t)) path &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (the fixnum (c-__xstat +stat-ver+ ,path ,var)))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "__xstat")))))))))
-
-(cond ((foreign-symbol-pointer "lstat")
- (defcfun ("lstat" c-lstat) :int
- (path :string)
- (sb (:pointer (:struct stat))))
- (defmacro with-lstat ((var &optional (error-p t)) path &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (c-lstat ,path ,var))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "lstat"))))))))
- ((foreign-symbol-pointer "__lxstat")
- (defcfun ("__lxstat" c-__lxstat) :int
- (ver :int)
- (path :string)
- (sb (:pointer (:struct stat))))
- (defmacro with-lstat ((var &optional (error-p t)) path &body body)
- `(with-foreign-object (,var '(:struct stat))
- (cond ((= 0 (c-__lxstat +stat-ver+ ,path ,var))
- (locally ,@body))
- ,@(when error-p
- `((t (error-errno "__lxstat")))))))))
+(defcfun ("fstat" c-fstat) :int
+ (fd :int)
+ (sb (:pointer (:struct stat))))
+
+(defmacro with-fstat ((var &optional (error-p t)) fd &body body)
+ `(with-foreign-object (,var '(:struct stat))
+ (cond ((= 0 (c-fstat ,fd (mem-aptr ,var '(:struct stat))))
+ (locally ,@body))
+ ,@(when error-p
+ `((t (error-errno "fstat")))))))
+
+(defcfun ("stat" c-stat) :int
+ (path :string)
+ (sb (:pointer (:struct stat))))
+
+(defmacro with-stat ((var &optional (error-p t)) path &body body)
+ `(with-foreign-object (,var '(:struct stat))
+ (cond ((= 0 (the fixnum (c-stat ,path ,var)))
+ (locally ,@body))
+ ,@(when error-p
+ `((t (error-errno "stat")))))))
+
+(defcfun ("lstat" c-lstat) :int
+ (path :string)
+ (sb (:pointer (:struct stat))))
+
+(defmacro with-lstat ((var &optional (error-p t)) path &body body)
+ `(with-foreign-object (,var '(:struct stat))
+ (cond ((= 0 (c-lstat ,path ,var))
+ (locally ,@body))
+ ,@(when error-p
+ `((t (error-errno "lstat")))))))