- cmucl-cvs - mailman3.common-lisp.net

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-22-g0a522bd
by Raymond Toy 26 Nov '14

26 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 0a522bd0c8c38f6ee76f0cc2122d9984c4e269aa (commit) via cc8c049fe257b28f470baafcf92b6ceb929582de (commit) from 9918ab2d5794ac01efe17b808b351e25519dc88a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0a522bd0c8c38f6ee76f0cc2122d9984c4e269aa Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Nov 26 10:24:17 2014 -0800 Use new log2 function in C * code/exports.lisp: * Export %LOG2. * code/irrat.lisp: * Define %log2 * Use %log2 instead of log2. (This needs work) * compiler/float-tran.lisp: * Use %log2 instead of log2 in the deftransforms. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index e75e5d7..99e0762 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -2095,7 +2095,7 @@ "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUNCTION" "%CLOSURE-INDEX-REF" "%COS" "%COSH" "%DEPOSIT-FIELD" "%DOUBLE-FLOAT" "%DPB" "%EXP" "%EXPM1" "%HYPOT" "%LDB" - "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LONG-FLOAT" + "%LOG" "%LOGB" "%LOG10" "%LOG1P" "%LOG2" "%LONG-FLOAT" "%MAKE-COMPLEX" "%MAKE-FUNCALLABLE-INSTANCE" "%MAKE-RATIO" "%MASK-FIELD" "%NEGATE" "%POW" "%RAW-BITS" "%RAW-REF-COMPLEX-DOUBLE" "%RAW-REF-COMPLEX-LONG" diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 1179515..568fa46 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -82,6 +82,7 @@ (def-math-rtn ("__ieee754_exp" %exp) 1) (def-math-rtn ("__ieee754_log" %log) 1) (def-math-rtn ("__ieee754_log10" %log10) 1) +(def-math-rtn ("cmucl_log2" %log2) 1) (def-math-rtn ("__ieee754_pow" %pow) 2) #-(or x86 sparc-v7 sparc-v8 sparc-v9) @@ -665,13 +666,13 @@ (number-dispatch ((number real) (base real)) ((double-float (foreach integer ratio single-float double-float)) - (log2 number)) + (%log2 number)) (((foreach integer ratio single-float) (foreach integer ratio single-float)) - (float (log2 (float number 1d0)) 1f0)) + (float (%log2 (float number 1d0)) 1f0)) (((foreach integer ratio single-float) double-float) - (log2 (float number 1d0))) + (%log2 (float number 1d0))) #+double-double (((foreach integer ratio single-float double-float) double-double-float) diff --git a/src/compiler/float-tran.lisp b/src/compiler/float-tran.lisp index 6efe701..c30e3f7 100644 --- a/src/compiler/float-tran.lisp +++ b/src/compiler/float-tran.lisp @@ -865,7 +865,7 @@ (cond ((= y-val 10) `(coerce (kernel:%log10 (float x 1d0)) 'single-float)) ((= y-val 2) - `(coerce (kernel::log2 (float x 1d0)) 'single-float))))) + `(coerce (kernel:%log2 (float x 1d0)) 'single-float))))) (deftransform log ((x y) ((or (member 0d0) (double-float 0d0)) (constant-argument number)) @@ -879,7 +879,7 @@ (cond ((= y-val 10) `(kernel:%log10 (float x 1d0))) ((= y-val 2) - `(kernel::log2 (float x 1d0)))))) + `(kernel:%log2 (float x 1d0)))))) ;;; Handle some simple transformations commit cc8c049fe257b28f470baafcf92b6ceb929582de Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Nov 26 10:21:50 2014 -0800 Extract the log2 code out of e_pow.c to implement log2 function. * log2.c: * New file containing the parts of e_pow.c that implemented a log2 function for use in pow(). * GNUmakefile: * Compile log2.c as part of the build. diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index d8fb690..f67a20e 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -13,7 +13,8 @@ FDLIBM = k_sin.c k_cos.c k_tan.c s_sin.c s_cos.c s_tan.c sincos.c \ e_atan2.c \ e_rem_pio2.c k_rem_pio2.c \ e_log10.c s_scalbn.c \ - setexception.c + setexception.c \ + log2.c SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \ vars.c parse.c interrupt.c search.c validate.c globals.c \ diff --git a/src/lisp/log2.c b/src/lisp/log2.c new file mode 100644 index 0000000..d56bc43 --- /dev/null +++ b/src/lisp/log2.c @@ -0,0 +1,139 @@ +/* + * ==================================================== + * Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved. + * + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* + * This is the log2 algorithm pulled out of __ieee754_pow in e_pow.c + */ + +/* + * Method: Let x = 2 * (1+f) + * 1. Compute and return log2(x) in two pieces: + * log2(x) = w1 + w2, + * where w1 has 53-24 = 29 bit trailing zeros. + */ + +#include "fdlibm.h" + +static double +bp[] = {1.0, 1.5,}, +dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ +dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ +zero = 0.0, +one = 1.0, +two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ + /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ +L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ +L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ +L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ +L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ +L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ +L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ +cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ +cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ +cp_l = -7.02846165095275826516e-09; /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/ + +double cmucl_log2(double x) +{ + double ax; + int k, hx, lx, ix; + union { int i[2]; double d; } ux; + + ux.d = x; + hx = ux.i[HIWORD]; lx = ux.i[LOWORD]; + ix = hx&0x7fffffff; + + ax = fabs(x); + + /* special value of x */ + + if (hx < 0x00100000) { /* x < 2**-1022 */ + if (((hx&0x7fffffff)|lx)==0) { + /* log(+-0)=-inf */ + return fdlibm_setexception(-1.0, FDLIBM_DIVIDE_BY_ZERO); + } + + if (hx<0) { + /* log(-#) = NaN */ + return fdlibm_setexception(x, FDLIBM_INVALID); + } + } + + { + double ss,s2,s_h,s_l,t_h,t_l; + double z_h,z_l,p_h,p_l; + double r, u, v, t, t1, t2; + int n, j; + + n = 0; + /* take care subnormal number */ + if(ix<0x00100000) { + ax *= two53; + n -= 53; + ux.d = ax; + ix = ux.i[HIWORD]; + } + n += ((ix)>>20)-0x3ff; + j = ix&0x000fffff; + /* determine interval */ + ix = j|0x3ff00000; /* normalize ix */ + if(j<=0x3988E) k=0; /* |x|<sqrt(3/2) */ + else if(j<0xBB67A) k=1; /* |x|<sqrt(3) */ + else {k=0;n+=1;ix -= 0x00100000;} + ux.d = ax; + ux.i[HIWORD] = ix; + ax = ux.d; + + /* compute ss = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */ + u = ax-bp[k]; /* bp[0]=1.0, bp[1]=1.5 */ + v = one/(ax+bp[k]); + ss = u*v; + s_h = ss; + ux.d = s_h; + ux.i[LOWORD] = 0; + s_h = ux.d; + /* t_h=ax+bp[k] High */ + t_h = zero; + ux.d = t_h; + ux.i[HIWORD]=((ix>>1)|0x20000000)+0x00080000+(k<<18); + t_h = ux.d; + t_l = ax - (t_h-bp[k]); + s_l = v*((u-s_h*t_h)-s_h*t_l); + /* compute log(ax) */ + s2 = ss*ss; + r = s2*s2*(L1+s2*(L2+s2*(L3+s2*(L4+s2*(L5+s2*L6))))); + r += s_l*(s_h+ss); + s2 = s_h*s_h; + t_h = 3.0+s2+r; + ux.d = t_h; + ux.i[LOWORD] = 0; + t_h = ux.d; + t_l = r-((t_h-3.0)-s2); + /* u+v = ss*(1+...) */ + u = s_h*t_h; + v = s_l*t_h+t_l*ss; + /* 2/(3log2)*(ss+...) */ + p_h = u+v; + ux.d = p_h; + ux.i[LOWORD] = 0; + p_h = ux.d; + p_l = v-(p_h-u); + z_h = cp_h*p_h; /* cp_h+cp_l = 2/(3*log2) */ + z_l = cp_l*p_h+p_l*cp+dp_l[k]; + /* log2(ax) = (ss+..)*2/(3*log2) = n + dp_h + z_h + z_l */ + t = (double)n; + t1 = (((z_h+z_l)+dp_h[k])+t); + ux.d = t1; + ux.i[LOWORD] = 0; + t1 = ux.d; + t2 = z_l-(((t1-t)-dp_h[k])-z_h); + + return t1 + t2; + } +} ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 2 +- src/code/irrat.lisp | 7 ++- src/compiler/float-tran.lisp | 4 +- src/lisp/GNUmakefile | 3 +- src/lisp/log2.c | 139 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 src/lisp/log2.c hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-20-g9918ab2
by Raymond Toy 25 Nov '14

25 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 9918ab2d5794ac01efe17b808b351e25519dc88a (commit) via d46a4bfeff75f685f2ccc4a2627a921e46547c1c (commit) via 8e0c67d0c74e1dd5206d2b068734d863440ca286 (commit) from 4d3255aa1a770f59d2851fd2c85707164ca485f5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9918ab2d5794ac01efe17b808b351e25519dc88a Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Nov 25 09:35:38 2014 -0800 * Add tests for dd-%log2 and dd-%log10. * Fix the log10.result-types test because we return correctly rounded results for these few tests. diff --git a/tests/irrat.lisp b/tests/irrat.lisp index f1913d3..9538394 100644 --- a/tests/irrat.lisp +++ b/tests/irrat.lisp @@ -5,9 +5,13 @@ (in-package "IRRAT-TESTS") +(defun relerr (actual expected) + (/ (abs (- actual expected)) + expected)) + ;; This tests that log base 2 returns the correct value and the ;; correct type. -(define-test log2 +(define-test log2.result-types (dolist (number '(4 4f0 4d0 #+double-double 4w0)) (dolist (base '(2 2f0 2d0 #+double-double 2w0)) ;; This tests that log returns the correct value and the correct type. @@ -35,54 +39,84 @@ ;; This tests that log base 10 returns the correct value and the ;; correct type. -(define-test log10 +(define-test log10.result-types (dolist (number '(100 100f0 100d0 #+double-double 100w0)) (dolist (base '(10 10f0 10d0 #+double-double 10w0)) ;; This tests that log returns the correct value and the correct type. (let* ((result (log number base)) - (relerr (/ (abs (- result 2)) 2))) - ;; Figure out the expected type of the result and the maximum - ;; allowed relative error. It turns out that for these test - ;; cases, the result is exactly 2 except when the result type - ;; is a double-double-float. In that case, there is a slight - ;; error for (log 100w0 10). - (multiple-value-bind (true-type allowed-error) - (etypecase number - ((or integer single-float) - (etypecase base + (true-type + (etypecase number ((or integer single-float) - (values 'single-float 0)) + (etypecase base + ((or integer single-float) + 'single-float) + (double-float + 'double-float) + #+double-double + (ext:double-double-float + 'ext:double-double-float))) (double-float - (values 'double-float 0)) - #+double-double - (ext:double-double-float - (values 'ext:double-double-float - 7.5d-33)))) - (double-float - (etypecase base - ((or integer single-float double-float) - (values 'double-float 0)) + (etypecase base + ((or integer single-float double-float) + 'double-float) + #+double-double + (ext:double-double-float + 'ext:double-double-float))) #+double-double (ext:double-double-float - (values 'ext:double-double-float - 7.5d-33)))) - #+double-double - (ext:double-double-float - (values 'ext:double-double-float - 7.5d-33))) - (assert-true (<= relerr allowed-error) - number base result relerr allowed-error) - (assert-true (typep result true-type) - number baes result true-type)))))) + 'ext:double-double-float)))) + (assert-equalp 2 result + number base result) + (assert-true (typep result true-type) + number base result true-type))))) -(define-test dd-log2 +(define-test dd-log2.special-cases ;; Verify that for x = 10^k for k = 1 to 300 that (kernel::dd-%log2 ;; x) is close to the expected value. Previously, a bug caused ;; (kernel::dd-%log2 100w0) to give 6.1699... instead of 6.64385. (loop for k from 1 below 300 - and x = (expt 10 k) - and y = (kernel::dd-%log2 (float x 1w0)) - and z = (/ (log (float x 1d0)) (log 2d0)) - and e = (/ (abs (- y z)) z) + for x = (expt 10 k) + for y = (kernel::dd-%log2 (float x 1w0)) + for z = (/ (log (float x 1d0)) (log 2d0)) + for e = (/ (abs (- y z)) z) do (assert-true (<= e 2d-16) - k y z e))) \ No newline at end of file + k y z e)) + (let ((y (kernel::dd-%log2 (sqrt 2w0)))) + (assert-true (<= (relerr y 1/2) + (* 2.7 (scale-float 1d0 (- (float-digits 1w0))))) + y)) + (let ((y (kernel::dd-%log2 (sqrt 0.5w0)))) + (assert-true (<= (relerr y -1/2) + (* 2.7 (scale-float 1d0 (- (float-digits 1w0))))) + y))) + +(define-test dd-log2.powers-of-2 + (loop for k from -1074 below 1024 + for x = (scale-float 1w0 k) + for y = (kernel::dd-%log2 x) + do (assert-equalp k y + k x y))) + +(define-test dd-log10.special-cases + (let ((y (kernel::dd-%log10 (sqrt 10w0)))) + (assert-true (<= (relerr y 1/2) + (* 0.25 (scale-float 1d0 (- (float-digits 1w0)))))))) + +(define-test dd-log10.powers-of-ten + ;; It would be nice if dd-%log10 produce the exact result for powers + ;; of ten, but we currently don't. But note that the maximum + ;; relative error is less than a double-double epsilon. + (let ((threshold (* 0.109 (scale-float 1d0 (- (float-digits 1w0)))))) + (loop for k from -323 below 0 + for x = (expt 10 k) + for y = (kernel::dd-%log10 (float x 1w0)) + for e = (relerr y k) + do (assert-true (<= e threshold) + k e x y)) + (loop for k from 1 to 308 + for x = (expt 10 k) + for y = (kernel::dd-%log10 (float x 1w0)) + for e = (relerr y k) + do (assert-true (<= e threshold) + k e x y)))) + commit d46a4bfeff75f685f2ccc4a2627a921e46547c1c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Nov 25 09:33:58 2014 -0800 Use log2 and log10 functions when possible instead of using the general case. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index fa89142..1179515 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -653,31 +653,35 @@ ((and (realp number) (realp base)) (cond ((and (= base 2) - (floatp number) - #+double-double - (not (typep number 'ext:double-double-float)) + ;;(floatp number) (or (plusp number) (eql number 0.0) - (eql number 0d0))) - ;; Do the same thing as the deftranform does for - ;; log base 2 and 10 for non-negative arguments. + (eql number 0d0) + #+double-double + (eql number 0w0))) + ;; Do the same thing as the deftranform does for log + ;; base 2 and 10 for non-negative arguments: handle + ;; the case where number > 0 or equal to +0. (number-dispatch ((number real) (base real)) ((double-float - (foreach integer single-float double-float)) + (foreach integer ratio single-float double-float)) (log2 number)) - ((single-float - (foreach integer single-float)) + (((foreach integer ratio single-float) + (foreach integer ratio single-float)) (float (log2 (float number 1d0)) 1f0)) - ((single-float double-float) + (((foreach integer ratio single-float) + double-float) (log2 (float number 1d0))) #+double-double - (((foreach integer single-float double-float) - ext:double-double-float) - (log2 (float number 1w0) base)))) + (((foreach integer ratio single-float double-float) + double-double-float) + (dd-%log2 (float number 1w0))) + #+double-double + ((double-double-float + (foreach integer ratio single-float double-float double-double-float)) + (dd-%log2 number)))) ((and (= base 10) - (floatp number) - #+double-double - (not (typep number 'double-double-float)) + ;;(floatp number) (or (plusp number) (eql number 0.0) (eql number 0d0))) @@ -685,19 +689,22 @@ ;; log base 2 and 10 for non-negative arguments. (number-dispatch ((number real) (base real)) ((double-float - (foreach double-float single-float integer)) + (foreach rational single-float double-float)) (%log10 number)) - ((single-float - (foreach single-float integer)) + (((foreach integer ratio single-float) + (foreach integer ratio single-float)) (float (%log10 (float number 1d0)) 1f0)) - ((single-float double-float) + (((foreach integer ratio single-float) + double-float) (%log10 (float number 1d0))) #+double-double - (((foreach integer single-float double-float) + (((foreach integer ratio single-float double-float) ext:double-double-float) - ;; This could be more accurate! - (/ (log (float number 1w0)) - (log 10w0))))) + (dd-%log10 (float number 1w0))) + #+double-double + ((double-double-float + (foreach integer ratio single-float double-float double-double-float)) + (dd-%log10 number)))) (t ;; CLHS 12.1.4.1 says ;; commit 8e0c67d0c74e1dd5206d2b068734d863440ca286 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Nov 25 09:32:32 2014 -0800 Return -infinity for %log2 and %log10 of +0. diff --git a/src/code/irrat-dd.lisp b/src/code/irrat-dd.lisp index d0acdd7..36051fc 100644 --- a/src/code/irrat-dd.lisp +++ b/src/code/irrat-dd.lisp @@ -1379,6 +1379,9 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 (declare (type double-double-float x) (optimize (speed 3) (space 0) (inhibit-warnings 3))) + (when (eql x 0w0) + ;; log2(+0) = -infinity + (return-from dd-%log2 (/ -1 x))) (multiple-value-bind (e x y z) (compute-log x) ;; Multiply log of fraction by log2(e) and base 2 exponent by 1 @@ -1395,6 +1398,9 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 (declare (type double-double-float x) (optimize (speed 3) (space 0) (inhibit-warnings 3))) + (when (eql x 0w0) + ;; log2(+0) = -infinity + (return-from dd-%log10 (/ -1 x))) (multiple-value-bind (e x y z) (compute-log x) ;; Multiply log of fraction by log10(e) and base 2 exponent by log10(2). ----------------------------------------------------------------------- Summary of changes: src/code/irrat-dd.lisp | 6 +++ src/code/irrat.lisp | 55 ++++++++++++++----------- tests/irrat.lisp | 110 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 109 insertions(+), 62 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-17-g4d3255a
by Raymond Toy 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 4d3255aa1a770f59d2851fd2c85707164ca485f5 (commit) from 3f063954c98d21ea8a95388d01db96a1e056c34d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4d3255aa1a770f59d2851fd2c85707164ca485f5 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Nov 24 15:20:12 2014 -0800 Add log10 implementation for double-doubles. Since log2 and log10 use basically the same natural log implementation, factor that out the common part into its own routine. diff --git a/src/code/irrat-dd.lisp b/src/code/irrat-dd.lisp index 45b422e..d0acdd7 100644 --- a/src/code/irrat-dd.lisp +++ b/src/code/irrat-dd.lisp @@ -44,6 +44,20 @@ 4.4269504088896340735992468100189213742664595w-1 _N"log2(e)-1") +;; l102a+log102b = log10(2) to extra precision +(defconstant l102a + 0.3125w0) + +(defconstant l102b + -1.14700043360188047862611052755069732318101185w-2) + +;; l10ea + l10eb = log10(2) to extra precsion +(defconstant l10ea + 0.5w0) + +(defconstant l10eb + -6.570551809674817234887108108339491770560299w-2) + (defconstant dd-pi 3.141592653589793238462643383279502884197169w0 _N"Pi") @@ -1241,8 +1255,8 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 (values (- (dd-%%cos reduced)) (dd-%%sin reduced)))))))) -;;; dd-%log2 -;;; Base 2 logarithm. +;;; dd-%log2 and dd-%log10 +;;; Base 2 and base 10 logarithm. ;;; ;;; The argument is separated into its exponent and fractional ;;; parts. If the exponent is between -1 and +1, the (natural) @@ -1254,6 +1268,9 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 ;;; ;;; log(x) = z + z**3 R(z)/S(z). ;;; +;;; This gives the natural log. To get the base 2 and base 10 log, +;;; carefully multiply the natural log by log2(e) or log10(e) as +;;; appropriate. (let ((P (make-array 13 :element-type 'double-double-float :initial-contents '( @@ -1314,52 +1331,82 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 -1.332535117259762928288745111081235577029w6 1.701761051846631278975701529965589676574w6 )))) + (flet + ((compute-log (x) + ;; Common routine to extract the exponent and fraction from x + ;; and compute the log(f). Return the exponent, the fraction, + ;; and the parts of the polynomial computation that is needed + ;; to finish off the final logarithm. + (declare (type double-double-float x) + (optimize (speed 3) (space 0) + (inhibit-warnings 3))) + (multiple-value-bind (x e) + (decode-float x) + (declare (type double-double-float x) + (type double-float-exponent e)) + (let ((z 0w0) + (y 0w0)) + (declare (type double-double-float z y)) + (cond ((or (> e 2) + (< e -2)) + (cond ((< x sqrt-1/2) + ;; 2*(2*x-1)/(2*x+1) + (decf e) + (setf z (- x 0.5w0)) + (setf y (+ (* 0.5w0 z) 0.5w0))) + (t + ;; 2*(x-1)/(x+1) + (setf z (- x 0.5w0)) + (decf z 0.5w0) + (setf y (+ (* 0.5w0 x) 0.5w0)))) + (setf x (/ z y)) + (setf z (* x x)) + (setf y (* x (/ (* z (poly-eval z r)) + (poly-eval-1 z s))))) + (t + (cond ((< x sqrt-1/2) + (decf e) + (setf x (- (scale-float x 1) 1))) + (t + (decf x))) + (setf z (* x x)) + (setf y (* x (/ (* z (poly-eval x p)) + (poly-eval-1 x q)))) + (decf y (scale-float z -1)))) + (values e x y z))))) + (defun dd-%log2 (x) (declare (type double-double-float x) (optimize (speed 3) (space 0) (inhibit-warnings 3))) - (multiple-value-bind (x e) - (decode-float x) - (declare (type double-double-float x) - (type double-float-exponent e)) - (let ((z 0w0) - (y 0w0)) - (declare (type double-double-float z y)) - (cond ((or (> e 2) - (< e -2)) - (cond ((< x sqrt-1/2) - ;; 2*(2*x-1)/(2*x+1) - (decf e) - (setf z (- x 0.5w0)) - (setf y (+ (* 0.5w0 z) 0.5w0))) - (t - ;; 2*(x-1)/(x+1) - (setf z (- x 0.5w0)) - (decf z 0.5w0) - (setf y (+ (* 0.5w0 x) 0.5w0)))) - (setf x (/ z y)) - (setf z (* x x)) - (setf y (* x (/ (* z (poly-eval z r)) - (poly-eval-1 z s))))) - (t - (cond ((< x sqrt-1/2) - (decf e) - (setf x (- (scale-float x 1) 1))) - (t - (decf x))) - (setf z (* x x)) - (setf y (* x (/ (* z (poly-eval x p)) - (poly-eval-1 x q)))) - (decf y (scale-float z -1)))) - ;; Multiply log of fraction by log2(e) and base 2 exponent by 1 - ;; - ;; This sequence of operations is critical - (setf z (* y log2ea)) - (setf z (+ z (* x log2ea))) - (setf z (+ z y)) - (setf z (+ z x)) - (setf z (+ z e)) - z)))) + (multiple-value-bind (e x y z) + (compute-log x) + ;; Multiply log of fraction by log2(e) and base 2 exponent by 1 + ;; + ;; This sequence of operations is critical + (setf z (* y log2ea)) + (incf z (* x log2ea)) + (incf z y) + (incf z x) + (incf z e) + z)) + + (defun dd-%log10 (x) + (declare (type double-double-float x) + (optimize (speed 3) (space 0) + (inhibit-warnings 3))) + (multiple-value-bind (e x y z) + (compute-log x) + ;; Multiply log of fraction by log10(e) and base 2 exponent by log10(2). + ;; + ;; This sequence of operations is critical. + (setf z (* y l10eb)) + (incf z (* x l10eb)) + (incf z (* e l102b)) + (incf z (* y l10ea)) + (incf z (* x l10ea)) + (incf z (* e l102a)) + z)))) ;;; dd-%exp2 ;;; 2^x ----------------------------------------------------------------------- Summary of changes: src/code/irrat-dd.lisp | 135 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 44 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-16-g3f06395
by Raymond Toy 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 3f063954c98d21ea8a95388d01db96a1e056c34d (commit) via a932491bb20a7e2a05cce1bd142870f2a6edfcad (commit) via d36c032a5440e1f2a5e2bbda37962a2a96c6aaac (commit) from 31f691c9565941b4c04309b16a871860246c29e1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f063954c98d21ea8a95388d01db96a1e056c34d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Nov 24 13:41:00 2014 -0800 Fix bug in dd-%log2 where (dd-%log2 100w0) returned 6.16 instead of 6.64. Tests were already added to tests/irrat.lisp. diff --git a/src/code/irrat-dd.lisp b/src/code/irrat-dd.lisp index 438339f..45b422e 100644 --- a/src/code/irrat-dd.lisp +++ b/src/code/irrat-dd.lisp @@ -1243,7 +1243,17 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 ;;; dd-%log2 ;;; Base 2 logarithm. - +;;; +;;; The argument is separated into its exponent and fractional +;;; parts. If the exponent is between -1 and +1, the (natural) +;;; logarithm of the fraction is approximated by +;;; +;;; log(1+x) = x - 0.5 x**2 + x**3 P(x)/Q(x). +;;; +;;; Otherwise, setting z = 2(x-1)/x+1), +;;; +;;; log(x) = z + z**3 R(z)/S(z). +;;; (let ((P (make-array 13 :element-type 'double-double-float :initial-contents '( @@ -1326,7 +1336,7 @@ pi/4 11001001000011111101101010100010001000010110100011000 010001101001100010 ;; 2*(x-1)/(x+1) (setf z (- x 0.5w0)) (decf z 0.5w0) - (setf y (+ (* 0.5w0 z) 0.5w0)))) + (setf y (+ (* 0.5w0 x) 0.5w0)))) (setf x (/ z y)) (setf z (* x x)) (setf y (* x (/ (* z (poly-eval z r)) commit a932491bb20a7e2a05cce1bd142870f2a6edfcad Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Nov 24 13:39:37 2014 -0800 Add tests for log2 and log10. diff --git a/tests/irrat.lisp b/tests/irrat.lisp new file mode 100644 index 0000000..f1913d3 --- /dev/null +++ b/tests/irrat.lisp @@ -0,0 +1,88 @@ +;; Tests of special irrational functions + +(defpackage :irrat-tests + (:use :cl :lisp-unit)) + +(in-package "IRRAT-TESTS") + +;; This tests that log base 2 returns the correct value and the +;; correct type. +(define-test log2 + (dolist (number '(4 4f0 4d0 #+double-double 4w0)) + (dolist (base '(2 2f0 2d0 #+double-double 2w0)) + ;; This tests that log returns the correct value and the correct type. + (let* ((result (log number base)) + (true-type (etypecase number + ((or integer single-float) + (etypecase base + ((or integer single-float) 'single-float) + (double-float 'double-float) + #+double-double + (ext:double-double-float 'ext:double-double-float))) + (double-float + (etypecase base + ((or integer single-float double-float) + 'double-float) + #+double-double + (ext:double-double-float 'ext:double-double-float))) + #+double-double + (ext:double-double-float + 'ext:double-double-float)))) + (assert-equal (coerce 2 true-type) result + number base) + (assert-true (typep result true-type) + result true-type))))) + +;; This tests that log base 10 returns the correct value and the +;; correct type. +(define-test log10 + (dolist (number '(100 100f0 100d0 #+double-double 100w0)) + (dolist (base '(10 10f0 10d0 #+double-double 10w0)) + ;; This tests that log returns the correct value and the correct type. + (let* ((result (log number base)) + (relerr (/ (abs (- result 2)) 2))) + ;; Figure out the expected type of the result and the maximum + ;; allowed relative error. It turns out that for these test + ;; cases, the result is exactly 2 except when the result type + ;; is a double-double-float. In that case, there is a slight + ;; error for (log 100w0 10). + (multiple-value-bind (true-type allowed-error) + (etypecase number + ((or integer single-float) + (etypecase base + ((or integer single-float) + (values 'single-float 0)) + (double-float + (values 'double-float 0)) + #+double-double + (ext:double-double-float + (values 'ext:double-double-float + 7.5d-33)))) + (double-float + (etypecase base + ((or integer single-float double-float) + (values 'double-float 0)) + #+double-double + (ext:double-double-float + (values 'ext:double-double-float + 7.5d-33)))) + #+double-double + (ext:double-double-float + (values 'ext:double-double-float + 7.5d-33))) + (assert-true (<= relerr allowed-error) + number base result relerr allowed-error) + (assert-true (typep result true-type) + number baes result true-type)))))) + +(define-test dd-log2 + ;; Verify that for x = 10^k for k = 1 to 300 that (kernel::dd-%log2 + ;; x) is close to the expected value. Previously, a bug caused + ;; (kernel::dd-%log2 100w0) to give 6.1699... instead of 6.64385. + (loop for k from 1 below 300 + and x = (expt 10 k) + and y = (kernel::dd-%log2 (float x 1w0)) + and z = (/ (log (float x 1d0)) (log 2d0)) + and e = (/ (abs (- y z)) z) + do (assert-true (<= e 2d-16) + k y z e))) \ No newline at end of file commit d36c032a5440e1f2a5e2bbda37962a2a96c6aaac Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Nov 24 11:45:00 2014 -0800 Regenerate. diff --git a/src/i18n/locale/en(a)piglatin/LC_MESSAGES/cmucl.po b/src/i18n/locale/en(a)piglatin/LC_MESSAGES/cmucl.po index df7d5b1..6eb9404 100644 --- a/src/i18n/locale/en(a)piglatin/LC_MESSAGES/cmucl.po +++ b/src/i18n/locale/en(a)piglatin/LC_MESSAGES/cmucl.po @@ -5177,6 +5177,29 @@ msgstr "" " urrogatesay aluevay, espectivelyray." #: src/code/string.lisp +#, fuzzy +msgid "" +"WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body)\n" +" provides a method of looping through a string from the beginning to\n" +" the end of the string prodcucing successive codepoints from the\n" +" string. NEXT is bound to a generator macro that, within the scope\n" +" of the invocation, returns one or two values. The first value tells\n" +" whether any objects remain in the string. When the first value is\n" +" non-NIL, the second value is the codepoint of the next object." +msgstr "" +"WITH-HASH-TABLE-ITERATOR ((unctionfay ashhay-abletay) &odybay odybay)\n" +" ovidespray away ethodmay ofway anuallymay oopinglay overway ethay " +"elementsway ofway away ashhay-abletay.\n" +" FUNCTION isway oundbay otay away eneratorgay-acromay atthay, ithinway " +"ethay opescay ofway ethay\n" +" invocationway, eturnsray oneway orway reethay aluesvay. Ethay irstfay " +"aluevay ellstay etherwhay\n" +" anyway objectsway emainray inway ethay ashhay abletay. Enwhay ethay " +"irstfay aluevay isway onnay-NIL, \n" +" ethay econdsay andway irdthay aluesvay areway ethay eykay andway ethay " +"aluevay ofway ethay extnay objectway." + +#: src/code/string.lisp msgid "" "Return the high and low surrogate characters for Codepoint. If\n" " Codepoint is in the BMP, the first return value is the corresponding\n" @@ -5620,6 +5643,30 @@ msgstr "" " exceptway atthay ethay ingstray ustmay ebay away implesay-ingstray" #: src/code/string.lisp +#, fuzzy +msgid "" +"WITH-STRING-GLYPH-ITERATOR ((next string) &body body)\n" +" provides a method of looping through a string from the beginning to\n" +" the end of the string prodcucing successive glyphs from the string.\n" +" NEXT is bound to a generator macro that, within the scope of the\n" +" invocation, returns one or three values. The first value tells\n" +" whether any objects remain in the string. When the first value is\n" +" non-NIL, the second value is the index into the string of the glyph\n" +" and the third value is index of the next glyph." +msgstr "" +"WITH-HASH-TABLE-ITERATOR ((unctionfay ashhay-abletay) &odybay odybay)\n" +" ovidespray away ethodmay ofway anuallymay oopinglay overway ethay " +"elementsway ofway away ashhay-abletay.\n" +" FUNCTION isway oundbay otay away eneratorgay-acromay atthay, ithinway " +"ethay opescay ofway ethay\n" +" invocationway, eturnsray oneway orway reethay aluesvay. Ethay irstfay " +"aluevay ellstay etherwhay\n" +" anyway objectsway emainray inway ethay ashhay abletay. Enwhay ethay " +"irstfay aluevay isway onnay-NIL, \n" +" ethay econdsay andway irdthay aluesvay areway ethay eykay andway ethay " +"aluevay ofway ethay extnay objectway." + +#: src/code/string.lisp msgid "" "Convert String to Unicode Normalization Form D (NFD) using the\n" " canonical decomposition. The NFD string is returned" @@ -19092,6 +19139,18 @@ msgid "Destructuring is not valid for package symbol iteration." msgstr "" "Estructuringday isway otnay alidvay orfay ackagepay ymbolsay iterationway." +#: src/code/loop.lisp +#, fuzzy +msgid "Destructuring is not valid for string codepoint iteration." +msgstr "" +"Estructuringday isway otnay alidvay orfay ackagepay ymbolsay iterationway." + +#: src/code/loop.lisp +#, fuzzy +msgid "Destructuring is not valid for string glyph iteration." +msgstr "" +"Estructuringday isway otnay alidvay orfay ackagepay ymbolsay iterationway." + #: src/code/stream-vector-io.lisp msgid "endian-swap ~a is illegal for element-type of vector ~a" msgstr "" diff --git a/src/i18n/locale/ko/LC_MESSAGES/cmucl.po b/src/i18n/locale/ko/LC_MESSAGES/cmucl.po index b73bf6a..a8c6a23 100644 --- a/src/i18n/locale/ko/LC_MESSAGES/cmucl.po +++ b/src/i18n/locale/ko/LC_MESSAGES/cmucl.po @@ -3704,6 +3704,17 @@ msgstr "" #: src/code/string.lisp msgid "" +"WITH-STRING-CODEPOINT-ITERATOR ((next string) &body body)\n" +" provides a method of looping through a string from the beginning to\n" +" the end of the string prodcucing successive codepoints from the\n" +" string. NEXT is bound to a generator macro that, within the scope\n" +" of the invocation, returns one or two values. The first value tells\n" +" whether any objects remain in the string. When the first value is\n" +" non-NIL, the second value is the codepoint of the next object." +msgstr "" + +#: src/code/string.lisp +msgid "" "Return the high and low surrogate characters for Codepoint. If\n" " Codepoint is in the BMP, the first return value is the corresponding\n" " character and the second is NIL." @@ -3962,6 +3973,18 @@ msgstr "" #: src/code/string.lisp msgid "" +"WITH-STRING-GLYPH-ITERATOR ((next string) &body body)\n" +" provides a method of looping through a string from the beginning to\n" +" the end of the string prodcucing successive glyphs from the string.\n" +" NEXT is bound to a generator macro that, within the scope of the\n" +" invocation, returns one or three values. The first value tells\n" +" whether any objects remain in the string. When the first value is\n" +" non-NIL, the second value is the index into the string of the glyph\n" +" and the third value is index of the next glyph." +msgstr "" + +#: src/code/string.lisp +msgid "" "Convert String to Unicode Normalization Form D (NFD) using the\n" " canonical decomposition. The NFD string is returned" msgstr "" @@ -13414,6 +13437,14 @@ msgstr "" msgid "Destructuring is not valid for package symbol iteration." msgstr "" +#: src/code/loop.lisp +msgid "Destructuring is not valid for string codepoint iteration." +msgstr "" + +#: src/code/loop.lisp +msgid "Destructuring is not valid for string glyph iteration." +msgstr "" + #: src/code/stream-vector-io.lisp msgid "endian-swap ~a is illegal for element-type of vector ~a" msgstr "" ----------------------------------------------------------------------- Summary of changes: src/code/irrat-dd.lisp | 14 +++- src/i18n/locale/en(a)piglatin/LC_MESSAGES/cmucl.po | 59 ++++++++++++++++ src/i18n/locale/ko/LC_MESSAGES/cmucl.po | 31 +++++++++ tests/irrat.lisp | 88 ++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 tests/irrat.lisp hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-13-g31f691c
by Raymond Toy 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 31f691c9565941b4c04309b16a871860246c29e1 (commit) from ea433981ca884c40c90578dd891f37505618ac76 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31f691c9565941b4c04309b16a871860246c29e1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Nov 24 11:31:11 2014 -0800 Fix error in computation (log number base) where one of the args is a double-double. * src/code/irrat.lisp: * For the following two cases, cmucl generated an error instead of computing the log * Base is a double-double but number is not. * Number is a double-double but base is not. * tests/irrat.lisp: * Add some tests for log2 and log10. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 8ddd413..fa89142 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -669,7 +669,11 @@ (foreach integer single-float)) (float (log2 (float number 1d0)) 1f0)) ((single-float double-float) - (log2 (float number 1d0))))) + (log2 (float number 1d0))) + #+double-double + (((foreach integer single-float double-float) + ext:double-double-float) + (log2 (float number 1w0) base)))) ((and (= base 10) (floatp number) #+double-double @@ -687,7 +691,13 @@ (foreach single-float integer)) (float (%log10 (float number 1d0)) 1f0)) ((single-float double-float) - (%log10 (float number 1d0))))) + (%log10 (float number 1d0))) + #+double-double + (((foreach integer single-float double-float) + ext:double-double-float) + ;; This could be more accurate! + (/ (log (float number 1w0)) + (log 10w0))))) (t ;; CLHS 12.1.4.1 says ;; @@ -729,11 +739,14 @@ #+double-double ((double-double-float (foreach fixnum bignum ratio)) + ;; Use log2 in case the base is so large that it + ;; won't fit in a float. (/ (log2 number 1w0) (log2 base 1w0))) #+double-double ((double-double-float (foreach double-double-float double-float single-float)) - (/ (log number) (log (coerce base 'double-double-float)))) + (/ (log number) + (log (coerce base 'double-double-float)))) #+double-double (((foreach fixnum bignum ratio) double-double-float) ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-12-gea43398
by Raymond Toy 22 Nov '14

22 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via ea433981ca884c40c90578dd891f37505618ac76 (commit) via f2fd2ab4ebbecf9ab08dcb30ca62100ada3f6400 (commit) from eab088ab2774b7819edb431c2cdf25cec974b40e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ea433981ca884c40c90578dd891f37505618ac76 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 22 10:58:35 2014 -0800 Don't need to compile undefineds.c on sparc. diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index 9a7c850..55204c0 100644 --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -60,6 +60,6 @@ ASSEM_SRC = sparc-assem.S ARCH_SRC = sparc-arch.c DEPEND=$(CC) -OS_SRC = solaris-os.c os-common.c undefineds.c elf.c +OS_SRC = solaris-os.c os-common.c elf.c OS_LIBS= -lsocket -lnsl -ldl EXEC_FINAL_OBJ = exec-final.o ----------------------------------------------------------------------- Summary of changes: src/code/filesys.lisp | 9 ++++----- src/lisp/Config.sparc_common | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-unix-core updated. snapshot-2014-11-18-gdb12154
by Raymond Toy 19 Nov '14

19 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-unix-core has been updated via db12154da8871000bdfd64e4b11e0a54b9f36d07 (commit) from 11ecbb802bbf4758df3e4f0e45faeb912bcc1e72 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit db12154da8871000bdfd64e4b11e0a54b9f36d07 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Nov 18 21:35:46 2014 -0800 Add UNIX-SYMLINK. This allows the testsuite to run. Tests behave as expected. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index 197af66..4bd2140 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -294,6 +294,9 @@ "UNIX-FCHMOD" "UNIX-CREAT" "UNIX-UTIMES" + + ;; Tests + "UNIX-SYMLINK" )) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 968194c..7ccf98f 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -1884,6 +1884,14 @@ nfds (frob rdfds rdf) (frob wrfds wrf) (frob xpfds xpf) (if to-secs (alien-sap (addr tv)) (int-sap 0)))))) +(defun unix-symlink (name1 name2) + _N"Unix-symlink creates a symbolic link named name2 to the file + named name1. NIL and an error number is returned if the call + is unsuccessful." + (declare (type unix-pathname name1 name2)) + (void-syscall ("symlink" c-string c-string) + (%name->file name1) (%name->file name2))) + (def-alien-type nil (struct timeval (tv-sec #-linux time-t #+linux int) ; seconds ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 3 +++ src/code/unix.lisp | 8 ++++++++ 2 files changed, 11 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-unix-core updated. snapshot-2014-11-17-g11ecbb8
by Raymond Toy 17 Nov '14

17 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-unix-core has been updated via 11ecbb802bbf4758df3e4f0e45faeb912bcc1e72 (commit) from a71198af3e574a22d6698870bd6f5755449c39cd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 11ecbb802bbf4758df3e4f0e45faeb912bcc1e72 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 16 21:14:42 2014 -0800 More support for hemlock. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index 3c2e492..197af66 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -290,6 +290,10 @@ "TERMIOS" "UNIX-TCGETATTR" "UNIX-TCSETATTR" + "UNIX-CFGETOSPEED" + "UNIX-FCHMOD" + "UNIX-CREAT" + "UNIX-UTIMES" )) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index e314960..968194c 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -437,6 +437,19 @@ (type unix-file-mode mode)) (void-syscall ("chmod" c-string int) (%name->file path) mode)) +;;; Unix-fchmod accepts a file descriptor ("fd") and a file protection mode +;;; ("mode") and changes the protection of the file described by "fd" to +;;; "mode". + +(defun unix-fchmod (fd mode) + _N"Given an integer file descriptor and a mode (the same as those + used for unix-chmod), unix-fchmod changes the permission mode + for that file to the one specified. T is returned if the call + was successful." + (declare (type unix-fd fd) + (type unix-file-mode mode)) + (void-syscall ("fchmod" int int) fd mode)) + ;;; Unix-lseek accepts a file descriptor, an offset, and whence value. (defconstant l_set 0 _N"set the file pointer") @@ -538,6 +551,22 @@ (declare (type unix-fd fd)) (void-syscall ("close" int) fd)) +;;; Unix-creat accepts a file name and a mode. It creates a new file +;;; with name and sets it mode to mode (as for chmod). + +(defun unix-creat (name mode) + _N"Unix-creat accepts a file name and a mode (same as those for + unix-chmod) and creates a file by that name with the specified + permission mode. It returns a file descriptor on success, + or NIL and an error number otherwise. + + This interface is made obsolete by UNIX-OPEN." + + (declare (type unix-pathname name) + (type unix-file-mode mode)) + (int-syscall (#+solaris "creat64" #-solaris "creat" c-string int) + (%name->file name) mode)) + ;;; Unix-read accepts a file descriptor, a buffer, and the length to read. ;;; It attempts to read len bytes from the device associated with fd ;;; and store them into the buffer. It returns the actual number of @@ -955,6 +984,22 @@ (declare (type unix-fd fd)) (void-syscall ("tcsetattr" int int (* (struct termios))) fd opt termios)) +;; XXX rest of functions in this progn probably are present in linux, but +;; not verified. +#-bsd +(defun unix-cfgetospeed (termios) + _N"Get terminal output speed." + (multiple-value-bind (speed errno) + (int-syscall ("cfgetospeed" (* (struct termios))) termios) + (if speed + (values (svref terminal-speeds speed) 0) + (values speed errno)))) + +#+bsd +(defun unix-cfgetospeed (termios) + _N"Get terminal output speed." + (int-syscall ("cfgetospeed" (* (struct termios))) termios)) + (def-alien-routine ("getuid" unix-getuid) int _N"Unix-getuid returns the real user-id associated with the current process.") @@ -1873,6 +1918,29 @@ (addr tv) #-(or svr4 netbsd) (addr tz) #+netbsd nil))) +;;; Unix-utimes changes the accessed and updated times on UNIX +;;; files. The first argument is the filename (a string) and +;;; the second argument is a list of the 4 times- accessed and +;;; updated seconds and microseconds. + +#-hpux +(defun unix-utimes (file atime-sec atime-usec mtime-sec mtime-usec) + _N"Unix-utimes sets the 'last-accessed' and 'last-updated' + times on a specified file. NIL and an error number is + returned if the call is unsuccessful." + (declare (type unix-pathname file) + (type (alien unsigned-long) + atime-sec atime-usec + mtime-sec mtime-usec)) + (with-alien ((tvp (array (struct timeval) 2))) + (setf (slot (deref tvp 0) 'tv-sec) atime-sec) + (setf (slot (deref tvp 0) 'tv-usec) atime-usec) + (setf (slot (deref tvp 1) 'tv-sec) mtime-sec) + (setf (slot (deref tvp 1) 'tv-usec) mtime-usec) + (void-syscall (#-netbsd "utimes" #+netbsd "__utimes50" c-string (* (struct timeval))) + file + (cast tvp (* (struct timeval)))))) + (def-alien-routine ("getpid" unix-getpid) int _N"Unix-getpid returns the process-id of the current process.") ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 4 +++ src/code/unix.lisp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-unix-core updated. snapshot-2014-11-16-ga71198a
by Raymond Toy 17 Nov '14

17 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-unix-core has been updated via a71198af3e574a22d6698870bd6f5755449c39cd (commit) via 836d21bfe205b864201cc224144dde09c8fe1b43 (commit) via fe8f398cd5effe5a17d3e8c2a82f26491fbd2df9 (commit) via fdc539f91d35af5fa1a92e013330a5961a02e92f (commit) from 9245bc06d60add3a924d8086332e4d8113933b3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a71198af3e574a22d6698870bd6f5755449c39cd Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 16 20:20:23 2014 -0800 Fix indentation. diff --git a/src/code/unix.lisp b/src/code/unix.lisp index b7548d6..e314960 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -946,9 +946,9 @@ (int-syscall ("ioctl" int unsigned-int (* char)) fd cmd arg)) (defun unix-tcgetattr (fd termios) - _N"Get terminal attributes." - (declare (type unix-fd fd)) - (void-syscall ("tcgetattr" int (* (struct termios))) fd termios)) + _N"Get terminal attributes." + (declare (type unix-fd fd)) + (void-syscall ("tcgetattr" int (* (struct termios))) fd termios)) (defun unix-tcsetattr (fd opt termios) _N"Set terminal attributes." commit 836d21bfe205b864201cc224144dde09c8fe1b43 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 16 20:20:04 2014 -0800 Add more unix functions, for motif and hemlock. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index e5221ee..3c2e492 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -283,6 +283,13 @@ "UNIX-MUNMAP" "UNIX-MSYNC" + ;; Motif + "UNIX-GETUIO" + + ;; Hemlock + "TERMIOS" + "UNIX-TCGETATTR" + "UNIX-TCSETATTR" )) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 1d5965f..b7548d6 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -945,6 +945,20 @@ (type (unsigned-byte 32) cmd)) (int-syscall ("ioctl" int unsigned-int (* char)) fd cmd arg)) +(defun unix-tcgetattr (fd termios) + _N"Get terminal attributes." + (declare (type unix-fd fd)) + (void-syscall ("tcgetattr" int (* (struct termios))) fd termios)) + +(defun unix-tcsetattr (fd opt termios) + _N"Set terminal attributes." + (declare (type unix-fd fd)) + (void-syscall ("tcsetattr" int int (* (struct termios))) fd opt termios)) + +(def-alien-routine ("getuid" unix-getuid) int + _N"Unix-getuid returns the real user-id associated with the + current process.") + ;;; Unix-getpagesize returns the number of bytes in the system page. (defun unix-getpagesize () @@ -971,6 +985,53 @@ (declare (type (signed-byte 32) code)) (void-syscall ("exit" int) code)) +;;; From sys/termios.h + +;;; NOTE: There is both a termio (SYSV) and termios (POSIX) +;;; structure with similar but incompatible definitions. It may be that +;;; the non-BSD variant of termios below is really a termio but I (pw) +;;; can't verify. The BSD variant uses the Posix termios def. Some systems +;;; (Ultrix and OSF1) seem to support both if used independently. +;;; The 17f version of this seems a bit confused wrt the conditionals. +;;; Please check these defs for your system. + +;;; TSM: from what I can tell looking at the 17f definition, my guess is that it +;;; was originally a termio for sunos (nonsolaris) (because it had the c-line +;;; member for sunos only), and then was mutated into the termios definition for +;;; later systems. The definition here is definitely not an IRIX termio because +;;; it doesn't have c-line. In any case, the functions tcgetattr, etc., +;;; definitely take a termios, and termios seems to be the more standard +;;; standard now, so my suggestion is to just go with termios and forget about +;;; termio. Note the SVID says NCCS not NCC for the constant here, so I've +;;; changed it (which means you need to bootstrap it to avoid a reader error). + +;;; On top of all that, SGI decided to change the termios structure on irix +;;; 6.[34] (but NOT 6.2), left the old routines named the same in the library, +;;; but introduced static functions in termios.h to redirect new calls to the +;;; new library--which means it's important not to #include termios.h before +;;; undefineds.h when building lisp. + +(defconstant +NCCS+ + #+hpux 16 + #+irix 23 + #+(or linux solaris) 19 + #+(or bsd osf1) 20 + #+(and sunos (not svr4)) 17 + _N"Size of control character vector.") + +(def-alien-type nil + (struct termios + (c-iflag unsigned-int) + (c-oflag unsigned-int) + (c-cflag unsigned-int) + (c-lflag unsigned-int) + #+(or linux hpux (and sunos (not svr4))) + (c-reserved #-(or linux (and sunos (not svr4))) unsigned-int + #+(or linux (and sunos (not svr4))) unsigned-char) + (c-cc (array unsigned-char #.+NCCS+)) + #+(or bsd osf1) (c-ispeed unsigned-int) + #+(or bsd osf1) (c-ospeed unsigned-int))) + ;;; From sys/dir.h ;;; ;;; (For Solaris, this is not struct direct, but struct dirent!) commit fe8f398cd5effe5a17d3e8c2a82f26491fbd2df9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 16 14:49:08 2014 -0800 Add more unix stuff. * asdf wants unix-rmdir * Add some missing structs. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index 71f6389..e5221ee 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -224,6 +224,7 @@ "UNIX-GETTIMEOFDAY" "UNIX-ISATTY" "UNIX-MKDIR" + "UNIX-RMDIR" "UNIX-UNLINK" "UNIX-SETITIMER" "TIMEZONE" @@ -269,15 +270,19 @@ "SGTTYB" "TCHARS" "UNIX-TTYNAME" + "WINSIZE" + "LTCHARS" + "TIMEVAL" + "CLOSE-DIR" + "OPEN-DIR" + "READ-DIR" + "D-NAMLEN" ;; Simple streams "PROT_READ" "UNIX-MMAP" "UNIX-MUNMAP" "UNIX-MSYNC" - "CLOSE-DIR" - "OPEN-DIR" - "READ-DIR" )) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 15f0b1e..1d5965f 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -108,6 +108,11 @@ `(multiple-value-bind (,word ,bit) (floor ,offset 32) (logbitp ,bit (deref (slot ,fd-set 'fds-bits) ,word))))) +(def-alien-type nlink-t + #-(or svr4 netbsd) unsigned-short + #+netbsd unsigned-long + #+svr4 unsigned-long) + (defconstant fd-setsize #-(or hpux alpha linux FreeBSD) 256 #+hpux 2048 #+alpha 4096 #+(or linux FreeBSD) 1024) @@ -117,6 +122,17 @@ (struct fd-set (fds-bits (array #-alpha unsigned-long #+alpha int #.(/ fd-setsize 32))))) +(def-alien-type nil + (struct timeval + (tv-sec #-linux time-t #+linux int) ; seconds + (tv-usec int))) ; and microseconds + +#+(or linux BSD) +(def-alien-type nil + (struct timespec-t + (ts-sec time-t) + (ts-nsec long))) + ;;; From ioctl.h (def-alien-type nil (struct tchars @@ -128,6 +144,17 @@ #-linux (t-eofc char) ; end-of-file (t-brkc char))) ; input delimiter (like nl) +;; not found (semi) linux +(def-alien-type nil + (struct ltchars + #+linux (t-werasc char) ; word erase + (t-suspc char) ; stop process signal + (t-dsuspc char) ; delayed stop process signal + (t-rprntc char) ; reprint line + (t-flushc char) ; flush output (toggles) + #-linux (t-werasc char) ; word erase + (t-lnextc char))) ; literal next character + (def-alien-type nil (struct sgttyb #+linux (sg-flags #+mach short #-mach int) ; mode flags @@ -140,6 +167,13 @@ #+linux (t (struct termios)) #+linux (check int))) +(def-alien-type nil + (struct winsize + (ws-row unsigned-short) ; rows, in characters + (ws-col unsigned-short) ; columns, in characters + (ws-xpixel unsigned-short) ; horizontal size, pixels + (ws-ypixel unsigned-short))) ; veritical size, pixels + ;;;; System calls. @@ -672,6 +706,14 @@ (void-syscall ("rename" c-string c-string) (%name->file name1) (%name->file name2))) +;;; Unix-rmdir accepts a name and removes the associated directory. + +(defun unix-rmdir (name) + _N"Unix-rmdir attempts to remove the directory name. NIL and + an error number is returned if an error occured." + (declare (type unix-pathname name)) + (void-syscall ("rmdir" c-string) (%name->file name))) + ;;; Unix-write accepts a file descriptor, a buffer, an offset, and the ;;; length to write. It attempts to write len bytes to the device ;;; associated with fd from the buffer starting at offset. It returns @@ -929,6 +971,48 @@ (declare (type (signed-byte 32) code)) (void-syscall ("exit" int) code)) +;;; From sys/dir.h +;;; +;;; (For Solaris, this is not struct direct, but struct dirent!) +#-bsd +(def-alien-type nil + (struct direct + #+(and sunos (not svr4)) (d-off long) ; offset of next disk directory entry + (d-ino ino-t); inode number of entry + #+(or linux svr4) (d-off long) + (d-reclen unsigned-short) ; length of this record + #-(or linux svr4) + (d-namlen unsigned-short) ; length of string in d-name + (d-name (array char 256)))) ; name must be no longer than this + +#+(and bsd (not netbsd)) +(def-alien-type nil + (struct direct + (d-fileno unsigned-long) + (d-reclen unsigned-short) + (d-type unsigned-char) + (d-namlen unsigned-char) ; length of string in d-name + (d-name (array char 256)))) ; name must be no longer than this + +#+netbsd +(def-alien-type nil + (struct direct + (d-fileno ino-t) + (d-reclen unsigned-short) + (d-namlen unsigned-short) + (d-type unsigned-char) + (d-name (array char 512)))) + +;;; The 64-bit version of struct dirent. +#+solaris +(def-alien-type nil + (struct dirent64 + (d-ino ino64-t); inode number of entry + (d-off off64-t) ; offset of next disk directory entry + (d-reclen unsigned-short) ; length of this record + (d-name (array char 256)))) ; name must be no longer than this + + #+(and bsd (not netbsd)) (def-alien-type nil (struct stat @@ -950,6 +1034,29 @@ (st-lspare long) (st-qspare (array long 4)))) +(defmacro extract-stat-results (buf) + `(values T + (slot ,buf 'st-dev) + (slot ,buf 'st-ino) + (slot ,buf 'st-mode) + (slot ,buf 'st-nlink) + (slot ,buf 'st-uid) + (slot ,buf 'st-gid) + (slot ,buf 'st-rdev) + (slot ,buf 'st-size) + #-(or svr4 BSD) (slot ,buf 'st-atime) + #+svr4 (slot (slot ,buf 'st-atime) 'tv-sec) + #+BSD (slot (slot ,buf 'st-atime) 'ts-sec) + #-(or svr4 BSD)(slot ,buf 'st-mtime) + #+svr4 (slot (slot ,buf 'st-mtime) 'tv-sec) + #+BSD(slot (slot ,buf 'st-mtime) 'ts-sec) + #-(or svr4 BSD) (slot ,buf 'st-ctime) + #+svr4 (slot (slot ,buf 'st-ctime) 'tv-sec) + #+BSD(slot (slot ,buf 'st-ctime) 'ts-sec) + #+netbsd (slot (slot ,buf 'st-birthtime) 'ts-sec) + (slot ,buf 'st-blksize) + (slot ,buf 'st-blocks))) + (defun unix-stat (name) _N"Unix-stat retrieves information about the specified file returning them in the form of multiple values. @@ -1899,6 +2006,35 @@ (dir "" :type string) (shell "" :type string)) +;; see <pwd.h> +#+solaris +(def-alien-type nil + (struct passwd + (pw-name (* char)) ; user's login name + (pw-passwd (* char)) ; no longer used + (pw-uid uid-t) ; user id + (pw-gid gid-t) ; group id + (pw-age (* char)) ; password age (not used) + (pw-comment (* char)) ; not used + (pw-gecos (* char)) ; typically user's full name + (pw-dir (* char)) ; user's home directory + (pw-shell (* char)))) ; user's login shell + +#+bsd +(def-alien-type nil + (struct passwd + (pw-name (* char)) ; user's login name + (pw-passwd (* char)) ; no longer used + (pw-uid uid-t) ; user id + (pw-gid gid-t) ; group id + (pw-change int) ; password change time + (pw-class (* char)) ; user access class + (pw-gecos (* char)) ; typically user's full name + (pw-dir (* char)) ; user's home directory + (pw-shell (* char)) ; user's login shell + (pw-expire int) ; account expiration + #+(or freebsd darwin) + (pw-fields int))) ; internal ;;;; Other random routines. (def-alien-routine ("isatty" unix-isatty) boolean @@ -1921,6 +2057,10 @@ (it-interval (struct timeval)) ; timer interval (it-value (struct timeval)))) ; current value +(defconstant ITIMER-REAL 0) +(defconstant ITIMER-VIRTUAL 1) +(defconstant ITIMER-PROF 2) + (defun unix-setitimer (which int-secs int-usec val-secs val-usec) _N" Unix-setitimer sets the INTERVAL and VALUE slots of one of three system timers (:real :virtual or :profile). A SIGALRM signal commit fdc539f91d35af5fa1a92e013330a5961a02e92f Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 16 09:22:39 2014 -0800 Add more stuff to unix.lisp. Not yet enough to compile cmucl. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index 1d85aa0..71f6389 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -212,7 +212,73 @@ "UNIX-GETHOSTNAME" "UNIX-LSEEK" "UNIX-EXIT" - "UNIX-CHDIR")) + "UNIX-CHDIR" + "UNIX-ACCESS" + "UNIX-DUP" + "UNIX-CHMOD" + "UNIX-READLINK" + "UNIX-RENAME" + "UNIX-SELECT" + "UNIX-FAST-GETRUSAGE" + "UNIX-GETRUSAGE" + "UNIX-GETTIMEOFDAY" + "UNIX-ISATTY" + "UNIX-MKDIR" + "UNIX-UNLINK" + "UNIX-SETITIMER" + "TIMEZONE" + "TIMEVAL" + "SIZE-T" + "OFF-T" + "INO-T" + "DEV-T" + "TIME-T" + "FD-SETSIZE" + "FD-ISSET" + "FD-CLR" + "TIME-T" + "USER-INFO-NAME" + "INT64-T" + "MODE-T" + "UNIX-FAST-SELECT" + "UNIX-IOCTL" + "UNIX-OPENPTY" + "UNIX-PIPE" + "UNIX-GETPID" + "UNIX-SOCKET" + "UNIX-CONNECT" + "UNIX-BIND" + "UNIX-LISTEN" + "UNIX-ACCEPT" + "UNIX-GETSOCKOPT" + "UNIX-SETSOCKOPT" + "UNIX-GETPEERNAME" + "UNIX-GETSOCKNAME" + "UNIX_RECV" + "UNIX-SEND" + "UNIX-RECVFROM" + "UNIX-SENDTO" + "UNIX-SHUTDOWN" + "UNIX-GETHOSTID" + "UNIX-FCNTL" + "UNIX-UID" + "UNIX-GID" + "UNIX-GETPWUID" + "UNIX-MPROTECT" + "GET-UNIX-ERROR-MSG" + "SGTTYB" + "TCHARS" + "UNIX-TTYNAME" + ;; Simple streams + "PROT_READ" + "UNIX-MMAP" + "UNIX-MUNMAP" + "UNIX-MSYNC" + + "CLOSE-DIR" + "OPEN-DIR" + "READ-DIR" + )) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 6f12a1f..15f0b1e 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -35,8 +35,111 @@ (string-decode ,string *filename-encoding*) ,string))) + +;;;; Common machine independent structures. + +(def-alien-type int64-t (signed 64)) + +(def-alien-type ino-t + #+netbsd u-int64-t + #+alpha unsigned-int + #-(or alpha netbsd) unsigned-long) + +(def-alien-type size-t + #-(or linux alpha) long + #+linux unsigned-int + #+alpha unsigned-long) + +(def-alien-type time-t + #-(or bsd linux alpha) unsigned-long + #+linux long + #+(and bsd (not netbsd)) long + #+(and bsd netbsd) int64-t + #+alpha unsigned-int) + +(def-alien-type dev-t + #-(or alpha svr4 bsd linux) short + #+linux unsigned-short + #+netbsd u-int64-t + #+alpha int + #+(and (not linux) (not netbsd) (or bsd svr4)) unsigned-long) + +#-BSD +(progn + (deftype file-offset () '(signed-byte 32)) + (def-alien-type off-t + #-alpha long + #+alpha unsigned-long) ;??? very dubious + (def-alien-type uid-t + #-(or alpha svr4) unsigned-short + #+alpha unsigned-int + #+svr4 long) + (def-alien-type gid-t + #-(or alpha svr4) unsigned-short + #+alpha unsigned-int + #+svr4 long)) + +#+BSD +(progn + (deftype file-offset () '(signed-byte 64)) + (def-alien-type off-t int64-t) + (def-alien-type uid-t unsigned-long) + (def-alien-type gid-t unsigned-long)) + +(def-alien-type mode-t + #-(or alpha svr4) unsigned-short + #+alpha unsigned-int + #+svr4 unsigned-long) + +;; not checked for linux... +(defmacro fd-clr (offset fd-set) + (let ((word (gensym)) + (bit (gensym))) + `(multiple-value-bind (,word ,bit) (floor ,offset 32) + (setf (deref (slot ,fd-set 'fds-bits) ,word) + (logand (deref (slot ,fd-set 'fds-bits) ,word) + (32bit-logical-not + (truly-the (unsigned-byte 32) (ash 1 ,bit)))))))) + +;; not checked for linux... +(defmacro fd-isset (offset fd-set) + (let ((word (gensym)) + (bit (gensym))) + `(multiple-value-bind (,word ,bit) (floor ,offset 32) + (logbitp ,bit (deref (slot ,fd-set 'fds-bits) ,word))))) + +(defconstant fd-setsize + #-(or hpux alpha linux FreeBSD) 256 + #+hpux 2048 #+alpha 4096 #+(or linux FreeBSD) 1024) + +;; not checked for linux... +(def-alien-type nil + (struct fd-set + (fds-bits (array #-alpha unsigned-long #+alpha int #.(/ fd-setsize 32))))) + +;;; From ioctl.h +(def-alien-type nil + (struct tchars + (t-intrc char) ; interrupt + (t-quitc char) ; quit + #+linux (t-eofc char) + (t-startc char) ; start output + (t-stopc char) ; stop output + #-linux (t-eofc char) ; end-of-file + (t-brkc char))) ; input delimiter (like nl) + +(def-alien-type nil + (struct sgttyb + #+linux (sg-flags #+mach short #-mach int) ; mode flags + (sg-ispeed char) ; input speed. + (sg-ospeed char) ; output speed + (sg-erase char) ; erase character + #-linux (sg-kill char) ; kill character + #-linux (sg-flags #+mach short #-mach int) ; mode flags + #+linux (sg-kill char) + #+linux (t (struct termios)) + #+linux (check int))) -(export '()) ;;;; System calls. @@ -51,9 +154,162 @@ (defmacro syscall ((name &rest arg-types) success-form &rest args) `(%syscall (,name (,@arg-types) int) ,success-form ,@args)) +;;; Like syscall, but if it fails, signal an error instead of returing error +;;; codes. Should only be used for syscalls that will never really get an +;;; error. +;;; +(defmacro syscall* ((name &rest arg-types) success-form &rest args) + `(let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) + ,@args))) + (if (eql -1 result) + (error _"Syscall ~A failed: ~A" ,name (get-unix-error-msg)) + ,success-form))) + (defmacro void-syscall ((name &rest arg-types) &rest args) `(syscall (,name ,@arg-types) (values t 0) ,@args)) +(defmacro int-syscall ((name &rest arg-types) &rest args) + `(syscall (,name ,@arg-types) (values result 0) ,@args)) + +(defmacro off-t-syscall ((name arg-types) &rest args) + `(%syscall (,name ,arg-types off-t) (values result 0) ,@args)) + + +;;; Operations on Unix Directories. + +(export '(open-dir read-dir close-dir)) + +(defstruct (%directory + (:conc-name directory-) + (:constructor make-directory) + (:print-function %print-directory)) + name + (dir-struct (required-argument) :type system-area-pointer)) + +(defun %print-directory (dir stream depth) + (declare (ignore depth)) + (format stream "#<Directory ~S>" (directory-name dir))) + +(defun open-dir (pathname) + (declare (type unix-pathname pathname)) + (when (string= pathname "") + (setf pathname ".")) + (let ((kind (unix-file-kind pathname))) + (case kind + (:directory + (let ((dir-struct + (alien-funcall (extern-alien "opendir" + (function system-area-pointer + c-string)) + (%name->file pathname)))) + (if (zerop (sap-int dir-struct)) + (values nil (unix-errno)) + (make-directory :name pathname :dir-struct dir-struct)))) + ((nil) + (values nil enoent)) + (t + (values nil enotdir))))) + +#-(and bsd (not solaris)) +(defun read-dir (dir) + (declare (type %directory dir)) + (let ((daddr (alien-funcall (extern-alien "readdir" + (function system-area-pointer + system-area-pointer)) + (directory-dir-struct dir)))) + (declare (type system-area-pointer daddr)) + (if (zerop (sap-int daddr)) + nil + (with-alien ((direct (* (struct direct)) daddr)) + #-(or linux svr4) + (let ((nlen (slot direct 'd-namlen)) + (ino (slot direct 'd-ino))) + (declare (type (unsigned-byte 16) nlen)) + (let ((string (make-string nlen))) + #-unicode + (kernel:copy-from-system-area + (alien-sap (addr (slot direct 'd-name))) 0 + string (* vm:vector-data-offset vm:word-bits) + (* nlen vm:byte-bits)) + #+unicode + (let ((sap (alien-sap (addr (slot direct 'd-name))))) + (dotimes (k nlen) + (setf (aref string k) + (code-char (sap-ref-8 sap k))))) + (values (%file->name string) ino))) + #+(or linux svr4) + (values (%file->name (cast (slot direct 'd-name) c-string)) + (slot direct 'd-ino)))))) + +;;; 64-bit readdir for Solaris +#+solaris +(defun read-dir (dir) + (declare (type %directory dir)) + (let ((daddr (alien-funcall (extern-alien "readdir64" + (function system-area-pointer + system-area-pointer)) + (directory-dir-struct dir)))) + (declare (type system-area-pointer daddr)) + (if (zerop (sap-int daddr)) + nil + (with-alien ((direct (* (struct dirent64)) daddr)) + #-(or linux svr4) + (let ((nlen (slot direct 'd-namlen)) + (ino (slot direct 'd-ino))) + (declare (type (unsigned-byte 16) nlen)) + (let ((string (make-string nlen))) + #-unicode + (kernel:copy-from-system-area + (alien-sap (addr (slot direct 'd-name))) 0 + string (* vm:vector-data-offset vm:word-bits) + (* nlen vm:byte-bits)) + #+unicode + (let ((sap (alien-sap (addr (slot direct 'd-name))))) + (dotimes (k nlen) + (setf (aref string k) + (code-char (sap-ref-8 sap k))))) + (values (%file->name string) ino))) + #+(or linux svr4) + (values (%file->name (cast (slot direct 'd-name) c-string)) + (slot direct 'd-ino)))))) + +#+(and bsd (not solaris)) +(defun read-dir (dir) + (declare (type %directory dir)) + (let ((daddr (alien-funcall (extern-alien "readdir" + (function system-area-pointer + system-area-pointer)) + (directory-dir-struct dir)))) + (declare (type system-area-pointer daddr)) + (if (zerop (sap-int daddr)) + nil + (with-alien ((direct (* (struct direct)) daddr)) + (let ((nlen (slot direct 'd-namlen)) + (fino (slot direct 'd-fileno))) + (declare (type (unsigned-byte #+netbsd 16 #-netbsd 8) nlen) + (type (unsigned-byte #+netbsd 64 #-netbsd 32) fino)) + (let ((string (make-string nlen))) + #-unicode + (kernel:copy-from-system-area + (alien-sap (addr (slot direct 'd-name))) 0 + string (* vm:vector-data-offset vm:word-bits) + (* nlen vm:byte-bits)) + #+unicode + (let ((sap (alien-sap (addr (slot direct 'd-name))))) + (dotimes (k nlen) + (setf (aref string k) + (code-char (sap-ref-8 sap k))))) + (values (%file->name string) fino))))))) + + +(defun close-dir (dir) + (declare (type %directory dir)) + (alien-funcall (extern-alien "closedir" + (function void system-area-pointer)) + (directory-dir-struct dir)) + nil) + + ;; Use getcwd instead of getwd. But what should we do if the path ;; won't fit? Try again with a larger size? We don't do that right ;; now. @@ -72,6 +328,30 @@ (sap-int (alien-sap result)))) (%file->name (cast buf c-call:c-string)))))) +;;; Unix-access accepts a path and a mode. It returns two values the +;;; first is T if the file is accessible and NIL otherwise. The second +;;; only has meaning in the second case and is the unix errno value. + +(defconstant r_ok 4 _N"Test for read permission") +(defconstant w_ok 2 _N"Test for write permission") +(defconstant x_ok 1 _N"Test for execute permission") +(defconstant f_ok 0 _N"Test for presence of file") + +(defun unix-access (path mode) + _N"Given a file path (a string) and one of four constant modes, + unix-access returns T if the file is accessible with that + mode and NIL if not. It also returns an errno value with + NIL which determines why the file was not accessible. + + The access modes are: + r_ok Read permission. + w_ok Write permission. + x_ok Execute permission. + f_ok Presence of file." + (declare (type unix-pathname path) + (type (mod 8) mode)) + (void-syscall ("access" c-string int) (%name->file path) mode)) + ;;; Unix-chdir accepts a directory name and makes that the ;;; current working directory. @@ -81,6 +361,48 @@ (declare (type unix-pathname path)) (void-syscall ("chdir" c-string) (%name->file path))) +;;; Unix-chmod accepts a path and a mode and changes the mode to the new mode. + +(defconstant setuidexec #o4000 _N"Set user ID on execution") +(defconstant setgidexec #o2000 _N"Set group ID on execution") +(defconstant savetext #o1000 _N"Save text image after execution") +(defconstant readown #o400 _N"Read by owner") +(defconstant writeown #o200 _N"Write by owner") +(defconstant execown #o100 _N"Execute (search directory) by owner") +(defconstant readgrp #o40 _N"Read by group") +(defconstant writegrp #o20 _N"Write by group") +(defconstant execgrp #o10 _N"Execute (search directory) by group") +(defconstant readoth #o4 _N"Read by others") +(defconstant writeoth #o2 _N"Write by others") +(defconstant execoth #o1 _N"Execute (search directory) by others") + +(defun unix-chmod (path mode) + _N"Given a file path string and a constant mode, unix-chmod changes the + permission mode for that file to the one specified. The new mode + can be created by logically OR'ing the following: + + setuidexec Set user ID on execution. + setgidexec Set group ID on execution. + savetext Save text image after execution. + readown Read by owner. + writeown Write by owner. + execown Execute (search directory) by owner. + readgrp Read by group. + writegrp Write by group. + execgrp Execute (search directory) by group. + readoth Read by others. + writeoth Write by others. + execoth Execute (search directory) by others. + + Thus #o444 and (logior unix:readown unix:readgrp unix:readoth) + are equivalent for 'mode. The octal-base is familar to Unix users. + + It returns T on successfully completion; NIL and an error number + otherwise." + (declare (type unix-pathname path) + (type unix-file-mode mode)) + (void-syscall ("chmod" c-string int) (%name->file path) mode)) + ;;; Unix-lseek accepts a file descriptor, an offset, and whence value. (defconstant l_set 0 _N"set the file pointer") @@ -100,6 +422,26 @@ (type (integer 0 2) whence)) (off-t-syscall ("lseek" (int off-t int)) fd offset whence)) +;;; Unix-mkdir accepts a name and a mode and attempts to create the +;;; corresponding directory with mode mode. + +(defun unix-mkdir (name mode) + _N"Unix-mkdir creates a new directory with the specified name and mode. + (Same as those for unix-chmod.) It returns T upon success, otherwise + NIL and an error number." + (declare (type unix-pathname name) + (type unix-file-mode mode)) + (void-syscall ("mkdir" c-string int) (%name->file name) mode)) + +;;; Unix-unlink accepts a name and deletes the directory entry for that +;;; name and the file if this is the last link. + +(defun unix-unlink (name) + _N"Unix-unlink removes the directory entry for the named file. + NIL and an error code is returned if the call fails." + (declare (type unix-pathname name)) + (void-syscall ("unlink" c-string) (%name->file name))) + ;;; Unix-open accepts a pathname (a simple string), flags, and mode and ;;; attempts to open file with name pathname. @@ -167,6 +509,97 @@ ;;; and store them into the buffer. It returns the actual number of ;;; bytes read. +;;; Unix-dup returns a duplicate copy of the existing file-descriptor +;;; passed as an argument. + +(defun unix-dup (fd) + _N"Unix-dup duplicates an existing file descriptor (given as the + argument) and return it. If FD is not a valid file descriptor, NIL + and an error number are returned." + (declare (type unix-fd fd)) + (int-syscall ("dup" int) fd)) + +;;; Unix-fcntl takes a file descriptor, an integer command +;;; number, and optional command arguments. It performs +;;; operations on the associated file and/or returns inform- +;;; ation about the file. + +;;; Operations performed on file descriptors: + +(defconstant F-DUPFD 0 _N"Duplicate a file descriptor") +(defconstant F-GETFD 1 _N"Get file desc. flags") +(defconstant F-SETFD 2 _N"Set file desc. flags") +(defconstant F-GETFL 3 _N"Get file flags") +(defconstant F-SETFL 4 _N"Set file flags") +#-(or linux svr4) +(defconstant F-GETOWN 5 _N"Get owner") +#+svr4 +(defconstant F-GETOWN 23 _N"Get owner") +#+linux +(defconstant F-GETLK 5 _N"Get lock") +#-(or linux svr4) +(defconstant F-SETOWN 6 _N"Set owner") +#+svr4 +(defconstant F-SETOWN 24 _N"Set owner") +#+linux +(defconstant F-SETLK 6 _N"Set lock") +#+linux +(defconstant F-SETLKW 7 _N"Set lock, wait for release") +#+linux +(defconstant F-SETOWN 8 _N"Set owner") + +;;; File flags for F-GETFL and F-SETFL: + +(defconstant FNDELAY #-osf1 #o0004 #+osf1 #o100000 _N"Non-blocking reads") +(defconstant FAPPEND #-linux #o0010 #+linux #o2000 _N"Append on each write") +(defconstant FASYNC #-(or linux svr4) #o0100 #+svr4 #o10000 #+linux #o20000 + _N"Signal pgrp when data ready") +;; doesn't exist in Linux ;-( +#-linux (defconstant FCREAT #-(or hpux svr4) #o1000 #+(or hpux svr4) #o0400 + _N"Create if nonexistant") +#-linux (defconstant FTRUNC #-(or hpux svr4) #o2000 #+(or hpux svr4) #o1000 + _N"Truncate to zero length") +#-linux (defconstant FEXCL #-(or hpux svr4) #o4000 #+(or hpux svr4) #o2000 + _N"Error if already created") + +(defun unix-fcntl (fd cmd arg) + _N"Unix-fcntl manipulates file descriptors according to the + argument CMD which can be one of the following: + + F-DUPFD Duplicate a file descriptor. + F-GETFD Get file descriptor flags. + F-SETFD Set file descriptor flags. + F-GETFL Get file flags. + F-SETFL Set file flags. + F-GETOWN Get owner. + F-SETOWN Set owner. + + The flags that can be specified for F-SETFL are: + + FNDELAY Non-blocking reads. + FAPPEND Append on each write. + FASYNC Signal pgrp when data ready. + FCREAT Create if nonexistant. + FTRUNC Truncate to zero length. + FEXCL Error if already created. + " + (declare (type unix-fd fd) + (type (unsigned-byte 32) cmd) + (type (unsigned-byte 32) arg)) + (int-syscall ("fcntl" int unsigned-int unsigned-int) fd cmd arg)) + +(defun unix-pipe () + _N"Unix-pipe sets up a unix-piping mechanism consisting of + an input pipe and an output pipe. Unix-Pipe returns two + values: if no error occurred the first value is the pipe + to be read from and the second is can be written to. If + an error occurred the first value is NIL and the second + the unix error code." + (with-alien ((fds (array int 2))) + (syscall ("pipe" (* int)) + (values (deref fds 0) (deref fds 1)) + (cast fds (* int))))) + (defun unix-read (fd buf len) _N"Unix-read attempts to read from the file described by fd into the buffer buf until it is full. Len is the length of the buffer. @@ -208,6 +641,37 @@ (setf (sap-ref-8 sap 0) (sap-ref-8 sap 0))))) (int-syscall ("read" int (* char) int) fd buf len)) +(defun unix-readlink (path) + _N"Unix-readlink invokes the readlink system call on the file name + specified by the simple string path. It returns up to two values: + the contents of the symbolic link if the call is successful, or + NIL and the Unix error number." + (declare (type unix-pathname path)) + (with-alien ((buf (array char 1024))) + (syscall ("readlink" c-string (* char) int) + (let ((string (make-string result))) + #-unicode + (kernel:copy-from-system-area + (alien-sap buf) 0 + string (* vm:vector-data-offset vm:word-bits) + (* result vm:byte-bits)) + #+unicode + (let ((sap (alien-sap buf))) + (dotimes (k result) + (setf (aref string k) + (code-char (sap-ref-8 sap k))))) + (%file->name string)) + (%name->file path) (cast buf (* char)) 1024))) + +;;; Unix-rename accepts two files names and renames the first to the second. + +(defun unix-rename (name1 name2) + _N"Unix-rename renames the file with string name1 to the string + name2. NIL and an error code is returned if an error occured." + (declare (type unix-pathname name1 name2)) + (void-syscall ("rename" c-string c-string) + (%name->file name1) (%name->file name2))) + ;;; Unix-write accepts a file descriptor, a buffer, an offset, and the ;;; length to write. It attempts to write len bytes to the device ;;; associated with fd from the buffer starting at offset. It returns @@ -228,6 +692,217 @@ buf)))) (addr (deref ptr offset))) len)) + +;;; Unix-ioctl is used to change parameters of devices in a device +;;; dependent way. + + +(defconstant terminal-speeds + '#(0 50 75 110 134 150 200 300 600 #+hpux 900 1200 1800 2400 #+hpux 3600 + 4800 #+hpux 7200 9600 19200 38400 57600 115200 230400 + #+hpux 460800)) + +;;; from /usr/include/bsd/sgtty.h (linux) + +(defconstant tty-raw #-linux #o40 #+linux 1) +(defconstant tty-crmod #-linux #o20 #+linux 4) +#-(or hpux svr4 bsd linux) (defconstant tty-echo #o10) ;; 8 +(defconstant tty-lcase #-linux #o4 #+linux 2) +#-hpux +(defconstant tty-cbreak #-linux #o2 #+linux 64) +#-(or linux hpux) +(defconstant tty-tandem #o1) + +#+(or hpux svr4 bsd linux) +(progn + (defmacro def-enum (inc cur &rest names) + (flet ((defform (name) + (prog1 (when name `(defconstant ,name ,cur)) + (setf cur (funcall inc cur 1))))) + `(progn ,@(mapcar #'defform names)))) + + ;; Input modes. Linux: /usr/include/asm/termbits.h + (def-enum ash 1 tty-ignbrk tty-brkint tty-ignpar tty-parmrk tty-inpck + tty-istrip tty-inlcr tty-igncr tty-icrnl #-bsd tty-iuclc + tty-ixon #-bsd tty-ixany tty-ixoff #+bsd tty-ixany + #+hpux tty-ienqak #+bsd nil tty-imaxbel) + + ;; output modes + #-bsd (def-enum ash 1 tty-opost tty-olcuc tty-onlcr tty-ocrnl tty-onocr + tty-onlret tty-ofill tty-ofdel) + #+bsd (def-enum ash 1 tty-opost tty-onlcr) + + ;; local modes + #-bsd (def-enum ash 1 tty-isig tty-icanon tty-xcase tty-echo tty-echoe + tty-echok tty-echonl tty-noflsh #+irix tty-iexten + #+(or sunos linux) tty-tostop tty-echoctl tty-echoprt + tty-echoke #+(or sunos svr4) tty-defecho tty-flusho + #+linux nil tty-pendin #+irix tty-tostop + #+(or sunos linux) tty-iexten) + #+bsd (def-enum ash 1 tty-echoke tty-echoe tty-echok tty-echo tty-echonl + tty-echoprt tty-echoctl tty-isig tty-icanon nil + tty-iexten) + #+bsd (defconstant tty-tostop #x00400000) + #+bsd (defconstant tty-flusho #x00800000) + #+bsd (defconstant tty-pendin #x20000000) + #+bsd (defconstant tty-noflsh #x80000000) + #+hpux (defconstant tty-tostop #o10000000000) + #+hpux (defconstant tty-iexten #o20000000000) + + ;; control modes + (def-enum ash #-bsd #o100 #+bsd #x400 #+hpux nil tty-cstopb + tty-cread tty-parenb tty-parodd tty-hupcl tty-clocal + #+svr4 rcv1en #+svr4 xmt1en #+(or hpux svr4) tty-loblk) + + ;; special control characters + #+(or hpux svr4 linux) (def-enum + 0 vintr vquit verase vkill veof + #-linux veol #-linux veol2) + #+bsd (def-enum + 0 veof veol veol2 verase nil vkill nil nil vintr vquit) + #+linux (defconstant veol 11) + #+linux (defconstant veol2 16) + + (defconstant tciflush 0) + (defconstant tcoflush 1) + (defconstant tcioflush 2)) + +#+bsd +(progn + (defconstant vmin 16) + (defconstant vtime 17) + (defconstant vsusp 10) + (defconstant vstart 12) + (defconstant vstop 13) + (defconstant vdsusp 11)) + +#+hpux +(progn + (defconstant vmin 11) + (defconstant vtime 12) + (defconstant vsusp 13) + (defconstant vstart 14) + (defconstant vstop 15) + (defconstant vdsusp 21)) + +#+(or hpux bsd linux) +(progn + (defconstant tcsanow 0) + (defconstant tcsadrain 1) + (defconstant tcsaflush 2)) + +#+(or linux svr4) +(progn + #-linux (defconstant vdsusp 11) + (defconstant vstart 8) + (defconstant vstop 9) + (defconstant vsusp 10) + (defconstant vmin #-linux 4 #+linux 6) + (defconstant vtime 5)) + +#+(or sunos svr4) +(progn + ;; control modes + (defconstant tty-cbaud #o17) + (defconstant tty-csize #o60) + (defconstant tty-cs5 #o0) + (defconstant tty-cs6 #o20) + (defconstant tty-cs7 #o40) + (defconstant tty-cs8 #o60)) + +#+bsd +(progn + ;; control modes + (defconstant tty-csize #x300) + (defconstant tty-cs5 #x000) + (defconstant tty-cs6 #x100) + (defconstant tty-cs7 #x200) + (defconstant tty-cs8 #x300)) + +#+svr4 +(progn + (defconstant tcsanow #x540e) + (defconstant tcsadrain #x540f) + (defconstant tcsaflush #x5410)) + +(eval-when (compile load eval) + +#-(or (and svr4 (not irix)) linux) +(progn + (defconstant iocparm-mask #x7f) ; Freebsd: #x1fff ? + (defconstant ioc_void #x20000000) + (defconstant ioc_out #x40000000) + (defconstant ioc_in #x80000000) + (defconstant ioc_inout (logior ioc_in ioc_out))) + +#-(or linux (and svr4 (not irix))) +(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) + (let* ((ptype (ecase parm-type + (:void ioc_void) + (:in ioc_in) + (:out ioc_out) + (:inout ioc_inout))) + (code (logior (ash (char-code dev) 8) cmd ptype))) + (when arg + (setf code + `(logior (ash (logand (alien-size ,arg :bytes) + ,iocparm-mask) + 16) + ,code))) + `(eval-when (eval load compile) + (defconstant ,name ,code)))) + +#+(and svr4 (not irix)) +(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) + (declare (ignore dev arg parm-type)) + `(eval-when (eval load compile) + (defconstant ,name ,(logior (ash (char-code #\t) 8) cmd)))) + +#+linux +(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) + (declare (ignore arg parm-type)) + `(eval-when (eval load compile) + (defconstant ,name ,(logior (ash (- (char-code dev) #x20) 8) cmd)))) + +) + +;;; TTY ioctl commands. + +(define-ioctl-command TIOCGETP #\t #-linux 8 #+linux #x81 (struct sgttyb) :out) +(define-ioctl-command TIOCSETP #\t #-linux 9 #+linux #x82 (struct sgttyb) :in) +(define-ioctl-command TIOCFLUSH #\t #-linux 16 #+linux #x89 int :in) +(define-ioctl-command TIOCSETC #\t #-linux 17 #+linux #x84 (struct tchars) :in) +(define-ioctl-command TIOCGETC #\t #-linux 18 #+linux #x83 (struct tchars) :out) +(define-ioctl-command TIOCGWINSZ #\t #-hpux 104 #+hpux 107 (struct winsize) + :out) +(define-ioctl-command TIOCSWINSZ #\t #-hpux 103 #+hpux 106 (struct winsize) + :in) + +(define-ioctl-command TIOCNOTTY #\t #-linux 113 #+linux #x22 nil :void) +#-hpux +(progn + (define-ioctl-command TIOCSLTC #\t #-linux 117 #+linux #x84 (struct ltchars) :in) + (define-ioctl-command TIOCGLTC #\t #-linux 116 #+linux #x85 (struct ltchars) :out) + (define-ioctl-command TIOCSPGRP #\t #-svr4 118 #+svr4 21 int :in) + (define-ioctl-command TIOCGPGRP #\t #-svr4 119 #+svr4 20 int :out)) +#+hpux +(progn + (define-ioctl-command TIOCSLTC #\T 23 (struct ltchars) :in) + (define-ioctl-command TIOCGLTC #\T 24 (struct ltchars) :out) + (define-ioctl-command TIOCSPGRP #\T 29 int :in) + (define-ioctl-command TIOCGPGRP #\T 30 int :out) + (define-ioctl-command TIOCSIGSEND #\t 93 nil)) + +;;; File ioctl commands. +(define-ioctl-command FIONREAD #\f #-linux 127 #+linux #x1B int :out) + + +(defun unix-ioctl (fd cmd arg) + _N"Unix-ioctl performs a variety of operations on open i/o + descriptors. See the UNIX Programmer's Manual for more + information." + (declare (type unix-fd fd) + (type (unsigned-byte 32) cmd)) + (int-syscall ("ioctl" int unsigned-int (* char)) fd cmd arg)) + ;;; Unix-getpagesize returns the number of bytes in the system page. (defun unix-getpagesize () @@ -241,6 +916,10 @@ (cast buf c-string) (cast buf (* char)) 256))) +(def-alien-routine ("gethostid" unix-gethostid) unsigned-long + _N"Unix-gethostid returns a 32-bit integer which provides unique + identification for the host machine.") + ;;; Unix-exit terminates a program. (defun unix-exit (&optional (code 0)) @@ -303,6 +982,73 @@ (extract-stat-results buf) fd (addr buf)))) +(def-alien-type nil + (struct rusage + (ru-utime (struct timeval)) ; user time used + (ru-stime (struct timeval)) ; system time used. + (ru-maxrss long) + (ru-ixrss long) ; integral sharded memory size + (ru-idrss long) ; integral unsharded data " + (ru-isrss long) ; integral unsharded stack " + (ru-minflt long) ; page reclaims + (ru-majflt long) ; page faults + (ru-nswap long) ; swaps + (ru-inblock long) ; block input operations + (ru-oublock long) ; block output operations + (ru-msgsnd long) ; messages sent + (ru-msgrcv long) ; messages received + (ru-nsignals long) ; signals received + (ru-nvcsw long) ; voluntary context switches + (ru-nivcsw long))) ; involuntary " + +(defconstant rusage_self 0 _N"The calling process.") +(defconstant rusage_children -1 _N"Terminated child processes.") + +(declaim (inline unix-fast-getrusage)) +(defun unix-fast-getrusage (who) + _N"Like call getrusage, but return only the system and user time, and returns + the seconds and microseconds as separate values." + (declare (values (member t) + (unsigned-byte 31) (mod 1000000) + (unsigned-byte 31) (mod 1000000))) + (with-alien ((usage (struct rusage))) + (syscall* (#-netbsd "getrusage" #+netbsd "__getrusage50" int (* (struct rusage))) + (values t + (slot (slot usage 'ru-utime) 'tv-sec) + (slot (slot usage 'ru-utime) 'tv-usec) + (slot (slot usage 'ru-stime) 'tv-sec) + (slot (slot usage 'ru-stime) 'tv-usec)) + who (addr usage)))) + +(defun unix-getrusage (who) + _N"Unix-getrusage returns information about the resource usage + of the process specified by who. Who can be either the + current process (rusage_self) or all of the terminated + child processes (rusage_children). NIL and an error number + is returned if the call fails." + (with-alien ((usage (struct rusage))) + (syscall (#-netbsd "getrusage" #+netbsd "__getrusage50" int (* (struct rusage))) + (values t + (+ (* (slot (slot usage 'ru-utime) 'tv-sec) 1000000) + (slot (slot usage 'ru-utime) 'tv-usec)) + (+ (* (slot (slot usage 'ru-stime) 'tv-sec) 1000000) + (slot (slot usage 'ru-stime) 'tv-usec)) + (slot usage 'ru-maxrss) + (slot usage 'ru-ixrss) + (slot usage 'ru-idrss) + (slot usage 'ru-isrss) + (slot usage 'ru-minflt) + (slot usage 'ru-majflt) + (slot usage 'ru-nswap) + (slot usage 'ru-inblock) + (slot usage 'ru-oublock) + (slot usage 'ru-msgsnd) + (slot usage 'ru-msgrcv) + (slot usage 'ru-nsignals) + (slot usage 'ru-nvcsw) + (slot usage 'ru-nivcsw)) + who (addr usage)))) + ;;;; Support routines for dealing with unix pathnames. (defconstant s-ifmt #o0170000) @@ -814,3 +1560,452 @@ (def-alien-routine ("os_set_errno" unix-set-errno) int (newvalue int)) (defun unix-errno () (unix-get-errno)) +;;; GET-UNIX-ERROR-MSG -- public. +;;; +(defun get-unix-error-msg (&optional (error-number (unix-errno))) + _N"Returns a string describing the error number which was returned by a + UNIX system call." + (declare (type integer error-number)) + (if (array-in-bounds-p *unix-errors* error-number) + (svref *unix-errors* error-number) + (format nil _"Unknown error [~d]" error-number))) + + +;;;; Lisp types used by syscalls. + +(deftype unix-pathname () 'simple-string) +(deftype unix-fd () `(integer 0 ,most-positive-fixnum)) + +(deftype unix-file-mode () '(unsigned-byte 32)) +(deftype unix-uid () '(unsigned-byte 32)) +(deftype unix-gid () '(unsigned-byte 32)) + + +;;; UNIX-FAST-SELECT -- public. +;;; +(defmacro unix-fast-select (num-descriptors + read-fds write-fds exception-fds + timeout-secs &optional (timeout-usecs 0)) + _N"Perform the UNIX select(2) system call. + (declare (type (integer 0 #.FD-SETSIZE) num-descriptors) + (type (or (alien (* (struct fd-set))) null) + read-fds write-fds exception-fds) + (type (or null (unsigned-byte 31)) timeout-secs) + (type (unsigned-byte 31) timeout-usecs) + (optimize (speed 3) (safety 0) (inhibit-warnings 3)))" + `(let ((timeout-secs ,timeout-secs)) + (with-alien ((tv (struct timeval))) + (when timeout-secs + (setf (slot tv 'tv-sec) timeout-secs) + (setf (slot tv 'tv-usec) ,timeout-usecs)) + (int-syscall (#-netbsd "select" #+netbsd "__select50" int (* (struct fd-set)) (* (struct fd-set)) + (* (struct fd-set)) (* (struct timeval))) + ,num-descriptors ,read-fds ,write-fds ,exception-fds + (if timeout-secs (alien-sap (addr tv)) (int-sap 0)))))) + +;;; Unix-select accepts sets of file descriptors and waits for an event +;;; to happen on one of them or to time out. + +(defmacro num-to-fd-set (fdset num) + `(if (fixnump ,num) + (progn + (setf (deref (slot ,fdset 'fds-bits) 0) ,num) + ,@(loop for index upfrom 1 below (/ fd-setsize 32) + collect `(setf (deref (slot ,fdset 'fds-bits) ,index) 0))) + (progn + ,@(loop for index upfrom 0 below (/ fd-setsize 32) + collect `(setf (deref (slot ,fdset 'fds-bits) ,index) + (ldb (byte 32 ,(* index 32)) ,num)))))) + +(defmacro fd-set-to-num (nfds fdset) + `(if (<= ,nfds 32) + (deref (slot ,fdset 'fds-bits) 0) + (+ ,@(loop for index upfrom 0 below (/ fd-setsize 32) + collect `(ash (deref (slot ,fdset 'fds-bits) ,index) + ,(* index 32)))))) + +;; not checked for linux... +(defmacro fd-set (offset fd-set) + (let ((word (gensym)) + (bit (gensym))) + `(multiple-value-bind (,word ,bit) (floor ,offset 32) + (setf (deref (slot ,fd-set 'fds-bits) ,word) + (logior (truly-the (unsigned-byte 32) (ash 1 ,bit)) + (deref (slot ,fd-set 'fds-bits) ,word)))))) + +;; not checked for linux... +(defmacro fd-zero (fd-set) + `(progn + ,@(loop for index upfrom 0 below (/ fd-setsize 32) + collect `(setf (deref (slot ,fd-set 'fds-bits) ,index) 0)))) + +(defun unix-select (nfds rdfds wrfds xpfds to-secs &optional (to-usecs 0)) + _N"Unix-select examines the sets of descriptors passed as arguments + to see if they are ready for reading and writing. See the UNIX + Programmers Manual for more information." + (declare (type (integer 0 #.FD-SETSIZE) nfds) + (type unsigned-byte rdfds wrfds xpfds) + (type (or (unsigned-byte 31) null) to-secs) + (type (unsigned-byte 31) to-usecs) + (optimize (speed 3) (safety 0) (inhibit-warnings 3))) + (with-alien ((tv (struct timeval)) + (rdf (struct fd-set)) + (wrf (struct fd-set)) + (xpf (struct fd-set))) + (when to-secs + (setf (slot tv 'tv-sec) to-secs) + (setf (slot tv 'tv-usec) to-usecs)) + (num-to-fd-set rdf rdfds) + (num-to-fd-set wrf wrfds) + (num-to-fd-set xpf xpfds) + (macrolet ((frob (lispvar alienvar) + `(if (zerop ,lispvar) + (int-sap 0) + (alien-sap (addr ,alienvar))))) + (syscall (#-netbsd "select" #+netbsd "__select50" int (* (struct fd-set)) (* (struct fd-set)) + (* (struct fd-set)) (* (struct timeval))) + (values result + (fd-set-to-num nfds rdf) + (fd-set-to-num nfds wrf) + (fd-set-to-num nfds xpf)) + nfds (frob rdfds rdf) (frob wrfds wrf) (frob xpfds xpf) + (if to-secs (alien-sap (addr tv)) (int-sap 0)))))) + +(def-alien-type nil + (struct timeval + (tv-sec #-linux time-t #+linux int) ; seconds + (tv-usec int))) ; and microseconds + +(def-alien-type nil + (struct timezone + (tz-minuteswest int) ; minutes west of Greenwich + (tz-dsttime ; type of dst correction + #-linux (enum nil :none :usa :aust :wet :met :eet :can) + #+linux int))) + +(declaim (inline unix-gettimeofday)) +(defun unix-gettimeofday () + _N"If it works, unix-gettimeofday returns 5 values: T, the seconds and + microseconds of the current time of day, the timezone (in minutes west + of Greenwich), and a daylight-savings flag. If it doesn't work, it + returns NIL and the errno." + (with-alien ((tv (struct timeval)) + #-(or svr4 netbsd) (tz (struct timezone))) + (syscall* (#-netbsd "gettimeofday" + #+netbsd "__gettimeofday50" + (* (struct timeval)) #-svr4 (* (struct timezone))) + (values T + (slot tv 'tv-sec) + (slot tv 'tv-usec) + #-(or svr4 netbsd) (slot tz 'tz-minuteswest) + #+svr4 (unix-get-minutes-west (slot tv 'tv-sec)) + #-(or svr4 netbsd) (slot tz 'tz-dsttime) + #+svr4 (unix-get-timezone (slot tv 'tv-sec)) + ) + (addr tv) + #-(or svr4 netbsd) (addr tz) #+netbsd nil))) + +(def-alien-routine ("getpid" unix-getpid) int + _N"Unix-getpid returns the process-id of the current process.") + + +;;;; Socket support. + +(def-alien-routine ("socket" unix-socket) int + (domain int) + (type int) + (protocol int)) + +(def-alien-routine ("connect" unix-connect) int + (socket int) + (sockaddr (* t)) + (len int)) + +(def-alien-routine ("bind" unix-bind) int + (socket int) + (sockaddr (* t)) + (len int)) + +(def-alien-routine ("listen" unix-listen) int + (socket int) + (backlog int)) + +(def-alien-routine ("accept" unix-accept) int + (socket int) + (sockaddr (* t)) + (len int :in-out)) + +(def-alien-routine ("recv" unix-recv) int + (fd int) + (buffer c-string) + (length int) + (flags int)) + +(def-alien-routine ("send" unix-send) int + (fd int) + (buffer c-string) + (length int) + (flags int)) + +(def-alien-routine ("getpeername" unix-getpeername) int + (socket int) + (sockaddr (* t)) + (len (* unsigned))) + +(def-alien-routine ("getsockname" unix-getsockname) int + (socket int) + (sockaddr (* t)) + (len (* unsigned))) + +(def-alien-routine ("getsockopt" unix-getsockopt) int + (socket int) + (level int) + (optname int) + (optval (* t)) + (optlen unsigned :in-out)) + +(def-alien-routine ("setsockopt" unix-setsockopt) int + (socket int) + (level int) + (optname int) + (optval (* t)) + (optlen unsigned)) + +;; Datagram support + +(defun unix-recvfrom (fd buffer length flags sockaddr len) + (with-alien ((l c-call:int len)) + (values + (alien-funcall (extern-alien "recvfrom" + (function c-call:int + c-call:int + system-area-pointer + c-call:int + c-call:int + (* t) + (* c-call:int))) + fd + (system:vector-sap buffer) + length + flags + sockaddr + (addr l)) + l))) + +#-unicode +(def-alien-routine ("sendto" unix-sendto) int + (fd int) + (buffer c-string) + (length int) + (flags int) + (sockaddr (* t)) + (len int)) + +(defun unix-sendto (fd buffer length flags sockaddr len) + (alien-funcall (extern-alien "sendto" + (function c-call:int + c-call:int + system-area-pointer + c-call:int + c-call:int + (* t) + c-call:int)) + fd + (system:vector-sap buffer) + length + flags + sockaddr + len)) + +(def-alien-routine ("shutdown" unix-shutdown) int + (socket int) + (level int)) + + +;;;; Memory-mapped files + +(defconstant +null+ (sys:int-sap 0)) + +(defconstant prot_read 1) ; Readable +(defconstant prot_write 2) ; Writable +(defconstant prot_exec 4) ; Executable +(defconstant prot_none 0) ; No access + +(defconstant map_shared 1) ; Changes are shared +(defconstant map_private 2) ; Changes are private +(defconstant map_fixed 16) ; Fixed, user-defined address +(defconstant map_noreserve #x40) ; Don't reserve swap space +(defconstant map_anonymous + #+solaris #x100 ; Solaris + #+linux 32 ; Linux + #+bsd #x1000) + +(defconstant ms_async 1) +(defconstant ms_sync 4) +(defconstant ms_invalidate 2) + +;; The return value from mmap that means mmap failed. +(defconstant map_failed (int-sap (1- (ash 1 vm:word-bits)))) + +(defun unix-mmap (addr length prot flags fd offset) + (declare (type (or null system-area-pointer) addr) + (type (unsigned-byte 32) length) + (type (integer 1 7) prot) + (type (unsigned-byte 32) flags) + (type (or null unix-fd) fd) + (type file-offset offset)) + ;; Can't use syscall, because the address that is returned could be + ;; "negative". Hence we explicitly check for mmap returning + ;; MAP_FAILED. + (let ((result + (alien-funcall (extern-alien "mmap" (function system-area-pointer + system-area-pointer + size-t int int int off-t)) + (or addr +null+) length prot flags (or fd -1) offset))) + (if (sap= result map_failed) + (values nil (unix-errno)) + (values result 0)))) + +(defun unix-munmap (addr length) + (declare (type system-area-pointer addr) + (type (unsigned-byte 32) length)) + (syscall ("munmap" system-area-pointer size-t) t addr length)) + +(defun unix-mprotect (addr length prot) + (declare (type system-area-pointer addr) + (type (unsigned-byte 32) length) + (type (integer 1 7) prot)) + (syscall ("mprotect" system-area-pointer size-t int) + t addr length prot)) + +(defun unix-msync (addr length flags) + (declare (type system-area-pointer addr) + (type (unsigned-byte 32) length) + (type (signed-byte 32) flags)) + (syscall ("msync" system-area-pointer size-t int) t addr length flags)) + + +;;;; User and group database structures + +(defstruct user-info + (name "" :type string) + (password "" :type string) + (uid 0 :type unix-uid) + (gid 0 :type unix-gid) + #+solaris (age "" :type string) + #+solaris (comment "" :type string) + #+freebsd (change -1 :type fixnum) + (gecos "" :type string) + (dir "" :type string) + (shell "" :type string)) + + +;;;; Other random routines. +(def-alien-routine ("isatty" unix-isatty) boolean + _N"Accepts a Unix file descriptor and returns T if the device + associated with it is a terminal." + (fd int)) + +(def-alien-routine ("ttyname" unix-ttyname) c-string + (fd int)) + +(def-alien-routine ("openpty" unix-openpty) int + (amaster int :out) + (aslave int :out) + (name c-string) + (termp (* (struct termios))) + (winp (* (struct winsize)))) + +(def-alien-type nil + (struct itimerval + (it-interval (struct timeval)) ; timer interval + (it-value (struct timeval)))) ; current value + +(defun unix-setitimer (which int-secs int-usec val-secs val-usec) + _N" Unix-setitimer sets the INTERVAL and VALUE slots of one of + three system timers (:real :virtual or :profile). A SIGALRM signal + will be delivered VALUE <seconds+microseconds> from now. INTERVAL, + when non-zero, is <seconds+microseconds> to be loaded each time + the timer expires. Setting INTERVAL and VALUE to zero disables + the timer. See the Unix man page for more details. On success, + unix-setitimer returns the old contents of the INTERVAL and VALUE + slots as in unix-getitimer." + (declare (type (member :real :virtual :profile) which) + (type (unsigned-byte 29) int-secs val-secs) + (type (integer 0 (1000000)) int-usec val-usec) + (values t + (unsigned-byte 29) + (mod 1000000) + (unsigned-byte 29) + (mod 1000000))) + (let ((which (ecase which + (:real ITIMER-REAL) + (:virtual ITIMER-VIRTUAL) + (:profile ITIMER-PROF)))) + (with-alien ((itvn (struct itimerval)) + (itvo (struct itimerval))) + (setf (slot (slot itvn 'it-interval) 'tv-sec ) int-secs + (slot (slot itvn 'it-interval) 'tv-usec) int-usec + (slot (slot itvn 'it-value ) 'tv-sec ) val-secs + (slot (slot itvn 'it-value ) 'tv-usec) val-usec) + (syscall* (#-netbsd "setitimer" #+netbsd "__setitimer50" int (* (struct timeval))(* (struct timeval))) + (values T + (slot (slot itvo 'it-interval) 'tv-sec) + (slot (slot itvo 'it-interval) 'tv-usec) + (slot (slot itvo 'it-value) 'tv-sec) + (slot (slot itvo 'it-value) 'tv-usec)) + which (alien-sap (addr itvn))(alien-sap (addr itvo)))))) + + +;;;; User and group database access, POSIX Standard 9.2.2 + +#+solaris +(defun unix-getpwuid (uid) + _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." + (declare (type unix-uid uid)) + (with-alien ((buf (array c-call:char 1024)) + (user-info (struct passwd))) + (let ((result + (alien-funcall + (extern-alien "getpwuid_r" + (function (* (struct passwd)) + c-call:unsigned-int + (* (struct passwd)) + (* c-call:char) + c-call:unsigned-int)) + uid + (addr user-info) + (cast buf (* c-call:char)) + 1024))) + (when (not (zerop (sap-int (alien-sap result)))) + (make-user-info + :name (string (cast (slot result 'pw-name) c-call:c-string)) + :password (string (cast (slot result 'pw-passwd) c-call:c-string)) + :uid (slot result 'pw-uid) + :gid (slot result 'pw-gid) + :age (string (cast (slot result 'pw-age) c-call:c-string)) + :comment (string (cast (slot result 'pw-comment) c-call:c-string)) + :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) + :dir (string (cast (slot result 'pw-dir) c-call:c-string)) + :shell (string (cast (slot result 'pw-shell) c-call:c-string))))))) + +#+bsd +(defun unix-getpwuid (uid) + _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." + (declare (type unix-uid uid)) + (let ((result + (alien-funcall + (extern-alien "getpwuid" + (function (* (struct passwd)) + c-call:unsigned-int)) + uid))) + (when (not (zerop (sap-int (alien-sap result)))) + (make-user-info + :name (string (cast (slot result 'pw-name) c-call:c-string)) + :password (string (cast (slot result 'pw-passwd) c-call:c-string)) + :uid (slot result 'pw-uid) + :gid (slot result 'pw-gid) + :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) + :dir (string (cast (slot result 'pw-dir) c-call:c-string)) + :shell (string (cast (slot result 'pw-shell) c-call:c-string)))))) + ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 80 ++- src/code/unix.lisp | 1398 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 1476 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-unix-core created. snapshot-2014-11-12-g9245bc0
by Raymond Toy 16 Nov '14

16 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-unix-core has been created at 9245bc06d60add3a924d8086332e4d8113933b3f (commit) - Log ----------------------------------------------------------------- commit 9245bc06d60add3a924d8086332e4d8113933b3f Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 15 17:04:49 2014 -0800 First cut at simplifying unix.lisp. * Moved original unix.lisp to src/contrib/unix/unix.lisp. * Copied just enough from unix.lisp to compile and load the first build. (Second build doesn't yet work.) * Trimmed exports.lisp to the current UNIX symbols. This is currently for Darwin/x86. Nothing else is supported yet. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index e75e5d7..1d85aa0 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -195,201 +195,24 @@ "MULTIPLY-BIGNUM-AND-FIXNUM" "MULTIPLY-BIGNUMS" "MULTIPLY-FIXNUMS" "NEGATE-BIGNUM" "SUBTRACT-BIGNUM")) -(defpackage "UNIX" - (:export "CADDR-T" "D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN" - "DADDR-T" "DEV-T" "DIRECT" "EXECGRP" "EXECOTH" "EXECOWN" "F-DUPFD" - "F-GETFD" "F-GETFL" "F-GETOWN" "F-SETFD" "F-SETFL" "F-SETOWN" - "FSFILCNT-T" "FSBLKCNT-T" "BLKCNT-T" - "FAPPEND" "FASYNC" "FCREAT" "FEXCL" "FIONREAD" "FNDELAY" "FTRUNC" - "F_TEST" "F_TLOCK" "UNIX-LOCKF" "F_LOCK" "F_ULOCK" - "F_OK" "GET-UNIX-ERROR-MSG" "GID-T" "INO-T" "IT-INTERVAL" - "IT-VALUE" "ITIMERVAL" "UNIX-SETITIMER" "UNIX-GETITIMER" - "BLKCNT-T" "FSBLKCNT-T" "FSFILCNT-T" - "F_TEST" "F_TLOCK" "F_LOCK" "F_ULOCK" "UNIX-LOCKF" - "PROT_READ" "PROT_WRITE" "PROT_EXEC" "PROT_NONE" - "MAP_SHARED" "MAP_PRIVATE" "MAP_FIXED" "MAP_ANONYMOUS" - "MS_ASYNC" "MS_SYNC" "MS_INVALIDATE" - "UNIX-MMAP" "UNIX-MUNMAP" "UNIX-MSYNC" "UNIX-MPROTECT" - "KBDCGET" "KBDCRESET" "KBDCRST" "KBDCSET" - "KBDCSSTD" "KBDGCLICK" "KBDSCLICK" "KBDSGET" "L_INCR" "L_SET" - "L_XTND" "OFF-T" "O_APPEND" "O_CREAT" "O_EXCL" "O_RDONLY" "O_RDWR" - "O_TRUNC" "O_WRONLY" "READGRP" "READOTH" "READOWN" "RLIM-CUR" - "RLIM-MAX" "RLIMIT" "RU-IDRSS" "RU-INBLOCK" "RU-ISRSS" "RU-IXRSS" - "RU-MAJFLT" "RU-MAXRSS" "RU-MINFLT" "RU-MSGRCV" "RU-MSGSND" - "RU-NIVCSW" "RU-NSIGNALS" "RU-NSWAP" "RU-NVCSW" "RU-OUBLOCK" - "RU-STIME" "RU-UTIME" "RUSAGE_CHILDREN" "RUSAGE_SELF" "RUSEAGE" - "R_OK" "S-IEXEC" "S-IFBLK" "S-IFCHR" "S-IFDIR" "S-IFLNK" "S-IFMT" - "S-IFREG" "S-IFSOCK" "S-IREAD" "S-ISGID" "S-ISUID" "S-ISVTX" - "S-IWRITE" "SAVETEXT" "SC-MASK" "SC-ONSTACK" "SC-PC" "SETGIDEXEC" - "SETUIDEXEC" "SG-ERASE" "SG-FLAGS" "SG-ISPEED" "SG-KILL" - "SG-OSPEED" "SGTTYB" "SIGCONTEXT" "SIZE-T" "ST-ATIME" "ST-BLKSIZE" - "ST-BLOCKS" "ST-CTIME" "ST-DEV" "ST-GID" "ST-MODE" "ST-MTIME" - "ST-NLINK" "ST-RDEV" "ST-SIZE" "ST-UID" "STAT" "SWBLK-T" "T-BRKC" - "T-DSUSPC" "T-EOFC" "T-FLUSHC" "T-INTRC" "T-LNEXTC" "T-QUITC" - "T-RPRNTC" "T-STARTC" "T-STOPC" "T-SUSPC" "T-WERASC" "TCHARS" - "TERMINAL-SPEEDS" "TIME-T" "TIMEVAL" "TIMEZONE" "TIOCFLUSH" - "TIOCGETC" "TIOCGETP" "TIOCGLTC" "TIOCGPGRP" "TIOCGWINSZ" - "TIOCNOTTY" "TIOCSETC" "TIOCSETP" "TIOCSLTC" "TIOCSPGRP" - "TIOCSWINSZ" "TTY-CBREAK" "TTY-CRMOD" "TTY-LCASE" - "TTY-RAW" "TTY-TANDEM" "TV-SEC" "TV-USEC" "TZ-DSTTIME" - "TZ-MINUTESWEST" "UID-T" "UNIX-ACCEPT" "UNIX-ACCESS" "UNIX-BIND" - "UNIX-CHDIR" "UNIX-CHMOD" "UNIX-CHOWN" "UNIX-CLOSE" "UNIX-CONNECT" - "UNIX-CREAT" "UNIX-CURRENT-DIRECTORY" "UNIX-DUP" "UNIX-DUP2" - "UNIX-ERRNO" "UNIX-EXECVE" "UNIX-EXIT" "UNIX-FCHMOD" "UNIX-FCHOWN" - "UNIX-FCNTL" "UNIX-FD" "UNIX-FILE-MODE" "UNIX-FORK" "UNIX-FSTAT" - "UNIX-FSYNC" "UNIX-FTRUNCATE" "UNIX-GETDTABLESIZE" "UNIX-GETEGID" - "UNIX-GETGID" "UNIX-GETHOSTID" "UNIX-GETHOSTNAME" - "UNIX-GETPAGESIZE" "UNIX-GETPEERNAME" "UNIX-GETPGRP" - "UNIX-GETPID" "UNIX-GETPPID" "UNIX-GETRUSAGE" "UNIX-GETSOCKNAME" - "UNIX-GETSOCKOPT" "UNIX-GETTIMEOFDAY" "UNIX-GETUID" "UNIX-GID" - "UNIX-IOCTL" "UNIX-ISATTY" "UNIX-LINK" "UNIX-LISTEN" "UNIX-LSEEK" - "UNIX-LSTAT" "UNIX-MKDIR" "UNIX-OPEN" "UNIX-PATHNAME" "UNIX-PID" - "UNIX-PIPE" "UNIX-READ" "UNIX-READLINK" "UNIX-RECV" "UNIX-RENAME" - "UNIX-RMDIR" "UNIX-SCHED-YIELD" "UNIX-SELECT" - "UNIX-SEND" "UNIX-SETPGID" "UNIX-SETPGRP" - "UNIX-SETREGID" "UNIX-SETREUID" "UNIX-SETSOCKOPT" "UNIX-SOCKET" - "UNIX-SETUID" "UNIX-SETGID" - "UNIX-STAT" "UNIX-SYMLINK" "UNIX-SYNC" - "UNIX-TIMES" "UNIX-TRUNCATE" "UNIX-TTYNAME" "UNIX-UID" - "UNIX-UNAME" "UNIX-UNLINK" "UNIX-UTIMES" "UNIX-WRITE" "WINSIZE" - "WRITEGRP" "WRITEOTH" "WRITEOWN" "WS-COL" "WS-ROW" "WS-XPIXEL" - "WS-YPIXEL" "W_OK" "X_OK" "SIGSYS" "TCSETPGRP" "FD-ZERO" - "SIGEMSG" "SIGQUIT" "SIGCHLD" "SIGSEGV" "FD-CLR" "SIGUSR2" - "EALREADY" "SIGPIPE" "EACCES" "SIGXCPU" "EOPNOTSUPP" - "SIGFPE" "SIGHUP" "ENOTSOCK" "OPEN-DIR" "SIGMASK" "EINTR" - "SIGCONT" "UNIX-RESOLVE-LINKS" "SIGKILL" "EMSGSIZE" "ERANGE" - "EPROTOTYPE" "UNIX-SIGNAL-NUMBER" "EPFNOSUPPORT" "SIGILL" - "EDOM" "UNIX-SIGPAUSE" "EDQUOT" "FD-SETSIZE" "SIGTSTP" - "EAFNOSUPPORT" "TCGETPGRP" "EMFILE" "ECONNRESET" - "EADDRNOTAVAIL" "SIGALRM" "ENETDOWN" "EVICEOP" - "UNIX-FAST-GETRUSAGE" "EPERM" "SIGINT" "EXDEV" "EDEADLK" - "ENOSPC" "ECONNREFUSED" "SIGWINCH" "ENOPROTOOPT" "ESRCH" - "EUSERS" "SIGVTALRM" "ENOTCONN" "ESUCCESS" "EPIPE" - "UNIX-SIMPLIFY-PATHNAME" "EISCONN" "FD-ISSET" "SIGMSG" - "ESHUTDOWN" "EBUSY" "SIGTERM" "ENAMETOOLONG" "EMLINK" - "EADDRINUSE" "SIGBUS" "ERESTART" "TTY-PROCESS-GROUP" - "UNIX-SIGNAL-NAME" "ETIMEDOUT" "ECHILD" "EFBIG" "SIGTRAP" - "UNIX-KILLPG" "ENOTBLK" "SIGIOT" "SIGUSR1" "ECONNABORTED" - "EHOSTUNREACH" "EBADF" "EINVAL" "FD-SET" "CLOSE-DIR" "EISDIR" - "SIGTTIN" "UNIX-KILL" "ENOTDIR" "EHOSTDOWN" "E2BIG" "ESPIPE" - "UNIX-FAST-SELECT" "ENXIO" "ENOTTY" "ELOOP" "LTCHARS" - "UNIX-SIGNAL-DESCRIPTION" "SIGXFSZ" "EINPROGRESS" "ENOENT" - "EPROTONOSUPPORT" "UNIX-SIGBLOCK" "SIGIO" "ENOMEM" "SIGEMT" - "EFAULT" "ENODEV" "EIO" "EVICEERR" "ETXTBSY" "EWOULDBLOCK" - "EAGAIN" "EDESTADDRREQ" "ENOEXEC" "ENETUNREACH" "ENOTEMPTY" - "READ-DIR" "UNIX-MAYBE-PREPEND-CURRENT-DIRECTORY" "ENFILE" - "SIGTTOU" "EEXIST" "SIGPROF" "SIGSTOP" "ENETRESET" "SIGURG" - "ENOBUFS" "EPROCLIM" "EROFS" "ETOOMANYREFS" "UNIX-FILE-KIND" - "ELOCAL" "UNIX-SIGSETMASK" "EREMOTE" "ESOCKTNOSUPPORT" - "TIOCSIGSEND" "SIGWAITING" "SIGABRT" - "C-IFLAG" "UNIX-TCGETATTR" "C-LFLAG" "C-OFLAG" "C-CFLAG" - "TCSAFLUSH" "C-CC" "C-ISPEED" "C-OSPEED" "SIOCSPGRP" "TERMIOS" - "UNIX-TCSETATTR" "O_NDELAY" "O_NOCTTY" - "O_NONBLOCK" "TCSANOW" "TCSADRAIN" "TCIFLUSH" "TCOFLUSH" - "TCIOFLUSH" "UNIX-CFGETOSPEED" "UNIX-CFSETOSPEED" - "UNIX-CFGETISPEED" "UNIX-CFSETISPEED" - "TTY-IGNBRK" "TTY-BRKINT" "TTY-IGNPAR" "TTY-PARMRK" - "TTY-INPCK" "TTY-ISTRIP" "TTY-INLCR" "TTY-IGNCR" "TTY-ICRNL" - "TTY-IUCLC" "TTY-IXON" "TTY-IXANY" "TTY-IXOFF" "TTY-IENQAK" - "TTY-IMAXBEL" "TTY-OPOST" "TTY-OLCUC" "TTY-ONLCR" "TTY-OCRNL" - "TTY-ONOCR" "TTY-ONLRET" "TTY-OFILL" "TTY-OFDEL" "TTY-ISIG" - "TTY-ICANON" "TTY-XCASE" "TTY-ECHO" "TTY-ECHOE" "TTY-ECHOK" - "TTY-ECHONL" "TTY-NOFLSH" "TTY-IEXTEN" "TTY-TOSTOP" "TTY-ECHOCTL" - "TTY-ECHOPRT" "TTY-ECHOKE" "TTY-DEFECHO" "TTY-FLUSHO" - "TTY-PENDIN" "TTY-CSTOPB" "TTY-CREAD" "TTY-PARENB" "TTY-PARODD" - "TTY-HUPCL" "TTY-CLOCAL" "RCV1EN" "XMT1EN" "TTY-LOBLK" "VINTR" - "VQUIT" "VERASE" "VKILL" "VEOF" "VEOL" "VEOL2" "TTY-CBAUD" - "TTY-CSIZE" "TTY-CS5" "TTY-CS6" "TTY-CS7" "TTY-CS8" "VMIN" "VTIME" - "VSUSP" "VSTART" "VSTOP" "VDSUSP" "UNIX-TCSENDBREAK" - "UNIX-TCDRAIN" "UNIX-TCFLUSH" "UNIX-TCFLOW" - "UNIX-GETENV" "UNIX-SETENV" "UNIX-PUTENV" "UNIX-UNSETENV" - - #+(or svr4 bsd linux) "O_NDELAY" - "CHECK" - - "UNIX-RECVFROM" "UNIX-SENDTO" "UNIX-SHUTDOWN" - "UNIX-OPENPTY") - #+(or svr4 linux) - (:export "EADDRINUSE" "EADDRNOTAVAIL" "EADV" "EAFNOSUPPORT" - "EALREADY" "EBADE" "EBADFD" "EBADMSG" "EBADR" "EBADRQC" - "EBADSLT" "EBFONT" #+svr4 "ECANCELED" "ECHRNG" "ECOMM" - "ECONNABORTED" "ECONNREFUSED" "ECONNRESET" "EDEADLK" - "EDEADLOCK" "EDESTADDRREQ" #+linux "EDOTDOT" #+linux "EDQUOT" - "EHOSTDOWN" "EHOSTUNREACH" "EIDRM" "EILSEQ" "EINPROGRESS" - "EISCONN" #+linux "EISNAM" "EL2HLT" "EL2NSYNC" "EL3HLT" - "EL3RST" "ELIBACC" "ELIBBAD" "ELIBEXEC" "ELIBMAX" "ELIBSCN" - "ELNRNG" "ELOOP" "EMSGSIZE" "EMULTIHOP" "ENAMETOOLONG" - #+linux "ENAVAIL" "ENETDOWN" "ENETRESET" "ENETUNREACH" "ENOANO" - "ENOBUFS" "ENOCSI" "ENODATA" "ENOLCK" "ENOLINK" "ENOMSG" "ENONET" - "ENOPKG" "ENOPROTOOPT" "ENOSR" "ENOSTR" "ENOSYS" "ENOTCONN" - "ENOTEMPTY" #+linux "ENOTNAM" "ENOTSOCK" #+svr4 "ENOTSUP" - "ENOTUNIQ" "EOPNOTSUPP" "EOVERFLOW" "EPFNOSUPPORT" "EPROTO" - "EPROTONOSUPPORT" "EPROTOTYPE" "EREMCHG" "EREMOTE" - #+linux "EREMOTEIO" "ERESTART" "ESHUTDOWN" "ESOCKTNOSUPPORT" - "ESRMNT" "ESTALE" "ESTRPIPE" "ETIME" "ETIMEDOUT" "ETOOMANYREFS" - #+linux "EUCLEAN" "EUNATCH" "EUSERS" "EWOULDBLOCK" "EXFULL" - "UTSNAME" - #+linux "SIGSTKFLT" - "UNIX-GETPWNAM" "UNIX-GETPWUID" "UNIX-GETGRNAM" "UNIX-GETGRGID" - "USER-INFO" "USER-INFO-NAME" "USER-INFO-PASSWORD" "USER-INFO-UID" - "USER-INFO-GID" "USER-INFO-GECOS" "USER-INFO-DIR" "USER-INFO-SHELL" - "GROUP-INFO" "GROUP-INFO-NAME" "GROUP-INFO-GID" "GROUP-INFO-MEMBERS") - #+freebsd - (:export "GROUP-INFO" - "GROUP-INFO-GID" - "GROUP-INFO-MEMBERS" - "GROUP-INFO-NAME" - "UNIX-GETGRGID" - "UNIX-GETGRNAM" - "UNIX-GETPWNAM" - "UNIX-GETPWUID" - "USER-INFO" - "USER-INFO-DIR" - "USER-INFO-GECOS" - "USER-INFO-GID" - "USER-INFO-NAME" - "USER-INFO-PASSWORD" - "USER-INFO-SHELL" - "USER-INFO-UID") - #+ppc - (:export "UNIX-GETPWUID" - "USER-INFO" - "USER-INFO-SHELL" - "USER-INFO-GECOS" - "UNIX-GETPWNAM" - "GROUP-INFO-NAME" - "GROUP-INFO-MEMBERS" - "USER-INFO-NAME" - "USER-INFO-PASSWORD" - "GROUP-INFO" - "USER-INFO-UID" - "USER-INFO-DIR" - "USER-INFO-GID" - "GROUP-INFO-GID" - "UNIX-GETGRNAM" - "UNIX-GETGRGID") - #+(and solaris svr4) - (:export "UNIX-SYSINFO" - "SI-SYSNAME" "SI-HOSTNAME" "SI-RELEASE" "SI-VERSION" "SI-MACHINE" - "SI-ARCHITECTURE" "SI-HW-SERIAL" "SI-HW-PROVIDER" "SI-SRPC-DOMAIN" - "SI-PLATFORM" "SI-ISALIST" "SI-DHCP-CACHE" - - "UNIX-GETRLIMIT" - "RLIMIT_CPU" "RLIMIT_FSIZE" "RLIMIT_DATA" "RLIMIT_STACK" "RLIMIT_CORE" - "RLIMIT_AS" "RLIMIT_VMEM" "RLIMIT_NOFILE") - ;; Should this be conditionalized on glibc2? These come from - ;; unix-glibc2.lisp. - #+(and darwin x86) - (:export "GROUP-INFO" "UNIX-GETPWUID" "USER-INFO-DIR" "UNIX-GETPWNAM" - "USER-INFO-SHELL" "USER-INFO-PASSWORD" "USER-INFO-UID" - "GROUP-INFO-GID" "USER-INFO" "USER-INFO-NAME" "USER-INFO-GID" - "GROUP-INFO-MEMBERS" "UNIX-GETGRGID" "USER-INFO-GECOS" - "GROUP-INFO-NAME" - "UNIX-GETGRNAM" - - "UNIX-GETRLIMIT" - "RLIMIT_CPU" "RLIMIT_FSIZE" "RLIMIT_DATA" "RLIMIT_STACK" "RLIMIT_CORE" - "RLIMIT_AS" "RLIMIT_RSS" "RLIMIT_MEMLOCK" "RLIMIT_NPROC" "RLIMIT_NOFILE")) +(defpackage "UINX" + (:export "UNIX-CURRENT-DIRECTORY" + "UNIX-OPEN" + "UNIX-READ" + "UNIX-WRITE" + "UNIX-GETPAGESIZE" + "UNIX-ERRNO" + "UNIX-MAYBE-PREPEND-CURRENT-DIRECTORY" + "UNIX-RESOLVE-LINKS" + "UNIX-SIMPIFY-PATHNAME" + "UNIX-CLOSE" + "UNIX-STAT" + "UNIX-LSTAT" + "UNIX-FSTAT" + "UNIX-GETHOSTNAME" + "UNIX-LSEEK" + "UNIX-EXIT" + "UNIX-CHDIR")) (defpackage "FORMAT") diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 8e9e137..6f12a1f 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -9,15 +9,15 @@ ;;; ;;; ********************************************************************** ;;; -;;; This file contains the UNIX low-level support. +;;; This file contains the UNIX low-level support, just enough to run +;;; CMUCL. ;;; (in-package "UNIX") -(use-package "ALIEN") -(use-package "C-CALL") -(use-package "SYSTEM") -(use-package "EXT") + (intl:textdomain "cmucl-unix") +(pushnew :unix *features*) + ;; Check the G_BROKEN_FILENAMES environment variable; if set the encoding ;; is locale-dependent...else use :utf-8 on Unicode Lisps. On 8 bit Lisps ;; it must be set to :iso8859-1 (or left as NIL), making files with @@ -25,171 +25,6 @@ ;; Must be set to NIL initially to enable building Lisp! (defvar *filename-encoding* nil) -(export '(daddr-t caddr-t ino-t swblk-t size-t time-t dev-t off-t uid-t gid-t - timeval tv-sec tv-usec timezone tz-minuteswest tz-dsttime - itimerval it-interval it-value tchars t-intrc t-quitc t-startc - t-stopc t-eofc t-brkc ltchars t-suspc t-dsuspc t-rprntc t-flushc - t-werasc t-lnextc sgttyb sg-ispeed sg-ospeed sg-erase sg-kill - sg-flags winsize ws-row ws-col ws-xpixel ws-ypixel - direct d-off d-ino d-reclen #-(or linux svr4) d-namlen d-name - stat st-dev st-mode st-nlink st-uid st-gid st-rdev st-size - st-atime st-mtime st-ctime st-blksize st-blocks - s-ifmt s-ifdir s-ifchr s-ifblk s-ifreg s-iflnk s-ifsock - s-isuid s-isgid s-isvtx s-iread s-iwrite s-iexec - ruseage ru-utime ru-stime ru-maxrss ru-ixrss ru-idrss - ru-isrss ru-minflt ru-majflt ru-nswap ru-inblock ru-oublock - ru-msgsnd ru-msgrcv ru-nsignals ru-nvcsw ru-nivcsw - rlimit rlim-cur rlim-max sc-onstack sc-mask sc-pc - - unix-errno get-unix-error-msg - - prot_read prot_write prot_exec prot_none - map_shared map_private map_fixed map_anonymous - ms_async ms_sync ms_invalidate - unix-mmap unix-munmap unix-msync - unix-mprotect - - unix-pathname unix-file-mode unix-fd unix-pid unix-uid unix-gid - unix-setitimer unix-getitimer - unix-access r_ok w_ok x_ok f_ok unix-chdir unix-chmod setuidexec - setgidexec savetext readown writeown execown readgrp writegrp - execgrp readoth writeoth execoth unix-fchmod unix-chown unix-fchown - unix-getdtablesize unix-close unix-creat unix-dup unix-dup2 - unix-fcntl f-dupfd f-getfd f-setfd f-getfl f-setfl f-getown f-setown - fndelay fappend fasync fcreat ftrunc fexcl unix-link unix-lseek - l_set l_incr l_xtnd unix-mkdir unix-open o_rdonly o_wronly o_rdwr - #+(or hpux svr4 bsd linux) o_ndelay - #+(or hpux svr4 bsd linux) o_noctty #+(or hpux svr4 bsd) o_nonblock - o_append o_creat o_trunc o_excl unix-pipe unix-read unix-readlink - unix-rename unix-rmdir unix-fast-select fd-setsize fd-set fd-clr - fd-isset fd-zero unix-select unix-sync unix-fsync unix-truncate - unix-ftruncate unix-symlink - #+(and sparc svr4) unix-times - unix-unlink unix-write unix-ioctl - tcsetpgrp tcgetpgrp tty-process-group - terminal-speeds tty-raw tty-crmod tty-echo tty-lcase - #-hpux tty-cbreak #-(or hpux linux) tty-tandem - #+(or hpux svr4 linux bsd) termios - #+(or hpux svr4 linux bsd) c-lflag - #+(or hpux svr4 linux bsd) c-iflag - #+(or hpux svr4 linux bsd) c-oflag - #+(or hpux svr4 linux bsd) tty-icrnl - #+(or hpux svr4 linux) tty-ocrnl - #+(or hpux svr4 bsd) vdsusp #+(or hpux svr4 linux bsd) veof - #+(or hpux svr4 linux bsd) vintr - #+(or hpux svr4 linux bsd) vquit - #+(or hpux svr4 linux bsd) vstart - #+(or hpux svr4 linux bsd) vstop - #+(or hpux svr4 linux bsd) vsusp - #+(or hpux svr4 linux bsd) c-cflag - #+(or hpux svr4 linux bsd) c-cc - #+(or bsd osf1) c-ispeed - #+(or bsd osf1) c-ospeed - #+(or hpux svr4 linux bsd) tty-icanon - #+(or hpux svr4 linux bsd) vmin - #+(or hpux svr4 linux bsd) vtime - #+(or hpux svr4 linux bsd) tty-ixon - #+(or hpux svr4 linux bsd) tcsanow - #+(or hpux svr4 linux bsd) tcsadrain - #+(or hpux svr4 linux bsd) tciflush - #+(or hpux svr4 linux bsd) tcoflush - #+(or hpux svr4 linux bsd) tcioflush - #+(or hpux svr4 linux bsd) tcsaflush - #+(or hpux svr4 linux bsd) unix-tcgetattr - #+(or hpux svr4 linux bsd) unix-tcsetattr - #+(or hpux svr4 bsd) unix-cfgetospeed - #+(or hpux svr4 bsd) unix-cfsetospeed - #+(or hpux svr4 bsd) unix-cfgetispeed - #+(or hpux svr4 bsd) unix-cfsetispeed - #+(or hpux svr4 linux bsd) tty-ignbrk - #+(or hpux svr4 linux bsd) tty-brkint - #+(or hpux svr4 linux bsd) tty-ignpar - #+(or hpux svr4 linux bsd) tty-parmrk - #+(or hpux svr4 linux bsd) tty-inpck - #+(or hpux svr4 linux bsd) tty-istrip - #+(or hpux svr4 linux bsd) tty-inlcr - #+(or hpux svr4 linux bsd) tty-igncr - #+(or hpux svr4 linux) tty-iuclc - #+(or hpux svr4 linux bsd) tty-ixany - #+(or hpux svr4 linux bsd) tty-ixoff - #+hpux tty-ienqak - #+(or hpux irix solaris linux bsd) tty-imaxbel - #+(or hpux svr4 linux bsd) tty-opost - #+(or hpux svr4 linux) tty-olcuc - #+(or hpux svr4 linux bsd) tty-onlcr - #+(or hpux svr4 linux) tty-onocr - #+(or hpux svr4 linux) tty-onlret - #+(or hpux svr4 linux) tty-ofill - #+(or hpux svr4 linux) tty-ofdel - #+(or hpux svr4 linux bsd) tty-isig - #+(or hpux svr4 linux) tty-xcase - #+(or hpux svr4 linux bsd) tty-echoe - #+(or hpux svr4 linux bsd) tty-echok - #+(or hpux svr4 linux bsd) tty-echonl - #+(or hpux svr4 linux bsd) tty-noflsh - #+(or hpux svr4 linux bsd) tty-iexten - #+(or hpux svr4 linux bsd) tty-tostop - #+(or hpux irix solaris linux bsd) tty-echoctl - #+(or hpux irix solaris linux bsd) tty-echoprt - #+(or hpux irix solaris linux bsd) tty-echoke - #+(or hpux irix solaris) tty-defecho - #+(or hpux irix solaris bsd) tty-flusho - #+(or hpux irix solaris linux bsd) tty-pendin - #+(or hpux svr4 linux bsd) tty-cstopb - #+(or hpux svr4 linux bsd) tty-cread - #+(or hpux svr4 linux bsd) tty-parenb - #+(or hpux svr4 linux bsd) tty-parodd - #+(or hpux svr4 linux bsd) tty-hupcl - #+(or hpux svr4 linux bsd) tty-clocal - #+(or irix solaris) rcv1en - #+(or irix solaris) xmt1en - #+(or hpux irix solaris) tty-loblk - #+(or hpux svr4 linux bsd) vintr - #+(or hpux svr4 linux bsd) verase - #+(or hpux svr4 linux bsd) vkill - #+(or hpux svr4 linux bsd) veol - #+(or hpux irix solaris linux bsd) veol2 - #+(or hpux irix solaris) tty-cbaud - #+(or hpux svr4 bsd) tty-csize #+(or hpux svr4 bsd) tty-cs5 - #+(or hpux svr4 bsd) tty-cs6 #+(or hpux svr4 bsd) tty-cs7 - #+(or hpux svr4 bsd) tty-cs8 - #+(or hpux svr4 bsd) unix-tcsendbreak - #+(or hpux svr4 bsd) unix-tcdrain - #+(or hpux svr4 bsd) unix-tcflush - #+(or hpux svr4 bsd) unix-tcflow - - TIOCGETP TIOCSETP TIOCFLUSH TIOCSETC TIOCGETC TIOCSLTC - TIOCGLTC TIOCNOTTY TIOCSPGRP TIOCGPGRP TIOCGWINSZ TIOCSWINSZ - TIOCSIGSEND - - KBDCGET KBDCSET KBDCRESET KBDCRST KBDCSSTD KBDSGET KBDGCLICK - KBDSCLICK FIONREAD #+(or hpux bsd) siocspgrp - unix-exit unix-stat unix-lstat unix-fstat - unix-getrusage unix-fast-getrusage rusage_self rusage_children - unix-gettimeofday - #-hpux unix-utimes #-(or svr4 hpux) unix-setreuid - #-(or svr4 hpux) unix-setregid - unix-getpid unix-getppid - #+(or svr4 bsd)unix-setpgid - unix-getgid unix-getegid unix-getpgrp unix-setpgrp unix-getuid - unix-getpagesize unix-gethostname unix-gethostid unix-fork - unix-getenv unix-setenv unix-putenv unix-unsetenv - unix-current-directory unix-isatty unix-ttyname unix-execve - unix-socket unix-connect unix-bind unix-listen unix-accept - unix-recv unix-send unix-getpeername unix-getsockname - unix-getsockopt unix-setsockopt unix-openpty - - unix-recvfrom unix-sendto unix-shutdown - - unix-getpwnam unix-getpwuid unix-getgrnam unix-getgrgid - user-info user-info-name user-info-password user-info-uid - user-info-gid user-info-gecos user-info-dir user-info-shell - group-info group-info-name group-info-gid group-info-members - - unix-uname)) - -(pushnew :unix *features*) - (eval-when (:compile-toplevel) (defmacro %name->file (string) `(if *filename-encoding* @@ -200,327 +35,220 @@ (string-decode ,string *filename-encoding*) ,string))) + +(export '()) -;;;; Common machine independent structures. +;;;; System calls. -;;; From sys/types.h +(defmacro %syscall ((name (&rest arg-types) result-type) + success-form &rest args) + `(let* ((fn (extern-alien ,name (function ,result-type ,@arg-types))) + (result (alien-funcall fn ,@args))) + (if (eql -1 result) + (values nil (unix-errno)) + ,success-form))) -(def-alien-type int64-t (signed 64)) -(def-alien-type u-int64-t (unsigned 64)) +(defmacro syscall ((name &rest arg-types) success-form &rest args) + `(%syscall (,name (,@arg-types) int) ,success-form ,@args)) -(def-alien-type daddr-t - #-(or linux alpha) long - #+(or linux alpha) int) +(defmacro void-syscall ((name &rest arg-types) &rest args) + `(syscall (,name ,@arg-types) (values t 0) ,@args)) -(def-alien-type caddr-t (* char)) +;; Use getcwd instead of getwd. But what should we do if the path +;; won't fit? Try again with a larger size? We don't do that right +;; now. +(defun unix-current-directory () + ;; 5120 is some randomly selected maximum size for the buffer for getcwd. + (with-alien ((buf (array c-call:char 5120))) + (let ((result + (alien-funcall + (extern-alien "getcwd" + (function (* c-call:char) + (* c-call:char) c-call:int)) + (cast buf (* c-call:char)) + 5120))) + + (values (not (zerop + (sap-int (alien-sap result)))) + (%file->name (cast buf c-call:c-string)))))) -(def-alien-type ino-t - #+netbsd u-int64-t - #+alpha unsigned-int - #-(or alpha netbsd) unsigned-long) +;;; Unix-chdir accepts a directory name and makes that the +;;; current working directory. -(def-alien-type swblk-t long) +(defun unix-chdir (path) + _N"Given a file path string, unix-chdir changes the current working + directory to the one specified." + (declare (type unix-pathname path)) + (void-syscall ("chdir" c-string) (%name->file path))) -(def-alien-type size-t - #-(or linux alpha) long - #+linux unsigned-int - #+alpha unsigned-long) +;;; Unix-lseek accepts a file descriptor, an offset, and whence value. -(def-alien-type time-t - #-(or bsd linux alpha) unsigned-long - #+linux long - #+(and bsd (not netbsd)) long - #+(and bsd netbsd) int64-t - #+alpha unsigned-int) +(defconstant l_set 0 _N"set the file pointer") +(defconstant l_incr 1 _N"increment the file pointer") +(defconstant l_xtnd 2 _N"extend the file size") -(def-alien-type dev-t - #-(or alpha svr4 bsd linux) short - #+linux unsigned-short - #+netbsd u-int64-t - #+alpha int - #+(and (not linux) (not netbsd) (or bsd svr4)) unsigned-long) +(defun unix-lseek (fd offset whence) + _N"Unix-lseek accepts a file descriptor and moves the file pointer ahead + a certain offset for that file. Whence can be any of the following: -#-BSD -(progn - (deftype file-offset () '(signed-byte 32)) - (def-alien-type off-t - #-alpha long - #+alpha unsigned-long) ;??? very dubious - (def-alien-type uid-t - #-(or alpha svr4) unsigned-short - #+alpha unsigned-int - #+svr4 long) - (def-alien-type gid-t - #-(or alpha svr4) unsigned-short - #+alpha unsigned-int - #+svr4 long)) + l_set Set the file pointer. + l_incr Increment the file pointer. + l_xtnd Extend the file size. + _N" + (declare (type unix-fd fd) + (type file-offset offset) + (type (integer 0 2) whence)) + (off-t-syscall ("lseek" (int off-t int)) fd offset whence)) + +;;; Unix-open accepts a pathname (a simple string), flags, and mode and +;;; attempts to open file with name pathname. +(defconstant o_rdonly 0 _N"Read-only flag.") +(defconstant o_wronly 1 _N"Write-only flag.") +(defconstant o_rdwr 2 _N"Read-write flag.") +#+(or hpux linux svr4) +(defconstant o_ndelay #-linux 4 #+linux #o4000 _N"Non-blocking I/O") +(defconstant o_append #-linux #o10 #+linux #o2000 _N"Append flag.") +#+(or hpux svr4 linux) +(progn + (defconstant o_creat #-linux #o400 #+linux #o100 _N"Create if nonexistant flag.") + (defconstant o_trunc #o1000 _N"Truncate flag.") + (defconstant o_excl #-linux #o2000 #+linux #o200 _N"Error if already exists.") + (defconstant o_noctty #+linux #o400 #+hpux #o400000 #+(or irix solaris) #x800 + _N"Don't assign controlling tty")) +#+(or hpux svr4 BSD) +(defconstant o_nonblock #+hpux #o200000 #+(or irix solaris) #x80 #+BSD #x04 + _N"Non-blocking mode") #+BSD +(defconstant o_ndelay o_nonblock) ; compatibility +#+linux (progn - (deftype file-offset () '(signed-byte 64)) - (def-alien-type off-t int64-t) - (def-alien-type uid-t unsigned-long) - (def-alien-type gid-t unsigned-long)) + (defconstant o_sync #o10000 _N"Synchronous writes (on ext2)")) -;;; Large file support for Solaris. Define some of the 64-bit types -;;; we need. Unlike unix-glibc's large file support, Solaris's -;;; version is a little simpler because all of the 64-bit versions of -;;; the functions actually exist as functions. So instead of calling -;;; the 32-bit versions of the functions, we call the 64-bit versions. -;;; -;;; These functions are: creat64, open64, truncate64, ftruncate64, -;;; stat64, lstat64, fstat64, readdir64. -;;; -;;; There are also some new structures for large file support: -;;; dirent64, stat64. -;;; -;;; FIXME: We should abstract this better, but I (rtoy) don't have any -;;; other system to test this out on, so it's a Solaris hack for now. -#+solaris +#-(or hpux svr4 linux) (progn - (deftype file-offset64 () '(signed-byte 64)) - (def-alien-type off64-t int64-t) - (def-alien-type ino64-t u-int64-t) - (def-alien-type blkcnt64-t u-int64-t)) - -(def-alien-type mode-t - #-(or alpha svr4) unsigned-short - #+alpha unsigned-int - #+svr4 unsigned-long) - -(def-alien-type nlink-t - #-(or svr4 netbsd) unsigned-short - #+netbsd unsigned-long - #+svr4 unsigned-long) - -(defconstant FD-SETSIZE - #-(or hpux alpha linux FreeBSD) 256 - #+hpux 2048 #+alpha 4096 #+(or linux FreeBSD) 1024) - -;; not checked for linux... -(def-alien-type nil - (struct fd-set - (fds-bits (array #-alpha unsigned-long #+alpha int #.(/ fd-setsize 32))))) - -;; not checked for linux... -(defmacro fd-set (offset fd-set) - (let ((word (gensym)) - (bit (gensym))) - `(multiple-value-bind (,word ,bit) (floor ,offset 32) - (setf (deref (slot ,fd-set 'fds-bits) ,word) - (logior (truly-the (unsigned-byte 32) (ash 1 ,bit)) - (deref (slot ,fd-set 'fds-bits) ,word)))))) - -;; not checked for linux... -(defmacro fd-clr (offset fd-set) - (let ((word (gensym)) - (bit (gensym))) - `(multiple-value-bind (,word ,bit) (floor ,offset 32) - (setf (deref (slot ,fd-set 'fds-bits) ,word) - (logand (deref (slot ,fd-set 'fds-bits) ,word) - (32bit-logical-not - (truly-the (unsigned-byte 32) (ash 1 ,bit)))))))) - -;; not checked for linux... -(defmacro fd-isset (offset fd-set) - (let ((word (gensym)) - (bit (gensym))) - `(multiple-value-bind (,word ,bit) (floor ,offset 32) - (logbitp ,bit (deref (slot ,fd-set 'fds-bits) ,word))))) - -;; not checked for linux... -(defmacro fd-zero (fd-set) - `(progn - ,@(loop for index upfrom 0 below (/ fd-setsize 32) - collect `(setf (deref (slot ,fd-set 'fds-bits) ,index) 0)))) - -;;; From sys/time.h - -(def-alien-type nil - (struct timeval - (tv-sec #-linux time-t #+linux int) ; seconds - (tv-usec int))) ; and microseconds - -(def-alien-type nil - (struct timezone - (tz-minuteswest int) ; minutes west of Greenwich - (tz-dsttime ; type of dst correction - #-linux (enum nil :none :usa :aust :wet :met :eet :can) - #+linux int))) - -(def-alien-type nil - (struct itimerval - (it-interval (struct timeval)) ; timer interval - (it-value (struct timeval)))) ; current value - -#+(or linux svr4) -; High-res time. Actually posix definition under svr4 name. -(def-alien-type nil - (struct timestruc-t - (tv-sec time-t) - (tv-nsec long))) - -#+(or linux BSD) -(def-alien-type nil - (struct timespec-t - (ts-sec time-t) - (ts-nsec long))) - -;;; From ioctl.h -(def-alien-type nil - (struct tchars - (t-intrc char) ; interrupt - (t-quitc char) ; quit - #+linux (t-eofc char) - (t-startc char) ; start output - (t-stopc char) ; stop output - #-linux (t-eofc char) ; end-of-file - (t-brkc char))) ; input delimiter (like nl) - -;; not found (semi) linux -(def-alien-type nil - (struct ltchars - #+linux (t-werasc char) ; word erase - (t-suspc char) ; stop process signal - (t-dsuspc char) ; delayed stop process signal - (t-rprntc char) ; reprint line - (t-flushc char) ; flush output (toggles) - #-linux (t-werasc char) ; word erase - (t-lnextc char))) ; literal next character - - -(def-alien-type nil - (struct sgttyb - #+linux (sg-flags #+mach short #-mach int) ; mode flags - (sg-ispeed char) ; input speed. - (sg-ospeed char) ; output speed - (sg-erase char) ; erase character - #-linux (sg-kill char) ; kill character - #-linux (sg-flags #+mach short #-mach int) ; mode flags - #+linux (sg-kill char) - #+linux (t (struct termios)) - #+linux (check int))) - -(def-alien-type nil - (struct winsize - (ws-row unsigned-short) ; rows, in characters - (ws-col unsigned-short) ; columns, in characters - (ws-xpixel unsigned-short) ; horizontal size, pixels - (ws-ypixel unsigned-short))) ; veritical size, pixels - + (defconstant o_creat #o1000 _N"Create if nonexistant flag.") + (defconstant o_trunc #o2000 _N"Truncate flag.") + (defconstant o_excl #o4000 _N"Error if already exists.")) -;;; From sys/termios.h +(defun unix-open (path flags mode) + _N"Unix-open opens the file whose pathname is specified by path + for reading and/or writing as specified by the flags argument. + The flags argument can be: -;;; NOTE: There is both a termio (SYSV) and termios (POSIX) -;;; structure with similar but incompatible definitions. It may be that -;;; the non-BSD variant of termios below is really a termio but I (pw) -;;; can't verify. The BSD variant uses the Posix termios def. Some systems -;;; (Ultrix and OSF1) seem to support both if used independently. -;;; The 17f version of this seems a bit confused wrt the conditionals. -;;; Please check these defs for your system. + o_rdonly Read-only flag. + o_wronly Write-only flag. + o_rdwr Read-and-write flag. + o_append Append flag. + o_creat Create-if-nonexistant flag. + o_trunc Truncate-to-size-0 flag. -;;; TSM: from what I can tell looking at the 17f definition, my guess is that it -;;; was originally a termio for sunos (nonsolaris) (because it had the c-line -;;; member for sunos only), and then was mutated into the termios definition for -;;; later systems. The definition here is definitely not an IRIX termio because -;;; it doesn't have c-line. In any case, the functions tcgetattr, etc., -;;; definitely take a termios, and termios seems to be the more standard -;;; standard now, so my suggestion is to just go with termios and forget about -;;; termio. Note the SVID says NCCS not NCC for the constant here, so I've -;;; changed it (which means you need to bootstrap it to avoid a reader error). + If the o_creat flag is specified, then the file is created with + a permission of argument mode if the file doesn't exist. An + integer file descriptor is returned by unix-open." + (declare (type unix-pathname path) + (type fixnum flags) + (type unix-file-mode mode)) + (int-syscall (#+solaris "open64" #-solaris "open" c-string int int) + (%name->file path) flags mode)) -;;; On top of all that, SGI decided to change the termios structure on irix -;;; 6.[34] (but NOT 6.2), left the old routines named the same in the library, -;;; but introduced static functions in termios.h to redirect new calls to the -;;; new library--which means it's important not to #include termios.h before -;;; undefineds.h when building lisp. +;;; Unix-close accepts a file descriptor and attempts to close the file +;;; associated with it. -(defconstant +NCCS+ - #+hpux 16 - #+irix 23 - #+(or linux solaris) 19 - #+(or bsd osf1) 20 - #+(and sunos (not svr4)) 17 - _N"Size of control character vector.") +(defun unix-close (fd) + _N"Unix-close takes an integer file descriptor as an argument and + closes the file associated with it. T is returned upon successful + completion, otherwise NIL and an error number." + (declare (type unix-fd fd)) + (void-syscall ("close" int) fd)) -(def-alien-type nil - (struct termios - (c-iflag unsigned-int) - (c-oflag unsigned-int) - (c-cflag unsigned-int) - (c-lflag unsigned-int) - #+(or linux hpux (and sunos (not svr4))) - (c-reserved #-(or linux (and sunos (not svr4))) unsigned-int - #+(or linux (and sunos (not svr4))) unsigned-char) - (c-cc (array unsigned-char #.+NCCS+)) - #+(or bsd osf1) (c-ispeed unsigned-int) - #+(or bsd osf1) (c-ospeed unsigned-int))) +;;; Unix-read accepts a file descriptor, a buffer, and the length to read. +;;; It attempts to read len bytes from the device associated with fd +;;; and store them into the buffer. It returns the actual number of +;;; bytes read. -;;; From sys/dir.h -;;; -;;; (For Solaris, this is not struct direct, but struct dirent!) -#-bsd -(def-alien-type nil - (struct direct - #+(and sunos (not svr4)) (d-off long) ; offset of next disk directory entry - (d-ino ino-t); inode number of entry - #+(or linux svr4) (d-off long) - (d-reclen unsigned-short) ; length of this record - #-(or linux svr4) - (d-namlen unsigned-short) ; length of string in d-name - (d-name (array char 256)))) ; name must be no longer than this +(defun unix-read (fd buf len) + _N"Unix-read attempts to read from the file described by fd into + the buffer buf until it is full. Len is the length of the buffer. + The number of bytes actually read is returned or NIL and an error + number if an error occured." + (declare (type unix-fd fd) + (type (unsigned-byte 32) len)) + #+(or sunos gencgc) + ;; Note: Under sunos we touch each page before doing the read to give + ;; the segv handler a chance to fix the permissions. Otherwise, + ;; read will return EFAULT. This also bypasses a bug in 4.1.1 in which + ;; read fails with EFAULT if the page has never been touched even if + ;; the permissions are okay. + ;; + ;; (Is this true for Solaris?) + ;; + ;; Also, with gencgc, the collector tries to keep raw objects like + ;; strings in separate pages that are not write-protected. However, + ;; this isn't always true. Thus, BUF will sometimes be + ;; write-protected and the kernel doesn't like writing to + ;; write-protected pages. So go through and touch each page to give + ;; the segv handler a chance to unprotect the pages. + (without-gcing + (let* ((page-size (get-page-size)) + (1-page-size (1- page-size)) + (sap (etypecase buf + (system-area-pointer buf) + (vector (vector-sap buf)))) + (end (sap+ sap len))) + (declare (type (and fixnum unsigned-byte) page-size 1-page-size) + (type system-area-pointer sap end) + (optimize (speed 3) (safety 0))) + ;; Touch the beginning of every page + (do ((sap (int-sap (logand (sap-int sap) + (logxor 1-page-size (ldb (byte 32 0) -1)))) + (sap+ sap page-size))) + ((sap>= sap end)) + (declare (type system-area-pointer sap)) + (setf (sap-ref-8 sap 0) (sap-ref-8 sap 0))))) + (int-syscall ("read" int (* char) int) fd buf len)) -#+(and bsd (not netbsd)) -(def-alien-type nil - (struct direct - (d-fileno unsigned-long) - (d-reclen unsigned-short) - (d-type unsigned-char) - (d-namlen unsigned-char) ; length of string in d-name - (d-name (array char 256)))) ; name must be no longer than this +;;; Unix-write accepts a file descriptor, a buffer, an offset, and the +;;; length to write. It attempts to write len bytes to the device +;;; associated with fd from the buffer starting at offset. It returns +;;; the actual number of bytes written. -#+netbsd -(def-alien-type nil - (struct direct - (d-fileno ino-t) - (d-reclen unsigned-short) - (d-namlen unsigned-short) - (d-type unsigned-char) - (d-name (array char 512)))) +(defun unix-write (fd buf offset len) + _N"Unix-write attempts to write a character buffer (buf) of length + len to the file described by the file descriptor fd. NIL and an + error is returned if the call is unsuccessful." + (declare (type unix-fd fd) + (type (unsigned-byte 32) offset len)) + (int-syscall ("write" int (* char) int) + fd + (with-alien ((ptr (* char) (etypecase buf + ((simple-array * (*)) + (vector-sap buf)) + (system-area-pointer + buf)))) + (addr (deref ptr offset))) + len)) +;;; Unix-getpagesize returns the number of bytes in the system page. -;;; The 64-bit version of struct dirent. -#+solaris -(def-alien-type nil - (struct dirent64 - (d-ino ino64-t); inode number of entry - (d-off off64-t) ; offset of next disk directory entry - (d-reclen unsigned-short) ; length of this record - (d-name (array char 256)))) ; name must be no longer than this +(defun unix-getpagesize () + _N"Unix-getpagesize returns the number of bytes in a system page." + (int-syscall ("getpagesize"))) +(defun unix-gethostname () + _N"Unix-gethostname returns the name of the host machine as a string." + (with-alien ((buf (array char 256))) + (syscall* ("gethostname" (* char) int) + (cast buf c-string) + (cast buf (* char)) 256))) -;;; From sys/stat.h -;; oh boy, in linux-> 2 stat(s)!! +;;; Unix-exit terminates a program. -#-(or svr4 bsd linux) ; eg hpux and alpha -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-ino ino-t) - (st-mode mode-t) - (st-nlink nlink-t) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-size off-t) - (st-atime time-t) - (st-spare1 int) - (st-mtime time-t) - (st-spare2 int) - (st-ctime time-t) - (st-spare3 int) - (st-blksize #-alpha long #+alpha unsigned-int) - (st-blocks #-alpha long #+alpha int) - (st-spare4 (array long 2)))) +(defun unix-exit (&optional (code 0)) + _N"Unix-exit terminates the current process with an optional + error code. If successful, the call doesn't return. If + unsuccessful, the call returns NIL and an error number." + (declare (type (signed-byte 32) code)) + (void-syscall ("exit" int) code)) #+(and bsd (not netbsd)) (def-alien-type nil @@ -543,81 +271,39 @@ (st-lspare long) (st-qspare (array long 4)))) -#+netbsd -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-mode mode-t) - (st-ino ino-t) - (st-nlink nlink-t) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-atime (struct timespec-t)) - (st-mtime (struct timespec-t)) - (st-ctime (struct timespec-t)) - (st-birthtime (struct timespec-t)) - (st-size off-t) - (st-blocks off-t) - (st-blksize long) - (st-flags unsigned-long) - (st-gen unsigned-long) - (st-spare (array unsigned-long 2)))) +(defun unix-stat (name) + _N"Unix-stat retrieves information about the specified + file returning them in the form of multiple values. + See the UNIX Programmer's Manual for a description + of the values returned. If the call fails, then NIL + and an error number is returned instead." + (declare (type unix-pathname name)) + (when (string= name "") + (setf name ".")) + (with-alien ((buf (struct stat))) + (syscall (#-netbsd "stat" #+netbsd "__stat50" c-string (* (struct stat))) + (extract-stat-results buf) + (%name->file name) (addr buf)))) -#+(or linux svr4) -(def-alien-type nil - (struct stat - (st-dev dev-t) - (st-pad1 #-linux (array long 3) #+linux unsigned-short) - (st-ino ino-t) - (st-mode #-linux unsigned-long #+linux unsigned-short) - (st-nlink #-linux short #+linux unsigned-short) - (st-uid #-linux uid-t #+linux unsigned-short) - (st-gid #-linux gid-t #+linux unsigned-short) - (st-rdev dev-t) - (st-pad2 #-linux (array long 2) #+linux unsigned-short) - (st-size off-t) - #-linux (st-pad3 long) - #+linux (st-blksize unsigned-long) - #+linux (st-blocks unsigned-long) - #-linux (st-atime (struct timestruc-t)) - #+linux (st-atime unsigned-long) - #+linux (unused-1 unsigned-long) - #-linux (st-mtime (struct timestruc-t)) - #+linux (st-mtime unsigned-long) - #+linux (unused-2 unsigned-long) - #-linux (st-ctime (struct timestruc-t)) - #+linux (st-ctime unsigned-long) - #+linux (unused-3 unsigned-long) - #+linux (unused-4 unsigned-long) - #+linux (unused-5 unsigned-long) - #-linux(st-blksize long) - #-linux (st-blocks long) - #-linux (st-fstype (array char 16)) - #-linux (st-pad4 (array long 8)))) +(defun unix-lstat (name) + _N"Unix-lstat is similar to unix-stat except the specified + file must be a symbolic link." + (declare (type unix-pathname name)) + (with-alien ((buf (struct stat))) + (syscall (#-netbsd "lstat" #+netbsd "__lstat50" c-string (* (struct stat))) + (extract-stat-results buf) + (%name->file name) (addr buf)))) -;;; 64-bit stat for Solaris -#+solaris -(def-alien-type nil - (struct stat64 - (st-dev dev-t) - (st-pad1 (array long 3)) ; Pad so ino is 64-bit aligned - (st-ino ino64-t) - (st-mode unsigned-long) - (st-nlink short) - (st-uid uid-t) - (st-gid gid-t) - (st-rdev dev-t) - (st-pad2 (array long 3)) ; Pad so size is 64-bit aligned - (st-size off64-t) - (st-atime (struct timestruc-t)) - (st-mtime (struct timestruc-t)) - (st-ctime (struct timestruc-t)) - (st-blksize long) - (st-pad3 (array long 1)) ; Pad so blocks is 64-bit aligned - (st-blocks blkcnt64-t) - (st-fstype (array char 16)) - (st-pad4 (array long 8)))) +(defun unix-fstat (fd) + _N"Unix-fstat is similar to unix-stat except the file is specified + by the file descriptor fd." + (declare (type unix-fd fd)) + (with-alien ((buf (struct stat))) + (syscall (#-netbsd "fstat" #+netbsd "__fstat50" int (* (struct stat))) + (extract-stat-results buf) + fd (addr buf)))) + +;;;; Support routines for dealing with unix pathnames. (defconstant s-ifmt #o0170000) (defconstant s-ifdir #o0040000) @@ -634,33 +320,190 @@ (defconstant s-iwrite #o0000200) (defconstant s-iexec #o0000100) -;;; From sys/resource.h - -(def-alien-type nil - (struct rusage - (ru-utime (struct timeval)) ; user time used - (ru-stime (struct timeval)) ; system time used. - (ru-maxrss long) - (ru-ixrss long) ; integral sharded memory size - (ru-idrss long) ; integral unsharded data " - (ru-isrss long) ; integral unsharded stack " - (ru-minflt long) ; page reclaims - (ru-majflt long) ; page faults - (ru-nswap long) ; swaps - (ru-inblock long) ; block input operations - (ru-oublock long) ; block output operations - (ru-msgsnd long) ; messages sent - (ru-msgrcv long) ; messages received - (ru-nsignals long) ; signals received - (ru-nvcsw long) ; voluntary context switches - (ru-nivcsw long))) ; involuntary " +(defun unix-file-kind (name &optional check-for-links) + _N"Returns either :file, :directory, :link, :special, or NIL." + (declare (simple-string name)) + (multiple-value-bind (res dev ino mode) + (if check-for-links + (unix-lstat name) + (unix-stat name)) + (declare (type (or fixnum null) mode) + (ignore dev ino)) + (when res + (let ((kind (logand mode s-ifmt))) + (cond ((eql kind s-ifdir) :directory) + ((eql kind s-ifreg) :file) + ((eql kind s-iflnk) :link) + (t :special)))))) -(def-alien-type nil - (struct rlimit - (rlim-cur #-(or linux alpha) int #+linux long #+alpha unsigned-int) ; current (soft) limit - (rlim-max #-(or linux alpha) int #+linux long #+alpha unsigned-int))); maximum value for rlim-cur +(defun unix-maybe-prepend-current-directory (name) + (declare (simple-string name)) + (if (and (> (length name) 0) (char= (schar name 0) #\/)) + name + (multiple-value-bind (win dir) (unix-current-directory) + (if win + (concatenate 'simple-string dir "/" name) + name)))) +(defun unix-resolve-links (pathname) + _N"Returns the pathname with all symbolic links resolved." + (declare (simple-string pathname)) + (let ((len (length pathname)) + (pending pathname)) + (declare (fixnum len) (simple-string pending)) + (if (zerop len) + pathname + (let ((result (make-string 100 :initial-element (code-char 0))) + (fill-ptr 0) + (name-start 0)) + (loop + (let* ((name-end (or (position #\/ pending :start name-start) len)) + (new-fill-ptr (+ fill-ptr (- name-end name-start)))) + ;; grow the result string, if necessary. the ">=" (instead of + ;; using ">") allows for the trailing "/" if we find this + ;; component is a directory. + (when (>= new-fill-ptr (length result)) + (let ((longer (make-string (* 3 (length result)) + :initial-element (code-char 0)))) + (replace longer result :end1 fill-ptr) + (setq result longer))) + (replace result pending + :start1 fill-ptr + :end1 new-fill-ptr + :start2 name-start + :end2 name-end) + (let ((kind (unix-file-kind (if (zerop name-end) "/" result) t))) + (unless kind (return nil)) + (cond ((eq kind :link) + (multiple-value-bind (link err) (unix-readlink result) + (unless link + (error (intl:gettext "Error reading link ~S: ~S") + (subseq result 0 fill-ptr) + (get-unix-error-msg err))) + (cond ((or (zerop (length link)) + (char/= (schar link 0) #\/)) + ;; It's a relative link + (fill result (code-char 0) + :start fill-ptr + :end new-fill-ptr)) + ((string= result "/../" :end1 4) + ;; It's across the super-root. + (let ((slash (or (position #\/ result :start 4) + 0))) + (fill result (code-char 0) + :start slash + :end new-fill-ptr) + (setf fill-ptr slash))) + (t + ;; It's absolute. + (and (> (length link) 0) + (char= (schar link 0) #\/)) + (fill result (code-char 0) :end new-fill-ptr) + (setf fill-ptr 0))) + (setf pending + (if (= name-end len) + link + (concatenate 'simple-string + link + (subseq pending name-end)))) + (setf len (length pending)) + (setf name-start 0))) + ((= name-end len) + (when (eq kind :directory) + (setf (schar result new-fill-ptr) #\/) + (incf new-fill-ptr)) + (return (subseq result 0 new-fill-ptr))) + ((eq kind :directory) + (setf (schar result new-fill-ptr) #\/) + (setf fill-ptr (1+ new-fill-ptr)) + (setf name-start (1+ name-end))) + (t + (return nil)))))))))) +(defun unix-simplify-pathname (src) + (declare (simple-string src)) + (let* ((src-len (length src)) + (dst (make-string src-len)) + (dst-len 0) + (dots 0) + (last-slash nil)) + (macrolet ((deposit (char) + `(progn + (setf (schar dst dst-len) ,char) + (incf dst-len)))) + (dotimes (src-index src-len) + (let ((char (schar src src-index))) + (cond ((char= char #\.) + (when dots + (incf dots)) + (deposit char)) + ((char= char #\/) + (case dots + (0 + ;; Either ``/...' or ``...//...' + (unless last-slash + (setf last-slash dst-len) + (deposit char))) + (1 + ;; Either ``./...'' or ``..././...'' + (decf dst-len)) + (2 + ;; We've found .. + (cond + ((and last-slash (not (zerop last-slash))) + ;; There is something before this .. + (let ((prev-prev-slash + (position #\/ dst :end last-slash :from-end t))) + (cond ((and (= (+ (or prev-prev-slash 0) 2) + last-slash) + (char= (schar dst (- last-slash 2)) #\.) + (char= (schar dst (1- last-slash)) #\.)) + ;; The something before this .. is another .. + (deposit char) + (setf last-slash dst-len)) + (t + ;; The something is some random dir. + (setf dst-len + (if prev-prev-slash + (1+ prev-prev-slash) + 0)) + (setf last-slash prev-prev-slash))))) + (t + ;; There is nothing before this .., so we need to keep it + (setf last-slash dst-len) + (deposit char)))) + (t + ;; Something other than a dot between slashes. + (setf last-slash dst-len) + (deposit char))) + (setf dots 0)) + (t + (setf dots nil) + (setf (schar dst dst-len) char) + (incf dst-len)))))) + (when (and last-slash (not (zerop last-slash))) + (case dots + (1 + ;; We've got ``foobar/.'' + (decf dst-len)) + (2 + ;; We've got ``foobar/..'' + (unless (and (>= last-slash 2) + (char= (schar dst (1- last-slash)) #\.) + (char= (schar dst (- last-slash 2)) #\.) + (or (= last-slash 2) + (char= (schar dst (- last-slash 3)) #\/))) + (let ((prev-prev-slash + (position #\/ dst :end last-slash :from-end t))) + (if prev-prev-slash + (setf dst-len (1+ prev-prev-slash)) + (return-from unix-simplify-pathname "./"))))))) + (cond ((zerop dst-len) + "./") + ((= dst-len src-len) + dst) + (t + (subseq dst 0 dst-len))))) ;;;; Errno stuff. @@ -970,2578 +813,4 @@ (def-alien-routine ("os_get_errno" unix-get-errno) int) (def-alien-routine ("os_set_errno" unix-set-errno) int (newvalue int)) (defun unix-errno () (unix-get-errno)) -(defun (setf unix-errno) (newvalue) (unix-set-errno newvalue)) - -;;; GET-UNIX-ERROR-MSG -- public. -;;; -(defun get-unix-error-msg (&optional (error-number (unix-errno))) - _N"Returns a string describing the error number which was returned by a - UNIX system call." - (declare (type integer error-number)) - (if (array-in-bounds-p *unix-errors* error-number) - (svref *unix-errors* error-number) - (format nil _"Unknown error [~d]" error-number))) - - -;;;; Lisp types used by syscalls. - -(deftype unix-pathname () 'simple-string) -(deftype unix-fd () `(integer 0 ,most-positive-fixnum)) - -(deftype unix-file-mode () '(unsigned-byte 32)) -(deftype unix-pid () '(unsigned-byte 32)) -(deftype unix-uid () '(unsigned-byte 32)) -(deftype unix-gid () '(unsigned-byte 32)) - - - -;;;; User and group database structures - -(defstruct user-info - (name "" :type string) - (password "" :type string) - (uid 0 :type unix-uid) - (gid 0 :type unix-gid) - #+solaris (age "" :type string) - #+solaris (comment "" :type string) - #+freebsd (change -1 :type fixnum) - (gecos "" :type string) - (dir "" :type string) - (shell "" :type string)) - -(defstruct group-info - (name "" :type string) - (password "" :type string) - (gid 0 :type unix-gid) - (members nil :type list)) ; list of logins as strings - -;; see <pwd.h> -#+solaris -(def-alien-type nil - (struct passwd - (pw-name (* char)) ; user's login name - (pw-passwd (* char)) ; no longer used - (pw-uid uid-t) ; user id - (pw-gid gid-t) ; group id - (pw-age (* char)) ; password age (not used) - (pw-comment (* char)) ; not used - (pw-gecos (* char)) ; typically user's full name - (pw-dir (* char)) ; user's home directory - (pw-shell (* char)))) ; user's login shell - -#+bsd -(def-alien-type nil - (struct passwd - (pw-name (* char)) ; user's login name - (pw-passwd (* char)) ; no longer used - (pw-uid uid-t) ; user id - (pw-gid gid-t) ; group id - (pw-change int) ; password change time - (pw-class (* char)) ; user access class - (pw-gecos (* char)) ; typically user's full name - (pw-dir (* char)) ; user's home directory - (pw-shell (* char)) ; user's login shell - (pw-expire int) ; account expiration - #+(or freebsd darwin) - (pw-fields int))) ; internal - -;; see <grp.h> -(def-alien-type nil - (struct group - (gr-name (* char)) ; name of the group - (gr-passwd (* char)) ; encrypted group password - (gr-gid gid-t) ; numerical group ID - (gr-mem (* (* char))))) ; vector of pointers to member names - - -;;;; System calls. - -(defmacro %syscall ((name (&rest arg-types) result-type) - success-form &rest args) - `(let* ((fn (extern-alien ,name (function ,result-type ,@arg-types))) - (result (alien-funcall fn ,@args))) - (if (eql -1 result) - (values nil (unix-errno)) - ,success-form))) - -(defmacro syscall ((name &rest arg-types) success-form &rest args) - `(%syscall (,name (,@arg-types) int) ,success-form ,@args)) - -;;; Like syscall, but if it fails, signal an error instead of returing error -;;; codes. Should only be used for syscalls that will never really get an -;;; error. -;;; -(defmacro syscall* ((name &rest arg-types) success-form &rest args) - `(let ((result (alien-funcall (extern-alien ,name (function int ,@arg-types)) - ,@args))) - (if (eql -1 result) - (error _"Syscall ~A failed: ~A" ,name (get-unix-error-msg)) - ,success-form))) - -(defmacro void-syscall ((name &rest arg-types) &rest args) - `(syscall (,name ,@arg-types) (values t 0) ,@args)) - -(defmacro int-syscall ((name &rest arg-types) &rest args) - `(syscall (,name ,@arg-types) (values result 0) ,@args)) - -(defmacro off-t-syscall ((name arg-types) &rest args) - `(%syscall (,name ,arg-types off-t) (values result 0) ,@args)) - - -;;;; Memory-mapped files - -(defconstant +null+ (sys:int-sap 0)) - -(defconstant prot_read 1) ; Readable -(defconstant prot_write 2) ; Writable -(defconstant prot_exec 4) ; Executable -(defconstant prot_none 0) ; No access - -(defconstant map_shared 1) ; Changes are shared -(defconstant map_private 2) ; Changes are private -(defconstant map_fixed 16) ; Fixed, user-defined address -(defconstant map_noreserve #x40) ; Don't reserve swap space -(defconstant map_anonymous - #+solaris #x100 ; Solaris - #+linux 32 ; Linux - #+bsd #x1000) - -(defconstant ms_async 1) -(defconstant ms_sync 4) -(defconstant ms_invalidate 2) - -;; The return value from mmap that means mmap failed. -(defconstant map_failed (int-sap (1- (ash 1 vm:word-bits)))) - -(defun unix-mmap (addr length prot flags fd offset) - (declare (type (or null system-area-pointer) addr) - (type (unsigned-byte 32) length) - (type (integer 1 7) prot) - (type (unsigned-byte 32) flags) - (type (or null unix-fd) fd) - (type file-offset offset)) - ;; Can't use syscall, because the address that is returned could be - ;; "negative". Hence we explicitly check for mmap returning - ;; MAP_FAILED. - (let ((result - (alien-funcall (extern-alien "mmap" (function system-area-pointer - system-area-pointer - size-t int int int off-t)) - (or addr +null+) length prot flags (or fd -1) offset))) - (if (sap= result map_failed) - (values nil (unix-errno)) - (values result 0)))) - -(defun unix-munmap (addr length) - (declare (type system-area-pointer addr) - (type (unsigned-byte 32) length)) - (syscall ("munmap" system-area-pointer size-t) t addr length)) - -(defun unix-mprotect (addr length prot) - (declare (type system-area-pointer addr) - (type (unsigned-byte 32) length) - (type (integer 1 7) prot)) - (syscall ("mprotect" system-area-pointer size-t int) - t addr length prot)) - -(defun unix-setuid (uid) - _N"Set the user ID of the calling process to UID. - If the calling process is the super-user, set the real - and effective user IDs, and the saved set-user-ID to UID; - if not, the effective user ID is set to UID." - (int-syscall ("setuid" uid-t) uid)) - -(defun unix-setgid (gid) - _N"Set the group ID of the calling process to GID. - If the calling process is the super-user, set the real - and effective group IDs, and the saved set-group-ID to GID; - if not, the effective group ID is set to GID." - (int-syscall ("setgid" gid-t) gid)) - - - -(defun unix-msync (addr length flags) - (declare (type system-area-pointer addr) - (type (unsigned-byte 32) length) - (type (signed-byte 32) flags)) - (syscall ("msync" system-area-pointer size-t int) t addr length flags)) - -;;; Unix-access accepts a path and a mode. It returns two values the -;;; first is T if the file is accessible and NIL otherwise. The second -;;; only has meaning in the second case and is the unix errno value. - -(defconstant r_ok 4 _N"Test for read permission") -(defconstant w_ok 2 _N"Test for write permission") -(defconstant x_ok 1 _N"Test for execute permission") -(defconstant f_ok 0 _N"Test for presence of file") - -(defun unix-access (path mode) - _N"Given a file path (a string) and one of four constant modes, - unix-access returns T if the file is accessible with that - mode and NIL if not. It also returns an errno value with - NIL which determines why the file was not accessible. - - The access modes are: - r_ok Read permission. - w_ok Write permission. - x_ok Execute permission. - f_ok Presence of file." - (declare (type unix-pathname path) - (type (mod 8) mode)) - (void-syscall ("access" c-string int) (%name->file path) mode)) - -;;; Unix-chdir accepts a directory name and makes that the -;;; current working directory. - -(defun unix-chdir (path) - _N"Given a file path string, unix-chdir changes the current working - directory to the one specified." - (declare (type unix-pathname path)) - (void-syscall ("chdir" c-string) (%name->file path))) - -;;; Unix-chmod accepts a path and a mode and changes the mode to the new mode. - -(defconstant setuidexec #o4000 _N"Set user ID on execution") -(defconstant setgidexec #o2000 _N"Set group ID on execution") -(defconstant savetext #o1000 _N"Save text image after execution") -(defconstant readown #o400 _N"Read by owner") -(defconstant writeown #o200 _N"Write by owner") -(defconstant execown #o100 _N"Execute (search directory) by owner") -(defconstant readgrp #o40 _N"Read by group") -(defconstant writegrp #o20 _N"Write by group") -(defconstant execgrp #o10 _N"Execute (search directory) by group") -(defconstant readoth #o4 _N"Read by others") -(defconstant writeoth #o2 _N"Write by others") -(defconstant execoth #o1 _N"Execute (search directory) by others") - -(defun unix-chmod (path mode) - _N"Given a file path string and a constant mode, unix-chmod changes the - permission mode for that file to the one specified. The new mode - can be created by logically OR'ing the following: - - setuidexec Set user ID on execution. - setgidexec Set group ID on execution. - savetext Save text image after execution. - readown Read by owner. - writeown Write by owner. - execown Execute (search directory) by owner. - readgrp Read by group. - writegrp Write by group. - execgrp Execute (search directory) by group. - readoth Read by others. - writeoth Write by others. - execoth Execute (search directory) by others. - - Thus #o444 and (logior unix:readown unix:readgrp unix:readoth) - are equivalent for 'mode. The octal-base is familar to Unix users. - - It returns T on successfully completion; NIL and an error number - otherwise." - (declare (type unix-pathname path) - (type unix-file-mode mode)) - (void-syscall ("chmod" c-string int) (%name->file path) mode)) - -;;; Unix-fchmod accepts a file descriptor ("fd") and a file protection mode -;;; ("mode") and changes the protection of the file described by "fd" to -;;; "mode". - -(defun unix-fchmod (fd mode) - _N"Given an integer file descriptor and a mode (the same as those - used for unix-chmod), unix-fchmod changes the permission mode - for that file to the one specified. T is returned if the call - was successful." - (declare (type unix-fd fd) - (type unix-file-mode mode)) - (void-syscall ("fchmod" int int) fd mode)) - -(defun unix-chown (path uid gid) - _N"Given a file path, an integer user-id, and an integer group-id, - unix-chown changes the owner of the file and the group of the - file to those specified. Either the owner or the group may be - left unchanged by specifying them as -1. Note: Permission will - fail if the caller is not the superuser." - (declare (type unix-pathname path) - (type (or unix-uid (integer -1 -1)) uid) - (type (or unix-gid (integer -1 -1)) gid)) - (void-syscall ("chown" c-string int int) (%name->file path) uid gid)) - -;;; Unix-fchown is exactly the same as unix-chown except that the file -;;; is specified by a file-descriptor ("fd") instead of a pathname. - -(defun unix-fchown (fd uid gid) - _N"Unix-fchown is like unix-chown, except that it accepts an integer - file descriptor instead of a file path name." - (declare (type unix-fd fd) - (type (or unix-uid (integer -1 -1)) uid) - (type (or unix-gid (integer -1 -1)) gid)) - (void-syscall ("fchown" int int int) fd uid gid)) - -;;; Returns the maximum size (i.e. the number of array elements -;;; of the file descriptor table. - -(defun unix-getdtablesize () - _N"Unix-getdtablesize returns the maximum size of the file descriptor - table. (i.e. the maximum number of descriptors that can exist at - one time.)" - (int-syscall ("getdtablesize"))) - -;;; Unix-close accepts a file descriptor and attempts to close the file -;;; associated with it. - -(defun unix-close (fd) - _N"Unix-close takes an integer file descriptor as an argument and - closes the file associated with it. T is returned upon successful - completion, otherwise NIL and an error number." - (declare (type unix-fd fd)) - (void-syscall ("close" int) fd)) - -;;; Unix-creat accepts a file name and a mode. It creates a new file -;;; with name and sets it mode to mode (as for chmod). - -(defun unix-creat (name mode) - _N"Unix-creat accepts a file name and a mode (same as those for - unix-chmod) and creates a file by that name with the specified - permission mode. It returns a file descriptor on success, - or NIL and an error number otherwise. - - This interface is made obsolete by UNIX-OPEN." - - (declare (type unix-pathname name) - (type unix-file-mode mode)) - (int-syscall (#+solaris "creat64" #-solaris "creat" c-string int) - (%name->file name) mode)) - -;;; Unix-dup returns a duplicate copy of the existing file-descriptor -;;; passed as an argument. - -(defun unix-dup (fd) - _N"Unix-dup duplicates an existing file descriptor (given as the - argument) and return it. If FD is not a valid file descriptor, NIL - and an error number are returned." - (declare (type unix-fd fd)) - (int-syscall ("dup" int) fd)) - -;;; Unix-dup2 makes the second file-descriptor describe the same file -;;; as the first. If the second file-descriptor points to an open -;;; file, it is first closed. In any case, the second should have a -;;; value which is a valid file-descriptor. - -(defun unix-dup2 (fd1 fd2) - _N"Unix-dup2 duplicates an existing file descriptor just as unix-dup - does only the new value of the duplicate descriptor may be requested - through the second argument. If a file already exists with the - requested descriptor number, it will be closed and the number - assigned to the duplicate." - (declare (type unix-fd fd1 fd2)) - (void-syscall ("dup2" int int) fd1 fd2)) - -;;; Unix-fcntl takes a file descriptor, an integer command -;;; number, and optional command arguments. It performs -;;; operations on the associated file and/or returns inform- -;;; ation about the file. - -;;; Operations performed on file descriptors: - -(defconstant F-DUPFD 0 _N"Duplicate a file descriptor") -(defconstant F-GETFD 1 _N"Get file desc. flags") -(defconstant F-SETFD 2 _N"Set file desc. flags") -(defconstant F-GETFL 3 _N"Get file flags") -(defconstant F-SETFL 4 _N"Set file flags") -#-(or linux svr4) -(defconstant F-GETOWN 5 _N"Get owner") -#+svr4 -(defconstant F-GETOWN 23 _N"Get owner") -#+linux -(defconstant F-GETLK 5 _N"Get lock") -#-(or linux svr4) -(defconstant F-SETOWN 6 _N"Set owner") -#+svr4 -(defconstant F-SETOWN 24 _N"Set owner") -#+linux -(defconstant F-SETLK 6 _N"Set lock") -#+linux -(defconstant F-SETLKW 7 _N"Set lock, wait for release") -#+linux -(defconstant F-SETOWN 8 _N"Set owner") - -;;; File flags for F-GETFL and F-SETFL: - -(defconstant FNDELAY #-osf1 #o0004 #+osf1 #o100000 _N"Non-blocking reads") -(defconstant FAPPEND #-linux #o0010 #+linux #o2000 _N"Append on each write") -(defconstant FASYNC #-(or linux svr4) #o0100 #+svr4 #o10000 #+linux #o20000 - _N"Signal pgrp when data ready") -;; doesn't exist in Linux ;-( -#-linux (defconstant FCREAT #-(or hpux svr4) #o1000 #+(or hpux svr4) #o0400 - _N"Create if nonexistant") -#-linux (defconstant FTRUNC #-(or hpux svr4) #o2000 #+(or hpux svr4) #o1000 - _N"Truncate to zero length") -#-linux (defconstant FEXCL #-(or hpux svr4) #o4000 #+(or hpux svr4) #o2000 - _N"Error if already created") - -(defun unix-fcntl (fd cmd arg) - _N"Unix-fcntl manipulates file descriptors according to the - argument CMD which can be one of the following: - - F-DUPFD Duplicate a file descriptor. - F-GETFD Get file descriptor flags. - F-SETFD Set file descriptor flags. - F-GETFL Get file flags. - F-SETFL Set file flags. - F-GETOWN Get owner. - F-SETOWN Set owner. - - The flags that can be specified for F-SETFL are: - - FNDELAY Non-blocking reads. - FAPPEND Append on each write. - FASYNC Signal pgrp when data ready. - FCREAT Create if nonexistant. - FTRUNC Truncate to zero length. - FEXCL Error if already created. - " - (declare (type unix-fd fd) - (type (unsigned-byte 32) cmd) - (type (unsigned-byte 32) arg)) - (int-syscall ("fcntl" int unsigned-int unsigned-int) fd cmd arg)) - -;;; Unix-link creates a hard link from name2 to name1. - -(defun unix-link (name1 name2) - _N"Unix-link creates a hard link from the file with name1 to the - file with name2." - (declare (type unix-pathname name1 name2)) - (void-syscall ("link" c-string c-string) - (%name->file name1) (%name->file name2))) - -;;; Unix-lseek accepts a file descriptor, an offset, and whence value. - -(defconstant l_set 0 _N"set the file pointer") -(defconstant l_incr 1 _N"increment the file pointer") -(defconstant l_xtnd 2 _N"extend the file size") - -#-solaris -(defun unix-lseek (fd offset whence) - _N"Unix-lseek accepts a file descriptor and moves the file pointer ahead - a certain offset for that file. Whence can be any of the following: - - l_set Set the file pointer. - l_incr Increment the file pointer. - l_xtnd Extend the file size. - _N" - (declare (type unix-fd fd) - (type file-offset offset) - (type (integer 0 2) whence)) - (off-t-syscall ("lseek" (int off-t int)) fd offset whence)) - -#+solaris -(defun unix-lseek (fd offset whence) - _N"Unix-lseek accepts a file descriptor and moves the file pointer ahead - a certain offset for that file. Whence can be any of the following: - - l_set Set the file pointer. - l_incr Increment the file pointer. - l_xtnd Extend the file size. - _N" - (declare (type unix-fd fd) - (type file-offset64 offset) - (type (integer 0 2) whence)) - (let ((result (alien-funcall - (extern-alien "lseek64" (function off64-t int off64-t int)) - fd offset whence))) - (if (minusp result) - (progn - (values nil (unix-errno))) - (values result 0)))) - -;;; Unix-mkdir accepts a name and a mode and attempts to create the -;;; corresponding directory with mode mode. - -(defun unix-mkdir (name mode) - _N"Unix-mkdir creates a new directory with the specified name and mode. - (Same as those for unix-chmod.) It returns T upon success, otherwise - NIL and an error number." - (declare (type unix-pathname name) - (type unix-file-mode mode)) - (void-syscall ("mkdir" c-string int) (%name->file name) mode)) - -;;; Unix-open accepts a pathname (a simple string), flags, and mode and -;;; attempts to open file with name pathname. - -(defconstant o_rdonly 0 _N"Read-only flag.") -(defconstant o_wronly 1 _N"Write-only flag.") -(defconstant o_rdwr 2 _N"Read-write flag.") -#+(or hpux linux svr4) -(defconstant o_ndelay #-linux 4 #+linux #o4000 _N"Non-blocking I/O") -(defconstant o_append #-linux #o10 #+linux #o2000 _N"Append flag.") -#+(or hpux svr4 linux) -(progn - (defconstant o_creat #-linux #o400 #+linux #o100 _N"Create if nonexistant flag.") - (defconstant o_trunc #o1000 _N"Truncate flag.") - (defconstant o_excl #-linux #o2000 #+linux #o200 _N"Error if already exists.") - (defconstant o_noctty #+linux #o400 #+hpux #o400000 #+(or irix solaris) #x800 - _N"Don't assign controlling tty")) -#+(or hpux svr4 BSD) -(defconstant o_nonblock #+hpux #o200000 #+(or irix solaris) #x80 #+BSD #x04 - _N"Non-blocking mode") -#+BSD -(defconstant o_ndelay o_nonblock) ; compatibility -#+linux -(progn - (defconstant o_sync #o10000 _N"Synchronous writes (on ext2)")) - -#-(or hpux svr4 linux) -(progn - (defconstant o_creat #o1000 _N"Create if nonexistant flag.") - (defconstant o_trunc #o2000 _N"Truncate flag.") - (defconstant o_excl #o4000 _N"Error if already exists.")) - -(defun unix-open (path flags mode) - _N"Unix-open opens the file whose pathname is specified by path - for reading and/or writing as specified by the flags argument. - The flags argument can be: - - o_rdonly Read-only flag. - o_wronly Write-only flag. - o_rdwr Read-and-write flag. - o_append Append flag. - o_creat Create-if-nonexistant flag. - o_trunc Truncate-to-size-0 flag. - - If the o_creat flag is specified, then the file is created with - a permission of argument mode if the file doesn't exist. An - integer file descriptor is returned by unix-open." - (declare (type unix-pathname path) - (type fixnum flags) - (type unix-file-mode mode)) - (int-syscall (#+solaris "open64" #-solaris "open" c-string int int) - (%name->file path) flags mode)) - -(defun unix-pipe () - _N"Unix-pipe sets up a unix-piping mechanism consisting of - an input pipe and an output pipe. Unix-Pipe returns two - values: if no error occurred the first value is the pipe - to be read from and the second is can be written to. If - an error occurred the first value is NIL and the second - the unix error code." - (with-alien ((fds (array int 2))) - (syscall ("pipe" (* int)) - (values (deref fds 0) (deref fds 1)) - (cast fds (* int))))) - -;;; Unix-read accepts a file descriptor, a buffer, and the length to read. -;;; It attempts to read len bytes from the device associated with fd -;;; and store them into the buffer. It returns the actual number of -;;; bytes read. - -(defun unix-read (fd buf len) - _N"Unix-read attempts to read from the file described by fd into - the buffer buf until it is full. Len is the length of the buffer. - The number of bytes actually read is returned or NIL and an error - number if an error occured." - (declare (type unix-fd fd) - (type (unsigned-byte 32) len)) - #+(or sunos gencgc) - ;; Note: Under sunos we touch each page before doing the read to give - ;; the segv handler a chance to fix the permissions. Otherwise, - ;; read will return EFAULT. This also bypasses a bug in 4.1.1 in which - ;; read fails with EFAULT if the page has never been touched even if - ;; the permissions are okay. - ;; - ;; (Is this true for Solaris?) - ;; - ;; Also, with gencgc, the collector tries to keep raw objects like - ;; strings in separate pages that are not write-protected. However, - ;; this isn't always true. Thus, BUF will sometimes be - ;; write-protected and the kernel doesn't like writing to - ;; write-protected pages. So go through and touch each page to give - ;; the segv handler a chance to unprotect the pages. - (without-gcing - (let* ((page-size (get-page-size)) - (1-page-size (1- page-size)) - (sap (etypecase buf - (system-area-pointer buf) - (vector (vector-sap buf)))) - (end (sap+ sap len))) - (declare (type (and fixnum unsigned-byte) page-size 1-page-size) - (type system-area-pointer sap end) - (optimize (speed 3) (safety 0))) - ;; Touch the beginning of every page - (do ((sap (int-sap (logand (sap-int sap) - (logxor 1-page-size (ldb (byte 32 0) -1)))) - (sap+ sap page-size))) - ((sap>= sap end)) - (declare (type system-area-pointer sap)) - (setf (sap-ref-8 sap 0) (sap-ref-8 sap 0))))) - (int-syscall ("read" int (* char) int) fd buf len)) - -(defun unix-readlink (path) - _N"Unix-readlink invokes the readlink system call on the file name - specified by the simple string path. It returns up to two values: - the contents of the symbolic link if the call is successful, or - NIL and the Unix error number." - (declare (type unix-pathname path)) - (with-alien ((buf (array char 1024))) - (syscall ("readlink" c-string (* char) int) - (let ((string (make-string result))) - #-unicode - (kernel:copy-from-system-area - (alien-sap buf) 0 - string (* vm:vector-data-offset vm:word-bits) - (* result vm:byte-bits)) - #+unicode - (let ((sap (alien-sap buf))) - (dotimes (k result) - (setf (aref string k) - (code-char (sap-ref-8 sap k))))) - (%file->name string)) - (%name->file path) (cast buf (* char)) 1024))) - -;;; Unix-rename accepts two files names and renames the first to the second. - -(defun unix-rename (name1 name2) - _N"Unix-rename renames the file with string name1 to the string - name2. NIL and an error code is returned if an error occured." - (declare (type unix-pathname name1 name2)) - (void-syscall ("rename" c-string c-string) - (%name->file name1) (%name->file name2))) - -;;; Unix-rmdir accepts a name and removes the associated directory. - -(defun unix-rmdir (name) - _N"Unix-rmdir attempts to remove the directory name. NIL and - an error number is returned if an error occured." - (declare (type unix-pathname name)) - (void-syscall ("rmdir" c-string) (%name->file name))) - - -;;; UNIX-FAST-SELECT -- public. -;;; -(defmacro unix-fast-select (num-descriptors - read-fds write-fds exception-fds - timeout-secs &optional (timeout-usecs 0)) - _N"Perform the UNIX select(2) system call. - (declare (type (integer 0 #.FD-SETSIZE) num-descriptors) - (type (or (alien (* (struct fd-set))) null) - read-fds write-fds exception-fds) - (type (or null (unsigned-byte 31)) timeout-secs) - (type (unsigned-byte 31) timeout-usecs) - (optimize (speed 3) (safety 0) (inhibit-warnings 3)))" - `(let ((timeout-secs ,timeout-secs)) - (with-alien ((tv (struct timeval))) - (when timeout-secs - (setf (slot tv 'tv-sec) timeout-secs) - (setf (slot tv 'tv-usec) ,timeout-usecs)) - (int-syscall (#-netbsd "select" #+netbsd "__select50" int (* (struct fd-set)) (* (struct fd-set)) - (* (struct fd-set)) (* (struct timeval))) - ,num-descriptors ,read-fds ,write-fds ,exception-fds - (if timeout-secs (alien-sap (addr tv)) (int-sap 0)))))) - - -;;; Unix-select accepts sets of file descriptors and waits for an event -;;; to happen on one of them or to time out. - -(defmacro num-to-fd-set (fdset num) - `(if (fixnump ,num) - (progn - (setf (deref (slot ,fdset 'fds-bits) 0) ,num) - ,@(loop for index upfrom 1 below (/ fd-setsize 32) - collect `(setf (deref (slot ,fdset 'fds-bits) ,index) 0))) - (progn - ,@(loop for index upfrom 0 below (/ fd-setsize 32) - collect `(setf (deref (slot ,fdset 'fds-bits) ,index) - (ldb (byte 32 ,(* index 32)) ,num)))))) - -(defmacro fd-set-to-num (nfds fdset) - `(if (<= ,nfds 32) - (deref (slot ,fdset 'fds-bits) 0) - (+ ,@(loop for index upfrom 0 below (/ fd-setsize 32) - collect `(ash (deref (slot ,fdset 'fds-bits) ,index) - ,(* index 32)))))) - -(defun unix-select (nfds rdfds wrfds xpfds to-secs &optional (to-usecs 0)) - _N"Unix-select examines the sets of descriptors passed as arguments - to see if they are ready for reading and writing. See the UNIX - Programmers Manual for more information." - (declare (type (integer 0 #.FD-SETSIZE) nfds) - (type unsigned-byte rdfds wrfds xpfds) - (type (or (unsigned-byte 31) null) to-secs) - (type (unsigned-byte 31) to-usecs) - (optimize (speed 3) (safety 0) (inhibit-warnings 3))) - (with-alien ((tv (struct timeval)) - (rdf (struct fd-set)) - (wrf (struct fd-set)) - (xpf (struct fd-set))) - (when to-secs - (setf (slot tv 'tv-sec) to-secs) - (setf (slot tv 'tv-usec) to-usecs)) - (num-to-fd-set rdf rdfds) - (num-to-fd-set wrf wrfds) - (num-to-fd-set xpf xpfds) - (macrolet ((frob (lispvar alienvar) - `(if (zerop ,lispvar) - (int-sap 0) - (alien-sap (addr ,alienvar))))) - (syscall (#-netbsd "select" #+netbsd "__select50" int (* (struct fd-set)) (* (struct fd-set)) - (* (struct fd-set)) (* (struct timeval))) - (values result - (fd-set-to-num nfds rdf) - (fd-set-to-num nfds wrf) - (fd-set-to-num nfds xpf)) - nfds (frob rdfds rdf) (frob wrfds wrf) (frob xpfds xpf) - (if to-secs (alien-sap (addr tv)) (int-sap 0)))))) - - -;;; Unix-sync writes all information in core memory which has been modified -;;; to permanent storage (i.e. disk). - -(defun unix-sync () - _N"Unix-sync writes all information in core memory which has been - modified to disk. It returns NIL and an error code if an error - occured." - (void-syscall ("sync"))) - -;;; Unix-fsync writes the core-image of the file described by "fd" to -;;; permanent storage (i.e. disk). - -(defun unix-fsync (fd) - _N"Unix-fsync writes the core image of the file described by - fd to disk." - (declare (type unix-fd fd)) - (void-syscall ("fsync" int) fd)) - -;;; Unix-truncate accepts a file name and a new length. The file is -;;; truncated to the new length. - -(defun unix-truncate (name len) - _N"Unix-truncate truncates the named file to the length (in - bytes) specified by len. NIL and an error number is returned - if the call is unsuccessful." - (declare (type unix-pathname name) - (type (unsigned-byte #+solaris 64 #-solaris 32) len)) - #-(and bsd x86) - (void-syscall (#+solaris "truncate64" #-solaris "truncate" c-string int) name len) - #+(and bsd x86) - (void-syscall ("truncate" c-string unsigned-long unsigned-long) name len 0)) - -(defun unix-ftruncate (fd len) - _N"Unix-ftruncate is similar to unix-truncate except that the first - argument is a file descriptor rather than a file name." - (declare (type unix-fd fd) - (type (unsigned-byte #+solaris 64 #-solaris 32) len)) - #-(and bsd x86) - (void-syscall (#+solaris "ftruncate64" #-solaris "ftruncate" int int) fd len) - #+(and bsd x86) - (void-syscall ("ftruncate" int unsigned-long unsigned-long) fd len 0)) - -(defun unix-symlink (name1 name2) - _N"Unix-symlink creates a symbolic link named name2 to the file - named name1. NIL and an error number is returned if the call - is unsuccessful." - (declare (type unix-pathname name1 name2)) - (void-syscall ("symlink" c-string c-string) - (%name->file name1) (%name->file name2))) - -;;; Unix-unlink accepts a name and deletes the directory entry for that -;;; name and the file if this is the last link. - -(defun unix-unlink (name) - _N"Unix-unlink removes the directory entry for the named file. - NIL and an error code is returned if the call fails." - (declare (type unix-pathname name)) - (void-syscall ("unlink" c-string) (%name->file name))) - -;;; Unix-write accepts a file descriptor, a buffer, an offset, and the -;;; length to write. It attempts to write len bytes to the device -;;; associated with fd from the buffer starting at offset. It returns -;;; the actual number of bytes written. - -(defun unix-write (fd buf offset len) - _N"Unix-write attempts to write a character buffer (buf) of length - len to the file described by the file descriptor fd. NIL and an - error is returned if the call is unsuccessful." - (declare (type unix-fd fd) - (type (unsigned-byte 32) offset len)) - (int-syscall ("write" int (* char) int) - fd - (with-alien ((ptr (* char) (etypecase buf - ((simple-array * (*)) - (vector-sap buf)) - (system-area-pointer - buf)))) - (addr (deref ptr offset))) - len)) - -;;; Unix-ioctl is used to change parameters of devices in a device -;;; dependent way. - - -(defconstant terminal-speeds - '#(0 50 75 110 134 150 200 300 600 #+hpux 900 1200 1800 2400 #+hpux 3600 - 4800 #+hpux 7200 9600 19200 38400 57600 115200 230400 - #+hpux 460800)) - -;;; from /usr/include/bsd/sgtty.h (linux) - -(defconstant tty-raw #-linux #o40 #+linux 1) -(defconstant tty-crmod #-linux #o20 #+linux 4) -#-(or hpux svr4 bsd linux) (defconstant tty-echo #o10) ;; 8 -(defconstant tty-lcase #-linux #o4 #+linux 2) -#-hpux -(defconstant tty-cbreak #-linux #o2 #+linux 64) -#-(or linux hpux) -(defconstant tty-tandem #o1) - -#+(or hpux svr4 bsd linux) -(progn - (defmacro def-enum (inc cur &rest names) - (flet ((defform (name) - (prog1 (when name `(defconstant ,name ,cur)) - (setf cur (funcall inc cur 1))))) - `(progn ,@(mapcar #'defform names)))) - - ;; Input modes. Linux: /usr/include/asm/termbits.h - (def-enum ash 1 tty-ignbrk tty-brkint tty-ignpar tty-parmrk tty-inpck - tty-istrip tty-inlcr tty-igncr tty-icrnl #-bsd tty-iuclc - tty-ixon #-bsd tty-ixany tty-ixoff #+bsd tty-ixany - #+hpux tty-ienqak #+bsd nil tty-imaxbel) - - ;; output modes - #-bsd (def-enum ash 1 tty-opost tty-olcuc tty-onlcr tty-ocrnl tty-onocr - tty-onlret tty-ofill tty-ofdel) - #+bsd (def-enum ash 1 tty-opost tty-onlcr) - - ;; local modes - #-bsd (def-enum ash 1 tty-isig tty-icanon tty-xcase tty-echo tty-echoe - tty-echok tty-echonl tty-noflsh #+irix tty-iexten - #+(or sunos linux) tty-tostop tty-echoctl tty-echoprt - tty-echoke #+(or sunos svr4) tty-defecho tty-flusho - #+linux nil tty-pendin #+irix tty-tostop - #+(or sunos linux) tty-iexten) - #+bsd (def-enum ash 1 tty-echoke tty-echoe tty-echok tty-echo tty-echonl - tty-echoprt tty-echoctl tty-isig tty-icanon nil - tty-iexten) - #+bsd (defconstant tty-tostop #x00400000) - #+bsd (defconstant tty-flusho #x00800000) - #+bsd (defconstant tty-pendin #x20000000) - #+bsd (defconstant tty-noflsh #x80000000) - #+hpux (defconstant tty-tostop #o10000000000) - #+hpux (defconstant tty-iexten #o20000000000) - - ;; control modes - (def-enum ash #-bsd #o100 #+bsd #x400 #+hpux nil tty-cstopb - tty-cread tty-parenb tty-parodd tty-hupcl tty-clocal - #+svr4 rcv1en #+svr4 xmt1en #+(or hpux svr4) tty-loblk) - - ;; special control characters - #+(or hpux svr4 linux) (def-enum + 0 vintr vquit verase vkill veof - #-linux veol #-linux veol2) - #+bsd (def-enum + 0 veof veol veol2 verase nil vkill nil nil vintr vquit) - #+linux (defconstant veol 11) - #+linux (defconstant veol2 16) - - (defconstant tciflush 0) - (defconstant tcoflush 1) - (defconstant tcioflush 2)) - -#+bsd -(progn - (defconstant vmin 16) - (defconstant vtime 17) - (defconstant vsusp 10) - (defconstant vstart 12) - (defconstant vstop 13) - (defconstant vdsusp 11)) - -#+hpux -(progn - (defconstant vmin 11) - (defconstant vtime 12) - (defconstant vsusp 13) - (defconstant vstart 14) - (defconstant vstop 15) - (defconstant vdsusp 21)) - -#+(or hpux bsd linux) -(progn - (defconstant tcsanow 0) - (defconstant tcsadrain 1) - (defconstant tcsaflush 2)) - -#+(or linux svr4) -(progn - #-linux (defconstant vdsusp 11) - (defconstant vstart 8) - (defconstant vstop 9) - (defconstant vsusp 10) - (defconstant vmin #-linux 4 #+linux 6) - (defconstant vtime 5)) - -#+(or sunos svr4) -(progn - ;; control modes - (defconstant tty-cbaud #o17) - (defconstant tty-csize #o60) - (defconstant tty-cs5 #o0) - (defconstant tty-cs6 #o20) - (defconstant tty-cs7 #o40) - (defconstant tty-cs8 #o60)) - -#+bsd -(progn - ;; control modes - (defconstant tty-csize #x300) - (defconstant tty-cs5 #x000) - (defconstant tty-cs6 #x100) - (defconstant tty-cs7 #x200) - (defconstant tty-cs8 #x300)) - -#+svr4 -(progn - (defconstant tcsanow #x540e) - (defconstant tcsadrain #x540f) - (defconstant tcsaflush #x5410)) - -(eval-when (compile load eval) - -#-(or (and svr4 (not irix)) linux) -(progn - (defconstant iocparm-mask #x7f) ; Freebsd: #x1fff ? - (defconstant ioc_void #x20000000) - (defconstant ioc_out #x40000000) - (defconstant ioc_in #x80000000) - (defconstant ioc_inout (logior ioc_in ioc_out))) - -#-(or linux (and svr4 (not irix))) -(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) - (let* ((ptype (ecase parm-type - (:void ioc_void) - (:in ioc_in) - (:out ioc_out) - (:inout ioc_inout))) - (code (logior (ash (char-code dev) 8) cmd ptype))) - (when arg - (setf code - `(logior (ash (logand (alien-size ,arg :bytes) - ,iocparm-mask) - 16) - ,code))) - `(eval-when (eval load compile) - (defconstant ,name ,code)))) - -#+(and svr4 (not irix)) -(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) - (declare (ignore dev arg parm-type)) - `(eval-when (eval load compile) - (defconstant ,name ,(logior (ash (char-code #\t) 8) cmd)))) - -#+linux -(defmacro define-ioctl-command (name dev cmd arg &optional (parm-type :void)) - (declare (ignore arg parm-type)) - `(eval-when (eval load compile) - (defconstant ,name ,(logior (ash (- (char-code dev) #x20) 8) cmd)))) - -) - -;;; TTY ioctl commands. - -(define-ioctl-command TIOCGETP #\t #-linux 8 #+linux #x81 (struct sgttyb) :out) -(define-ioctl-command TIOCSETP #\t #-linux 9 #+linux #x82 (struct sgttyb) :in) -(define-ioctl-command TIOCFLUSH #\t #-linux 16 #+linux #x89 int :in) -(define-ioctl-command TIOCSETC #\t #-linux 17 #+linux #x84 (struct tchars) :in) -(define-ioctl-command TIOCGETC #\t #-linux 18 #+linux #x83 (struct tchars) :out) -(define-ioctl-command TIOCGWINSZ #\t #-hpux 104 #+hpux 107 (struct winsize) - :out) -(define-ioctl-command TIOCSWINSZ #\t #-hpux 103 #+hpux 106 (struct winsize) - :in) - -(define-ioctl-command TIOCNOTTY #\t #-linux 113 #+linux #x22 nil :void) -#-hpux -(progn - (define-ioctl-command TIOCSLTC #\t #-linux 117 #+linux #x84 (struct ltchars) :in) - (define-ioctl-command TIOCGLTC #\t #-linux 116 #+linux #x85 (struct ltchars) :out) - (define-ioctl-command TIOCSPGRP #\t #-svr4 118 #+svr4 21 int :in) - (define-ioctl-command TIOCGPGRP #\t #-svr4 119 #+svr4 20 int :out)) -#+hpux -(progn - (define-ioctl-command TIOCSLTC #\T 23 (struct ltchars) :in) - (define-ioctl-command TIOCGLTC #\T 24 (struct ltchars) :out) - (define-ioctl-command TIOCSPGRP #\T 29 int :in) - (define-ioctl-command TIOCGPGRP #\T 30 int :out) - (define-ioctl-command TIOCSIGSEND #\t 93 nil)) - -;;; File ioctl commands. -(define-ioctl-command FIONREAD #\f #-linux 127 #+linux #x1B int :out) - - -(defun unix-ioctl (fd cmd arg) - _N"Unix-ioctl performs a variety of operations on open i/o - descriptors. See the UNIX Programmer's Manual for more - information." - (declare (type unix-fd fd) - (type (unsigned-byte 32) cmd)) - (int-syscall ("ioctl" int unsigned-int (* char)) fd cmd arg)) - -#+(or svr4 hpux bsd linux) -(progn - (defun unix-tcgetattr (fd termios) - _N"Get terminal attributes." - (declare (type unix-fd fd)) - (void-syscall ("tcgetattr" int (* (struct termios))) fd termios)) - - (defun unix-tcsetattr (fd opt termios) - _N"Set terminal attributes." - (declare (type unix-fd fd)) - (void-syscall ("tcsetattr" int int (* (struct termios))) fd opt termios)) - - ;; XXX rest of functions in this progn probably are present in linux, but - ;; not verified. - #-bsd - (defun unix-cfgetospeed (termios) - _N"Get terminal output speed." - (multiple-value-bind (speed errno) - (int-syscall ("cfgetospeed" (* (struct termios))) termios) - (if speed - (values (svref terminal-speeds speed) 0) - (values speed errno)))) - - #+bsd - (defun unix-cfgetospeed (termios) - _N"Get terminal output speed." - (int-syscall ("cfgetospeed" (* (struct termios))) termios)) - - #-bsd - (defun unix-cfsetospeed (termios speed) - _N"Set terminal output speed." - (let ((baud (or (position speed terminal-speeds) - (error _"Bogus baud rate ~S" speed)))) - (void-syscall ("cfsetospeed" (* (struct termios)) int) termios baud))) - - #+bsd - (defun unix-cfsetospeed (termios speed) - _N"Set terminal output speed." - (void-syscall ("cfsetospeed" (* (struct termios)) int) termios speed)) - - #-bsd - (defun unix-cfgetispeed (termios) - _N"Get terminal input speed." - (multiple-value-bind (speed errno) - (int-syscall ("cfgetispeed" (* (struct termios))) termios) - (if speed - (values (svref terminal-speeds speed) 0) - (values speed errno)))) - - #+bsd - (defun unix-cfgetispeed (termios) - _N"Get terminal input speed." - (int-syscall ("cfgetispeed" (* (struct termios))) termios)) - - #-bsd - (defun unix-cfsetispeed (termios speed) - _N"Set terminal input speed." - (let ((baud (or (position speed terminal-speeds) - (error _"Bogus baud rate ~S" speed)))) - (void-syscall ("cfsetispeed" (* (struct termios)) int) termios baud))) - - #+bsd - (defun unix-cfsetispeed (termios speed) - _N"Set terminal input speed." - (void-syscall ("cfsetispeed" (* (struct termios)) int) termios speed)) - - (defun unix-tcsendbreak (fd duration) - _N"Send break" - (declare (type unix-fd fd)) - (void-syscall ("tcsendbreak" int int) fd duration)) - - (defun unix-tcdrain (fd) - _N"Wait for output for finish" - (declare (type unix-fd fd)) - (void-syscall ("tcdrain" int) fd)) - - (defun unix-tcflush (fd selector) - _N"See tcflush(3)" - (declare (type unix-fd fd)) - (void-syscall ("tcflush" int int) fd selector)) - - (defun unix-tcflow (fd action) - _N"Flow control" - (declare (type unix-fd fd)) - (void-syscall ("tcflow" int int) fd action))) - -(defun tcsetpgrp (fd pgrp) - _N"Set the tty-process-group for the unix file-descriptor FD to PGRP." - (alien:with-alien ((alien-pgrp c-call:int pgrp)) - (unix-ioctl fd - tiocspgrp - (alien:alien-sap (alien:addr alien-pgrp))))) - -(defun tcgetpgrp (fd) - _N"Get the tty-process-group for the unix file-descriptor FD." - (alien:with-alien ((alien-pgrp c-call:int)) - (multiple-value-bind (ok err) - (unix-ioctl fd - tiocgpgrp - (alien:alien-sap (alien:addr alien-pgrp))) - (if ok - (values alien-pgrp nil) - (values nil err))))) - -(defun tty-process-group (&optional fd) - _N"Get the tty-process-group for the unix file-descriptor FD. If not supplied, - FD defaults to /dev/tty." - (if fd - (tcgetpgrp fd) - (multiple-value-bind (tty-fd errno) - (unix-open "/dev/tty" o_rdwr 0) - (cond (tty-fd - (multiple-value-prog1 - (tcgetpgrp tty-fd) - (unix-close tty-fd))) - (t - (values nil errno)))))) - -(defun %set-tty-process-group (pgrp &optional fd) - _N"Set the tty-process-group for the unix file-descriptor FD to PGRP. If not - supplied, FD defaults to /dev/tty." - (let ((old-sigs - (unix-sigblock - (sigmask :sigttou :sigttin :sigtstp :sigchld)))) - (declare (type (unsigned-byte 32) old-sigs)) - (unwind-protect - (if fd - (tcsetpgrp fd pgrp) - (multiple-value-bind (tty-fd errno) - (unix-open "/dev/tty" o_rdwr 0) - (cond (tty-fd - (multiple-value-prog1 - (tcsetpgrp tty-fd pgrp) - (unix-close tty-fd))) - (t - (values nil errno))))) - (unix-sigsetmask old-sigs)))) - -(defsetf tty-process-group (&optional fd) (pgrp) - _N"Set the tty-process-group for the unix file-descriptor FD to PGRP. If not - supplied, FD defaults to /dev/tty." - `(%set-tty-process-group ,pgrp ,fd)) - - -;;; Socket options. - -#+(or hpux bsd) -(define-ioctl-command SIOCSPGRP #\s 8 int :in) - -#+linux -(define-ioctl-command SIOCSPGRP #\s #x8904 int :in) - -#+(or hpux bsd linux) -(defun siocspgrp (fd pgrp) - _N"Set the socket process-group for the unix file-descriptor FD to PGRP." - (alien:with-alien ((alien-pgrp c-call:int pgrp)) - (unix-ioctl fd - siocspgrp - (alien:alien-sap (alien:addr alien-pgrp))))) - -;;; Unix-exit terminates a program. - -(defun unix-exit (&optional (code 0)) - _N"Unix-exit terminates the current process with an optional - error code. If successful, the call doesn't return. If - unsuccessful, the call returns NIL and an error number." - (declare (type (signed-byte 32) code)) - (void-syscall ("exit" int) code)) - -;;; STAT and friends. - -(defmacro extract-stat-results (buf) - `(values T - (slot ,buf 'st-dev) - (slot ,buf 'st-ino) - (slot ,buf 'st-mode) - (slot ,buf 'st-nlink) - (slot ,buf 'st-uid) - (slot ,buf 'st-gid) - (slot ,buf 'st-rdev) - (slot ,buf 'st-size) - #-(or svr4 BSD) (slot ,buf 'st-atime) - #+svr4 (slot (slot ,buf 'st-atime) 'tv-sec) - #+BSD (slot (slot ,buf 'st-atime) 'ts-sec) - #-(or svr4 BSD)(slot ,buf 'st-mtime) - #+svr4 (slot (slot ,buf 'st-mtime) 'tv-sec) - #+BSD(slot (slot ,buf 'st-mtime) 'ts-sec) - #-(or svr4 BSD) (slot ,buf 'st-ctime) - #+svr4 (slot (slot ,buf 'st-ctime) 'tv-sec) - #+BSD(slot (slot ,buf 'st-ctime) 'ts-sec) - #+netbsd (slot (slot ,buf 'st-birthtime) 'ts-sec) - (slot ,buf 'st-blksize) - (slot ,buf 'st-blocks))) - -#-solaris -(progn -(defun unix-stat (name) - _N"Unix-stat retrieves information about the specified - file returning them in the form of multiple values. - See the UNIX Programmer's Manual for a description - of the values returned. If the call fails, then NIL - and an error number is returned instead." - (declare (type unix-pathname name)) - (when (string= name "") - (setf name ".")) - (with-alien ((buf (struct stat))) - (syscall (#-netbsd "stat" #+netbsd "__stat50" c-string (* (struct stat))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-lstat (name) - _N"Unix-lstat is similar to unix-stat except the specified - file must be a symbolic link." - (declare (type unix-pathname name)) - (with-alien ((buf (struct stat))) - (syscall (#-netbsd "lstat" #+netbsd "__lstat50" c-string (* (struct stat))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-fstat (fd) - _N"Unix-fstat is similar to unix-stat except the file is specified - by the file descriptor fd." - (declare (type unix-fd fd)) - (with-alien ((buf (struct stat))) - (syscall (#-netbsd "fstat" #+netbsd "__fstat50" int (* (struct stat))) - (extract-stat-results buf) - fd (addr buf)))) -) - -;;; 64-bit versions of stat and friends -#+solaris -(progn -(defun unix-stat (name) - _N"Unix-stat retrieves information about the specified - file returning them in the form of multiple values. - See the UNIX Programmer's Manual for a description - of the values returned. If the call fails, then NIL - and an error number is returned instead." - (declare (type unix-pathname name)) - (when (string= name "") - (setf name ".")) - (with-alien ((buf (struct stat64))) - (syscall ("stat64" c-string (* (struct stat64))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-lstat (name) - _N"Unix-lstat is similar to unix-stat except the specified - file must be a symbolic link." - (declare (type unix-pathname name)) - (with-alien ((buf (struct stat64))) - (syscall ("lstat64" c-string (* (struct stat64))) - (extract-stat-results buf) - (%name->file name) (addr buf)))) - -(defun unix-fstat (fd) - _N"Unix-fstat is similar to unix-stat except the file is specified - by the file descriptor fd." - (declare (type unix-fd fd)) - (with-alien ((buf (struct stat64))) - (syscall ("fstat64" int (* (struct stat64))) - (extract-stat-results buf) - fd (addr buf)))) -) - - -(defconstant rusage_self 0 _N"The calling process.") -(defconstant rusage_children -1 _N"Terminated child processes.") - -(declaim (inline unix-fast-getrusage)) -(defun unix-fast-getrusage (who) - _N"Like call getrusage, but return only the system and user time, and returns - the seconds and microseconds as separate values." - (declare (values (member t) - (unsigned-byte 31) (mod 1000000) - (unsigned-byte 31) (mod 1000000))) - (with-alien ((usage (struct rusage))) - (syscall* (#-netbsd "getrusage" #+netbsd "__getrusage50" int (* (struct rusage))) - (values t - (slot (slot usage 'ru-utime) 'tv-sec) - (slot (slot usage 'ru-utime) 'tv-usec) - (slot (slot usage 'ru-stime) 'tv-sec) - (slot (slot usage 'ru-stime) 'tv-usec)) - who (addr usage)))) - -(defun unix-getrusage (who) - _N"Unix-getrusage returns information about the resource usage - of the process specified by who. Who can be either the - current process (rusage_self) or all of the terminated - child processes (rusage_children). NIL and an error number - is returned if the call fails." - (with-alien ((usage (struct rusage))) - (syscall (#-netbsd "getrusage" #+netbsd "__getrusage50" int (* (struct rusage))) - (values t - (+ (* (slot (slot usage 'ru-utime) 'tv-sec) 1000000) - (slot (slot usage 'ru-utime) 'tv-usec)) - (+ (* (slot (slot usage 'ru-stime) 'tv-sec) 1000000) - (slot (slot usage 'ru-stime) 'tv-usec)) - (slot usage 'ru-maxrss) - (slot usage 'ru-ixrss) - (slot usage 'ru-idrss) - (slot usage 'ru-isrss) - (slot usage 'ru-minflt) - (slot usage 'ru-majflt) - (slot usage 'ru-nswap) - (slot usage 'ru-inblock) - (slot usage 'ru-oublock) - (slot usage 'ru-msgsnd) - (slot usage 'ru-msgrcv) - (slot usage 'ru-nsignals) - (slot usage 'ru-nvcsw) - (slot usage 'ru-nivcsw)) - who (addr usage)))) - -;;; Getrusage is not provided in the C library on Solaris 2.4, and is -;;; rather slow on later versions so the "times" system call is -;;; provided. -#+(and sparc svr4) -(progn -(def-alien-type nil - (struct tms - (tms-utime #-alpha long #+alpha int) ; user time used - (tms-stime #-alpha long #+alpha int) ; system time used. - (tms-cutime #-alpha long #+alpha int) ; user time, children - (tms-cstime #-alpha long #+alpha int))) ; system time, children - -(declaim (inline unix-times)) -(defun unix-times () - _N"Unix-times returns information about the cpu time usage of the process - and its children." - (with-alien ((usage (struct tms))) - (alien-funcall (extern-alien "times" (function int (* (struct tms)))) - (addr usage)) - (values t - (slot usage 'tms-utime) - (slot usage 'tms-stime) - (slot usage 'tms-cutime) - (slot usage 'tms-cstime)))) -) ; end progn - -;; Requires call to tzset() in main. -;; Don't use this now: we -#+(or linux svr4) -(progn - (def-alien-variable ("daylight" unix-daylight) int) - (def-alien-variable ("timezone" unix-timezone) time-t) - (def-alien-variable ("altzone" unix-altzone) time-t) - #-irix (def-alien-variable ("tzname" unix-tzname) (array c-string 2)) - #+irix (defvar unix-tzname-addr nil) - #+irix (pushnew #'(lambda () (setq unix-tzname-addr nil)) - ext:*after-save-initializations*) - #+irix (declaim (notinline fakeout-compiler)) - #+irix (defun fakeout-compiler (name dst) - (unless unix-tzname-addr - (setf unix-tzname-addr (system:foreign-symbol-address - name - :flavor :data))) - (deref (sap-alien unix-tzname-addr (array c-string 2)) dst)) - (def-alien-routine get-timezone c-call:void - (when c-call:long :in) - (minutes-west c-call:int :out) - (daylight-savings-p alien:boolean :out)) - (defun unix-get-minutes-west (secs) - (multiple-value-bind (ignore minutes 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 #-irix (deref unix-tzname (if dst 1 0)) - #+irix (fakeout-compiler "tzname" (if dst 1 0))) - ) ) -) -(declaim (inline unix-gettimeofday)) -(defun unix-gettimeofday () - _N"If it works, unix-gettimeofday returns 5 values: T, the seconds and - microseconds of the current time of day, the timezone (in minutes west - of Greenwich), and a daylight-savings flag. If it doesn't work, it - returns NIL and the errno." - (with-alien ((tv (struct timeval)) - #-(or svr4 netbsd) (tz (struct timezone))) - (syscall* (#-netbsd "gettimeofday" - #+netbsd "__gettimeofday50" - (* (struct timeval)) #-svr4 (* (struct timezone))) - (values T - (slot tv 'tv-sec) - (slot tv 'tv-usec) - #-(or svr4 netbsd) (slot tz 'tz-minuteswest) - #+svr4 (unix-get-minutes-west (slot tv 'tv-sec)) - #-(or svr4 netbsd) (slot tz 'tz-dsttime) - #+svr4 (unix-get-timezone (slot tv 'tv-sec)) - ) - (addr tv) - #-(or svr4 netbsd) (addr tz) #+netbsd nil))) - -;;; Unix-utimes changes the accessed and updated times on UNIX -;;; files. The first argument is the filename (a string) and -;;; the second argument is a list of the 4 times- accessed and -;;; updated seconds and microseconds. - -#-hpux -(defun unix-utimes (file atime-sec atime-usec mtime-sec mtime-usec) - _N"Unix-utimes sets the 'last-accessed' and 'last-updated' - times on a specified file. NIL and an error number is - returned if the call is unsuccessful." - (declare (type unix-pathname file) - (type (alien unsigned-long) - atime-sec atime-usec - mtime-sec mtime-usec)) - (with-alien ((tvp (array (struct timeval) 2))) - (setf (slot (deref tvp 0) 'tv-sec) atime-sec) - (setf (slot (deref tvp 0) 'tv-usec) atime-usec) - (setf (slot (deref tvp 1) 'tv-sec) mtime-sec) - (setf (slot (deref tvp 1) 'tv-usec) mtime-usec) - (void-syscall (#-netbsd "utimes" #+netbsd "__utimes50" c-string (* (struct timeval))) - file - (cast tvp (* (struct timeval)))))) - -;;; Unix-setreuid sets the real and effective user-id's of the current -;;; process to the arguments "ruid" and "euid", respectively. Usage is -;;; restricted for anyone but the super-user. Setting either "ruid" or -;;; "euid" to -1 makes the system use the current id instead. - -#-(or svr4 hpux) -(defun unix-setreuid (ruid euid) - _N"Unix-setreuid sets the real and effective user-id's of the current - process to the specified ones. NIL and an error number is returned - if the call fails." - (void-syscall ("setreuid" int int) ruid euid)) - -;;; Unix-setregid sets the real and effective group-id's of the current -;;; process to the arguments "rgid" and "egid", respectively. Usage is -;;; restricted for anyone but the super-user. Setting either "rgid" or -;;; "egid" to -1 makes the system use the current id instead. - -#-(or svr4 hpux) -(defun unix-setregid (rgid egid) - _N"Unix-setregid sets the real and effective group-id's of the current - process process to the specified ones. NIL and an error number is - returned if the call fails." - (void-syscall ("setregid" int int) rgid egid)) - -(def-alien-routine ("getpid" unix-getpid) int - _N"Unix-getpid returns the process-id of the current process.") - -(def-alien-routine ("getppid" unix-getppid) int - _N"Unix-getppid returns the process-id of the parent of the current process.") - -(def-alien-routine ("getgid" unix-getgid) int - _N"Unix-getgid returns the real group-id of the current process.") - -(def-alien-routine ("getegid" unix-getegid) int - _N"Unix-getegid returns the effective group-id of the current process.") - -;;; Unix-getpgrp returns the group-id associated with the -;;; current process. - -(defun unix-getpgrp () - _N"Unix-getpgrp returns the group-id of the calling process." - (int-syscall ("getpgrp"))) - -;;; Unix-setpgid sets the group-id of the process specified by -;;; "pid" to the value of "pgrp". The process must either have -;;; the same effective user-id or be a super-user process. - -;;; setpgrp(int int)[freebsd] is identical to setpgid and is retained -;;; for backward compatibility. setpgrp(void)[solaris] is being phased -;;; out in favor of setsid(). - -(defun unix-setpgrp (pid pgrp) - _N"Unix-setpgrp sets the process group on the process pid to - pgrp. NIL and an error number are returned upon failure." - (void-syscall (#-svr4 "setpgrp" #+svr4 "setpgid" int int) pid pgrp)) - -(defun unix-setpgid (pid pgrp) - _N"Unix-setpgid sets the process group of the process pid to - pgrp. If pgid is equal to pid, the process becomes a process - group leader. NIL and an error number are returned upon failure." - (void-syscall ("setpgid" int int) pid pgrp)) - -(def-alien-routine ("getuid" unix-getuid) int - _N"Unix-getuid returns the real user-id associated with the - current process.") - -;;; Unix-getpagesize returns the number of bytes in the system page. - -(defun unix-getpagesize () - _N"Unix-getpagesize returns the number of bytes in a system page." - (int-syscall ("getpagesize"))) - -(defun unix-gethostname () - _N"Unix-gethostname returns the name of the host machine as a string." - (with-alien ((buf (array char 256))) - (syscall* ("gethostname" (* char) int) - (cast buf c-string) - (cast buf (* char)) 256))) - -(def-alien-routine ("gethostid" unix-gethostid) unsigned-long - _N"Unix-gethostid returns a 32-bit integer which provides unique - identification for the host machine.") - -(defun unix-fork () - _N"Executes the unix fork system call. Returns 0 in the child and the pid - of the child in the parent if it works, or NIL and an error number if it - doesn't work." - (int-syscall ("fork"))) - -;; Environment manipulation; man getenv(3) -(def-alien-routine ("getenv" unix-getenv) c-call:c-string - (name c-call:c-string) - _N"Get the value of the environment variable named Name. If no such - variable exists, Nil is returned.") - -;; This doesn't exist in Solaris 8 but does exist in Solaris 10. -(def-alien-routine ("setenv" unix-setenv) c-call:int - (name c-call:c-string) - (value c-call:c-string) - (overwrite c-call:int) - _N"Adds the environment variable named Name to the environment with - the given Value if Name does not already exist. If Name does exist, - the value is changed to Value if Overwrite is non-zero. Otherwise, - the value is not changed.") - - -(def-alien-routine ("putenv" unix-putenv) c-call:int - (name-value c-call:c-string) - _N"Adds or changes the environment. Name-value must be a string of - the form \"name=value\". If the name does not exist, it is added. - If name does exist, the value is updated to the given value.") - -;; This doesn't exist in Solaris 8 but does exist in Solaris 10. -(def-alien-routine ("unsetenv" unix-unsetenv) c-call:int - (name c-call:c-string) - _N"Removes the variable Name from the environment") - - -;;; Operations on Unix Directories. - -(export '(open-dir read-dir close-dir)) - -(defstruct (%directory - (:conc-name directory-) - (:constructor make-directory) - (:print-function %print-directory)) - name - (dir-struct (required-argument) :type system-area-pointer)) - -(defun %print-directory (dir stream depth) - (declare (ignore depth)) - (format stream "#<Directory ~S>" (directory-name dir))) - -(defun open-dir (pathname) - (declare (type unix-pathname pathname)) - (when (string= pathname "") - (setf pathname ".")) - (let ((kind (unix-file-kind pathname))) - (case kind - (:directory - (let ((dir-struct - (alien-funcall (extern-alien "opendir" - (function system-area-pointer - c-string)) - (%name->file pathname)))) - (if (zerop (sap-int dir-struct)) - (values nil (unix-errno)) - (make-directory :name pathname :dir-struct dir-struct)))) - ((nil) - (values nil enoent)) - (t - (values nil enotdir))))) - -#-(and bsd (not solaris)) -(defun read-dir (dir) - (declare (type %directory dir)) - (let ((daddr (alien-funcall (extern-alien "readdir" - (function system-area-pointer - system-area-pointer)) - (directory-dir-struct dir)))) - (declare (type system-area-pointer daddr)) - (if (zerop (sap-int daddr)) - nil - (with-alien ((direct (* (struct direct)) daddr)) - #-(or linux svr4) - (let ((nlen (slot direct 'd-namlen)) - (ino (slot direct 'd-ino))) - (declare (type (unsigned-byte 16) nlen)) - (let ((string (make-string nlen))) - #-unicode - (kernel:copy-from-system-area - (alien-sap (addr (slot direct 'd-name))) 0 - string (* vm:vector-data-offset vm:word-bits) - (* nlen vm:byte-bits)) - #+unicode - (let ((sap (alien-sap (addr (slot direct 'd-name))))) - (dotimes (k nlen) - (setf (aref string k) - (code-char (sap-ref-8 sap k))))) - (values (%file->name string) ino))) - #+(or linux svr4) - (values (%file->name (cast (slot direct 'd-name) c-string)) - (slot direct 'd-ino)))))) - -;;; 64-bit readdir for Solaris -#+solaris -(defun read-dir (dir) - (declare (type %directory dir)) - (let ((daddr (alien-funcall (extern-alien "readdir64" - (function system-area-pointer - system-area-pointer)) - (directory-dir-struct dir)))) - (declare (type system-area-pointer daddr)) - (if (zerop (sap-int daddr)) - nil - (with-alien ((direct (* (struct dirent64)) daddr)) - #-(or linux svr4) - (let ((nlen (slot direct 'd-namlen)) - (ino (slot direct 'd-ino))) - (declare (type (unsigned-byte 16) nlen)) - (let ((string (make-string nlen))) - #-unicode - (kernel:copy-from-system-area - (alien-sap (addr (slot direct 'd-name))) 0 - string (* vm:vector-data-offset vm:word-bits) - (* nlen vm:byte-bits)) - #+unicode - (let ((sap (alien-sap (addr (slot direct 'd-name))))) - (dotimes (k nlen) - (setf (aref string k) - (code-char (sap-ref-8 sap k))))) - (values (%file->name string) ino))) - #+(or linux svr4) - (values (%file->name (cast (slot direct 'd-name) c-string)) - (slot direct 'd-ino)))))) - -#+(and bsd (not solaris)) -(defun read-dir (dir) - (declare (type %directory dir)) - (let ((daddr (alien-funcall (extern-alien "readdir" - (function system-area-pointer - system-area-pointer)) - (directory-dir-struct dir)))) - (declare (type system-area-pointer daddr)) - (if (zerop (sap-int daddr)) - nil - (with-alien ((direct (* (struct direct)) daddr)) - (let ((nlen (slot direct 'd-namlen)) - (fino (slot direct 'd-fileno))) - (declare (type (unsigned-byte #+netbsd 16 #-netbsd 8) nlen) - (type (unsigned-byte #+netbsd 64 #-netbsd 32) fino)) - (let ((string (make-string nlen))) - #-unicode - (kernel:copy-from-system-area - (alien-sap (addr (slot direct 'd-name))) 0 - string (* vm:vector-data-offset vm:word-bits) - (* nlen vm:byte-bits)) - #+unicode - (let ((sap (alien-sap (addr (slot direct 'd-name))))) - (dotimes (k nlen) - (setf (aref string k) - (code-char (sap-ref-8 sap k))))) - (values (%file->name string) fino))))))) - - -(defun close-dir (dir) - (declare (type %directory dir)) - (alien-funcall (extern-alien "closedir" - (function void system-area-pointer)) - (directory-dir-struct dir)) - nil) - - -;; Use getcwd instead of getwd. But what should we do if the path -;; won't fit? Try again with a larger size? We don't do that right -;; now. -(defun unix-current-directory () - ;; 5120 is some randomly selected maximum size for the buffer for getcwd. - (with-alien ((buf (array c-call:char 5120))) - (let ((result - (alien-funcall - (extern-alien "getcwd" - (function (* c-call:char) - (* c-call:char) c-call:int)) - (cast buf (* c-call:char)) - 5120))) - - (values (not (zerop - (sap-int (alien-sap result)))) - (%file->name (cast buf c-call:c-string)))))) - - - -;;;; Support routines for dealing with unix pathnames. - -(export '(unix-file-kind unix-maybe-prepend-current-directory - unix-resolve-links unix-simplify-pathname)) - -(defun unix-file-kind (name &optional check-for-links) - _N"Returns either :file, :directory, :link, :special, or NIL." - (declare (simple-string name)) - (multiple-value-bind (res dev ino mode) - (if check-for-links - (unix-lstat name) - (unix-stat name)) - (declare (type (or fixnum null) mode) - (ignore dev ino)) - (when res - (let ((kind (logand mode s-ifmt))) - (cond ((eql kind s-ifdir) :directory) - ((eql kind s-ifreg) :file) - ((eql kind s-iflnk) :link) - (t :special)))))) - -(defun unix-maybe-prepend-current-directory (name) - (declare (simple-string name)) - (if (and (> (length name) 0) (char= (schar name 0) #\/)) - name - (multiple-value-bind (win dir) (unix-current-directory) - (if win - (concatenate 'simple-string dir "/" name) - name)))) - -(defun unix-resolve-links (pathname) - _N"Returns the pathname with all symbolic links resolved." - (declare (simple-string pathname)) - (let ((len (length pathname)) - (pending pathname)) - (declare (fixnum len) (simple-string pending)) - (if (zerop len) - pathname - (let ((result (make-string 100 :initial-element (code-char 0))) - (fill-ptr 0) - (name-start 0)) - (loop - (let* ((name-end (or (position #\/ pending :start name-start) len)) - (new-fill-ptr (+ fill-ptr (- name-end name-start)))) - ;; grow the result string, if necessary. the ">=" (instead of - ;; using ">") allows for the trailing "/" if we find this - ;; component is a directory. - (when (>= new-fill-ptr (length result)) - (let ((longer (make-string (* 3 (length result)) - :initial-element (code-char 0)))) - (replace longer result :end1 fill-ptr) - (setq result longer))) - (replace result pending - :start1 fill-ptr - :end1 new-fill-ptr - :start2 name-start - :end2 name-end) - (let ((kind (unix-file-kind (if (zerop name-end) "/" result) t))) - (unless kind (return nil)) - (cond ((eq kind :link) - (multiple-value-bind (link err) (unix-readlink result) - (unless link - (error (intl:gettext "Error reading link ~S: ~S") - (subseq result 0 fill-ptr) - (get-unix-error-msg err))) - (cond ((or (zerop (length link)) - (char/= (schar link 0) #\/)) - ;; It's a relative link - (fill result (code-char 0) - :start fill-ptr - :end new-fill-ptr)) - ((string= result "/../" :end1 4) - ;; It's across the super-root. - (let ((slash (or (position #\/ result :start 4) - 0))) - (fill result (code-char 0) - :start slash - :end new-fill-ptr) - (setf fill-ptr slash))) - (t - ;; It's absolute. - (and (> (length link) 0) - (char= (schar link 0) #\/)) - (fill result (code-char 0) :end new-fill-ptr) - (setf fill-ptr 0))) - (setf pending - (if (= name-end len) - link - (concatenate 'simple-string - link - (subseq pending name-end)))) - (setf len (length pending)) - (setf name-start 0))) - ((= name-end len) - (when (eq kind :directory) - (setf (schar result new-fill-ptr) #\/) - (incf new-fill-ptr)) - (return (subseq result 0 new-fill-ptr))) - ((eq kind :directory) - (setf (schar result new-fill-ptr) #\/) - (setf fill-ptr (1+ new-fill-ptr)) - (setf name-start (1+ name-end))) - (t - (return nil)))))))))) - -(defun unix-simplify-pathname (src) - (declare (simple-string src)) - (let* ((src-len (length src)) - (dst (make-string src-len)) - (dst-len 0) - (dots 0) - (last-slash nil)) - (macrolet ((deposit (char) - `(progn - (setf (schar dst dst-len) ,char) - (incf dst-len)))) - (dotimes (src-index src-len) - (let ((char (schar src src-index))) - (cond ((char= char #\.) - (when dots - (incf dots)) - (deposit char)) - ((char= char #\/) - (case dots - (0 - ;; Either ``/...' or ``...//...' - (unless last-slash - (setf last-slash dst-len) - (deposit char))) - (1 - ;; Either ``./...'' or ``..././...'' - (decf dst-len)) - (2 - ;; We've found .. - (cond - ((and last-slash (not (zerop last-slash))) - ;; There is something before this .. - (let ((prev-prev-slash - (position #\/ dst :end last-slash :from-end t))) - (cond ((and (= (+ (or prev-prev-slash 0) 2) - last-slash) - (char= (schar dst (- last-slash 2)) #\.) - (char= (schar dst (1- last-slash)) #\.)) - ;; The something before this .. is another .. - (deposit char) - (setf last-slash dst-len)) - (t - ;; The something is some random dir. - (setf dst-len - (if prev-prev-slash - (1+ prev-prev-slash) - 0)) - (setf last-slash prev-prev-slash))))) - (t - ;; There is nothing before this .., so we need to keep it - (setf last-slash dst-len) - (deposit char)))) - (t - ;; Something other than a dot between slashes. - (setf last-slash dst-len) - (deposit char))) - (setf dots 0)) - (t - (setf dots nil) - (setf (schar dst dst-len) char) - (incf dst-len)))))) - (when (and last-slash (not (zerop last-slash))) - (case dots - (1 - ;; We've got ``foobar/.'' - (decf dst-len)) - (2 - ;; We've got ``foobar/..'' - (unless (and (>= last-slash 2) - (char= (schar dst (1- last-slash)) #\.) - (char= (schar dst (- last-slash 2)) #\.) - (or (= last-slash 2) - (char= (schar dst (- last-slash 3)) #\/))) - (let ((prev-prev-slash - (position #\/ dst :end last-slash :from-end t))) - (if prev-prev-slash - (setf dst-len (1+ prev-prev-slash)) - (return-from unix-simplify-pathname "./"))))))) - (cond ((zerop dst-len) - "./") - ((= dst-len src-len) - dst) - (t - (subseq dst 0 dst-len))))) - - -;;;; Other random routines. - -(def-alien-routine ("isatty" unix-isatty) boolean - _N"Accepts a Unix file descriptor and returns T if the device - associated with it is a terminal." - (fd int)) - -(def-alien-routine ("ttyname" unix-ttyname) c-string - (fd int)) - -(def-alien-routine ("openpty" unix-openpty) int - (amaster int :out) - (aslave int :out) - (name c-string) - (termp (* (struct termios))) - (winp (* (struct winsize)))) - - - -;;;; UNIX-EXECVE - -(defun unix-execve (program &optional arg-list - (environment *environment-list*)) - _N"Executes the Unix execve system call. If the system call suceeds, lisp - will no longer be running in this process. If the system call fails this - function returns two values: NIL and an error code. Arg-list should be a - list of simple-strings which are passed as arguments to the exec'ed program. - Environment should be an a-list mapping symbols to simple-strings which this - function bashes together to form the environment for the exec'ed program." - (check-type program simple-string) - (let ((env-list (let ((envlist nil)) - (dolist (cons environment) - (push (if (cdr cons) - (concatenate 'simple-string - (string (car cons)) "=" - (cdr cons)) - (car cons)) - envlist)) - envlist))) - (sub-unix-execve (%name->file program) arg-list env-list))) - - -(defmacro round-bytes-to-words (n) - `(logand (the fixnum (+ (the fixnum ,n) 3)) (lognot 3))) - -;;; -;;; STRING-LIST-TO-C-STRVEC -- Internal -;;; -;;; STRING-LIST-TO-C-STRVEC is a function which takes a list of -;;; simple-strings and constructs a C-style string vector (strvec) -- -;;; a null-terminated array of pointers to null-terminated strings. -;;; This function returns two values: a sap and a byte count. When the -;;; memory is no longer needed it should be deallocated with -;;; vm_deallocate. -;;; -(defun string-list-to-c-strvec (string-list) - ;; - ;; Make a pass over string-list to calculate the amount of memory - ;; needed to hold the strvec. - (let ((string-bytes 0) - (vec-bytes (* 4 (1+ (length string-list))))) - (declare (fixnum string-bytes vec-bytes)) - (dolist (s string-list) - (check-type s simple-string) - (incf string-bytes (round-bytes-to-words (1+ (length s))))) - ;; - ;; Now allocate the memory and fill it in. - (let* ((total-bytes (+ string-bytes vec-bytes)) - (vec-sap (system:allocate-system-memory total-bytes)) - (string-sap (sap+ vec-sap vec-bytes)) - (i 0)) - (declare (type (and unsigned-byte fixnum) total-bytes i) - (type system:system-area-pointer vec-sap string-sap)) - (dolist (s string-list) - (declare (simple-string s)) - (let ((n (length s))) - ;; - ;; Blast the string into place - #-unicode - (kernel:copy-to-system-area (the simple-string s) - (* vm:vector-data-offset vm:word-bits) - string-sap 0 - (* (1+ n) vm:byte-bits)) - #+unicode - (progn - ;; FIXME: Do we need to apply some kind of transformation - ;; to convert Lisp unicode strings to C strings? Utf-8? - (dotimes (k n) - (setf (sap-ref-8 string-sap k) - (logand #xff (char-code (aref s k))))) - (setf (sap-ref-8 string-sap n) 0)) - - ;; - ;; Blast the pointer to the string into place - (setf (sap-ref-sap vec-sap i) string-sap) - (setf string-sap (sap+ string-sap (round-bytes-to-words (1+ n)))) - (incf i 4))) - ;; Blast in last null pointer - (setf (sap-ref-sap vec-sap i) (int-sap 0)) - (values vec-sap total-bytes)))) - -(defun sub-unix-execve (program arg-list env-list) - (let ((argv nil) - (argv-bytes 0) - (envp nil) - (envp-bytes 0) - result error-code) - (unwind-protect - (progn - ;; Blast the stuff into the proper format - (multiple-value-setq - (argv argv-bytes) - (string-list-to-c-strvec arg-list)) - (multiple-value-setq - (envp envp-bytes) - (string-list-to-c-strvec env-list)) - ;; - ;; Now do the system call - (multiple-value-setq - (result error-code) - (int-syscall ("execve" - c-string system-area-pointer system-area-pointer) - program argv envp))) - ;; - ;; Deallocate memory - (when argv - (system:deallocate-system-memory argv argv-bytes)) - (when envp - (system:deallocate-system-memory envp envp-bytes))) - (values result error-code))) - - - -;;;; Socket support. - -(def-alien-routine ("socket" unix-socket) int - (domain int) - (type int) - (protocol int)) - -(def-alien-routine ("connect" unix-connect) int - (socket int) - (sockaddr (* t)) - (len int)) - -(def-alien-routine ("bind" unix-bind) int - (socket int) - (sockaddr (* t)) - (len int)) - -(def-alien-routine ("listen" unix-listen) int - (socket int) - (backlog int)) - -(def-alien-routine ("accept" unix-accept) int - (socket int) - (sockaddr (* t)) - (len int :in-out)) - -(def-alien-routine ("recv" unix-recv) int - (fd int) - (buffer c-string) - (length int) - (flags int)) - -(def-alien-routine ("send" unix-send) int - (fd int) - (buffer c-string) - (length int) - (flags int)) - -(def-alien-routine ("getpeername" unix-getpeername) int - (socket int) - (sockaddr (* t)) - (len (* unsigned))) - -(def-alien-routine ("getsockname" unix-getsockname) int - (socket int) - (sockaddr (* t)) - (len (* unsigned))) - -(def-alien-routine ("getsockopt" unix-getsockopt) int - (socket int) - (level int) - (optname int) - (optval (* t)) - (optlen unsigned :in-out)) - -(def-alien-routine ("setsockopt" unix-setsockopt) int - (socket int) - (level int) - (optname int) - (optval (* t)) - (optlen unsigned)) - -;; Datagram support - -(defun unix-recvfrom (fd buffer length flags sockaddr len) - (with-alien ((l c-call:int len)) - (values - (alien-funcall (extern-alien "recvfrom" - (function c-call:int - c-call:int - system-area-pointer - c-call:int - c-call:int - (* t) - (* c-call:int))) - fd - (system:vector-sap buffer) - length - flags - sockaddr - (addr l)) - l))) - -#-unicode -(def-alien-routine ("sendto" unix-sendto) int - (fd int) - (buffer c-string) - (length int) - (flags int) - (sockaddr (* t)) - (len int)) - -(defun unix-sendto (fd buffer length flags sockaddr len) - (alien-funcall (extern-alien "sendto" - (function c-call:int - c-call:int - system-area-pointer - c-call:int - c-call:int - (* t) - c-call:int)) - fd - (system:vector-sap buffer) - length - flags - sockaddr - len)) - -(def-alien-routine ("shutdown" unix-shutdown) int - (socket int) - (level int)) - - -;;; -;;; Support for the Interval Timer (experimental) -;;; - - -(defconstant ITIMER-REAL 0) -(defconstant ITIMER-VIRTUAL 1) -(defconstant ITIMER-PROF 2) - -(defun unix-getitimer (which) - _N"Unix-getitimer returns the INTERVAL and VALUE slots of one of - three system timers (:real :virtual or :profile). On success, - unix-getitimer returns 5 values, - T, it-interval-secs, it-interval-usec, it-value-secs, it-value-usec." - (declare (type (member :real :virtual :profile) which) - (values t - #+netbsd (unsigned-byte 63) #-netbsd (unsigned-byte 29) - (mod 1000000) - #+netbsd (unsigned-byte 63) #-netbsd (unsigned-byte 29) - (mod 1000000))) - (let ((which (ecase which - (:real ITIMER-REAL) - (:virtual ITIMER-VIRTUAL) - (:profile ITIMER-PROF)))) - (with-alien ((itv (struct itimerval))) - (syscall* (#-netbsd "getitimer" #+netbsd "__getitimer50" int (* (struct itimerval))) - (values T - (slot (slot itv 'it-interval) 'tv-sec) - (slot (slot itv 'it-interval) 'tv-usec) - (slot (slot itv 'it-value) 'tv-sec) - (slot (slot itv 'it-value) 'tv-usec)) - which (alien-sap (addr itv)))))) - -(defun unix-setitimer (which int-secs int-usec val-secs val-usec) - _N" Unix-setitimer sets the INTERVAL and VALUE slots of one of - three system timers (:real :virtual or :profile). A SIGALRM signal - will be delivered VALUE <seconds+microseconds> from now. INTERVAL, - when non-zero, is <seconds+microseconds> to be loaded each time - the timer expires. Setting INTERVAL and VALUE to zero disables - the timer. See the Unix man page for more details. On success, - unix-setitimer returns the old contents of the INTERVAL and VALUE - slots as in unix-getitimer." - (declare (type (member :real :virtual :profile) which) - (type (unsigned-byte 29) int-secs val-secs) - (type (integer 0 (1000000)) int-usec val-usec) - (values t - (unsigned-byte 29) - (mod 1000000) - (unsigned-byte 29) - (mod 1000000))) - (let ((which (ecase which - (:real ITIMER-REAL) - (:virtual ITIMER-VIRTUAL) - (:profile ITIMER-PROF)))) - (with-alien ((itvn (struct itimerval)) - (itvo (struct itimerval))) - (setf (slot (slot itvn 'it-interval) 'tv-sec ) int-secs - (slot (slot itvn 'it-interval) 'tv-usec) int-usec - (slot (slot itvn 'it-value ) 'tv-sec ) val-secs - (slot (slot itvn 'it-value ) 'tv-usec) val-usec) - (syscall* (#-netbsd "setitimer" #+netbsd "__setitimer50" int (* (struct timeval))(* (struct timeval))) - (values T - (slot (slot itvo 'it-interval) 'tv-sec) - (slot (slot itvo 'it-interval) 'tv-usec) - (slot (slot itvo 'it-value) 'tv-sec) - (slot (slot itvo 'it-value) 'tv-usec)) - which (alien-sap (addr itvn))(alien-sap (addr itvo)))))) - - -;;;; User and group database access, POSIX Standard 9.2.2 - -#+solaris -(defun unix-getpwnam (login) - _N"Return a USER-INFO structure for the user identified by LOGIN, or NIL if not found." - (declare (type simple-string login)) - (with-alien ((buf (array c-call:char 1024)) - (user-info (struct passwd))) - (let ((result - (alien-funcall - (extern-alien "getpwnam_r" - (function (* (struct passwd)) - c-call:c-string - (* (struct passwd)) - (* c-call:char) - c-call:unsigned-int)) - login - (addr user-info) - (cast buf (* c-call:char)) - 1024))) - (when (not (zerop (sap-int (alien-sap result)))) - (make-user-info - :name (string (cast (slot result 'pw-name) c-call:c-string)) - :password (string (cast (slot result 'pw-passwd) c-call:c-string)) - :uid (slot result 'pw-uid) - :gid (slot result 'pw-gid) - :age (string (cast (slot result 'pw-age) c-call:c-string)) - :comment (string (cast (slot result 'pw-comment) c-call:c-string)) - :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string))))))) - -#+bsd -(defun unix-getpwnam (login) - _N"Return a USER-INFO structure for the user identified by LOGIN, or NIL if not found." - (declare (type simple-string login)) - (let ((result - (alien-funcall - (extern-alien "getpwnam" - (function (* (struct passwd)) - c-call:c-string)) - login))) - (when (not (zerop (sap-int (alien-sap result)))) - (make-user-info - :name (string (cast (slot result 'pw-name) c-call:c-string)) - :password (string (cast (slot result 'pw-passwd) c-call:c-string)) - :uid (slot result 'pw-uid) - :gid (slot result 'pw-gid) - #-darwin :change #-darwin (slot result 'pw-change) - :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string)))))) - -#+solaris -(defun unix-getpwuid (uid) - _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." - (declare (type unix-uid uid)) - (with-alien ((buf (array c-call:char 1024)) - (user-info (struct passwd))) - (let ((result - (alien-funcall - (extern-alien "getpwuid_r" - (function (* (struct passwd)) - c-call:unsigned-int - (* (struct passwd)) - (* c-call:char) - c-call:unsigned-int)) - uid - (addr user-info) - (cast buf (* c-call:char)) - 1024))) - (when (not (zerop (sap-int (alien-sap result)))) - (make-user-info - :name (string (cast (slot result 'pw-name) c-call:c-string)) - :password (string (cast (slot result 'pw-passwd) c-call:c-string)) - :uid (slot result 'pw-uid) - :gid (slot result 'pw-gid) - :age (string (cast (slot result 'pw-age) c-call:c-string)) - :comment (string (cast (slot result 'pw-comment) c-call:c-string)) - :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string))))))) - -#+bsd -(defun unix-getpwuid (uid) - _N"Return a USER-INFO structure for the user identified by UID, or NIL if not found." - (declare (type unix-uid uid)) - (let ((result - (alien-funcall - (extern-alien "getpwuid" - (function (* (struct passwd)) - c-call:unsigned-int)) - uid))) - (when (not (zerop (sap-int (alien-sap result)))) - (make-user-info - :name (string (cast (slot result 'pw-name) c-call:c-string)) - :password (string (cast (slot result 'pw-passwd) c-call:c-string)) - :uid (slot result 'pw-uid) - :gid (slot result 'pw-gid) - :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string)))))) - -#+solaris -(eval-when (:compile-toplevel :load-toplevel :execute) - ;; sysconf(_SC_GETGR_R_SIZE_MAX) - (defconstant +sc-getgr-r-size-max+ 7296 - _N"The maximum size of the group entry buffer")) - -#+solaris -(defun unix-getgrnam (name) - _N"Return a GROUP-INFO structure for the group identified by NAME, or NIL if not found." - (declare (type simple-string name)) - (with-alien ((buf (array c-call:char #.+sc-getgr-r-size-max+)) - (group-info (struct group))) - (let ((result - (alien-funcall - (extern-alien "getgrnam_r" - (function (* (struct group)) - c-call:c-string - (* (struct group)) - (* c-call:char) - c-call:unsigned-int)) - name - (addr group-info) - (cast buf (* c-call:char)) - #.+sc-getgr-r-size-max+))) - (unless (zerop (sap-int (alien-sap result))) - (make-group-info - :name (string (cast (slot result 'gr-name) c-call:c-string)) - :password (string (cast (slot result 'gr-passwd) c-call:c-string)) - :gid (slot result 'gr-gid) - :members (loop :with members = (slot result 'gr-mem) - :for i :from 0 - :for member = (deref members i) - :until (zerop (sap-int (alien-sap member))) - :collect (string (cast member c-call:c-string)))))))) - -#+bsd -(defun unix-getgrnam (name) - _N"Return a GROUP-INFO structure for the group identified by NAME, or NIL if not found." - (declare (type simple-string name)) - (let ((result - (alien-funcall - (extern-alien "getgrnam" - (function (* (struct group)) - c-call:c-string)) - name))) - (unless (zerop (sap-int (alien-sap result))) - (make-group-info - :name (string (cast (slot result 'gr-name) c-call:c-string)) - :password (string (cast (slot result 'gr-passwd) c-call:c-string)) - :gid (slot result 'gr-gid) - :members (loop :with members = (slot result 'gr-mem) - :for i :from 0 - :for member = (deref members i) - :until (zerop (sap-int (alien-sap member))) - :collect (string (cast member c-call:c-string))))))) - -#+solaris -(defun unix-getgrgid (gid) - _N"Return a GROUP-INFO structure for the group identified by GID, or NIL if not found." - (declare (type unix-gid gid)) - (with-alien ((buf (array c-call:char #.+sc-getgr-r-size-max+)) - (group-info (struct group))) - (let ((result - (alien-funcall - (extern-alien "getgrgid_r" - (function (* (struct group)) - c-call:unsigned-int - (* (struct group)) - (* c-call:char) - c-call:unsigned-int)) - gid - (addr group-info) - (cast buf (* c-call:char)) - #.+sc-getgr-r-size-max+))) - (unless (zerop (sap-int (alien-sap result))) - (make-group-info - :name (string (cast (slot result 'gr-name) c-call:c-string)) - :password (string (cast (slot result 'gr-passwd) c-call:c-string)) - :gid (slot result 'gr-gid) - :members (loop :with members = (slot result 'gr-mem) - :for i :from 0 - :for member = (deref members i) - :until (zerop (sap-int (alien-sap member))) - :collect (string (cast member c-call:c-string)))))))) - -#+bsd -(defun unix-getgrgid (gid) - _N"Return a GROUP-INFO structure for the group identified by GID, or NIL if not found." - (declare (type unix-gid gid)) - (let ((result - (alien-funcall - (extern-alien "getgrgid" - (function (* (struct group)) - c-call:unsigned-int)) - gid))) - (unless (zerop (sap-int (alien-sap result))) - (make-group-info - :name (string (cast (slot result 'gr-name) c-call:c-string)) - :password (string (cast (slot result 'gr-passwd) c-call:c-string)) - :gid (slot result 'gr-gid) - :members (loop :with members = (slot result 'gr-mem) - :for i :from 0 - :for member = (deref members i) - :until (zerop (sap-int (alien-sap member))) - :collect (string (cast member c-call:c-string))))))) - -#+solaris -(defun unix-setpwent () - (void-syscall ("setpwent"))) - -#+solaris -(defun unix-endpwent () - (void-syscall ("endpwent"))) - -#+solaris -(defun unix-getpwent () - (with-alien ((buf (array c-call:char 1024)) - (user-info (struct passwd))) - (let ((result - (alien-funcall - (extern-alien "getpwent_r" - (function (* (struct passwd)) - (* (struct passwd)) - (* c-call:char) - c-call:unsigned-int)) - (addr user-info) - (cast buf (* c-call:char)) - 1024))) - (when (not (zerop (sap-int (alien-sap result)))) - (make-user-info - :name (string (cast (slot result 'pw-name) c-call:c-string)) - :password (string (cast (slot result 'pw-passwd) c-call:c-string)) - :uid (slot result 'pw-uid) - :gid (slot result 'pw-gid) - :age (string (cast (slot result 'pw-age) c-call:c-string)) - :comment (string (cast (slot result 'pw-comment) c-call:c-string)) - :gecos (string (cast (slot result 'pw-gecos) c-call:c-string)) - :dir (string (cast (slot result 'pw-dir) c-call:c-string)) - :shell (string (cast (slot result 'pw-shell) c-call:c-string))))))) - -(def-alien-type nil - (struct utsname - (sysname (array char #+svr4 257 #+bsd 256)) - (nodename (array char #+svr4 257 #+bsd 256)) - (release (array char #+svr4 257 #+bsd 256)) - (version (array char #+svr4 257 #+bsd 256)) - (machine (array char #+svr4 257 #+bsd 256)))) - -(defun unix-uname () - (with-alien ((names (struct utsname))) - (syscall* (#-(or freebsd (and x86 solaris)) "uname" - #+(and x86 solaris) "nuname" ; See /usr/include/sys/utsname.h - #+freebsd "__xuname" #+freebsd int - (* (struct utsname))) - (values (cast (slot names 'sysname) c-string) - (cast (slot names 'nodename) c-string) - (cast (slot names 'release) c-string) - (cast (slot names 'version) c-string) - (cast (slot names 'machine) c-string)) - #+freebsd 256 - (addr names)))) - -#+(and solaris svr4) -(export '(unix-sysinfo - si-sysname si-hostname si-release si-version si-machine - si-architecture si-hw-serial si-hw-provider si-srpc-domain - si-platform si-isalist si-dhcp-cache)) - -#+(and solaris svr4) -(progn -;; From sys/systeminfo.h. We don't list the set values here. -(def-enum + 1 - si-sysname si-hostname si-release si-version si-machine - si-architecture si-hw-serial si-hw-provider si-srpc-domain) - -(def-enum + 513 - si-platform si-isalist si-dhcp-cache) - - -(defun unix-sysinfo (command) - ;; Hope a buffer of length 2048 is long enough. - (with-alien ((buf (array c-call:unsigned-char 2048))) - (let ((result - (alien-funcall - (extern-alien "sysinfo" - (function c-call:int - c-call:int - c-call:c-string - c-call:int)) - command - (cast buf (* c-call:char)) - 2048))) - (when (>= result 0) - (cast buf c-call:c-string))))) -) - -#+solaris -(export '(rlimit_cpu rlimit_fsize rlimit_data rlimit_stack rlimit_core rlimit_nofile - rlimit_vmem rlimit_as)) - -#+solaris -(progn -(defconstant rlimit_cpu 0 - _N"CPU time per process (in milliseconds)") -(defconstant rlimit_fsize 1 - _N"Maximum file size") -(defconstant rlimit_data 2 - _N"Data segment size") -(defconstant rlimit_stack 3 - _N"Stack size") -(defconstant rlimit_core 4 - _N"Core file size") -(defconstant rlimit_nofile 5 - _N"Number of open files") -(defconstant rlimit_vmem 6 - _N"Maximum mapped memory") -(defconstant rlimit_as rlimit_vmem) -) - -#+(and darwin x86) -(export '(rlimit_cpu rlimit_fsize rlimit_data rlimit_stack rlimit_core - rlimit_as rlimit_rss rlimit_memlock rlimit_nproc rlimit_nofile)) - -#+(and darwin x86) -(progn -(defconstant rlimit_cpu 0 - _N"CPU time per process") -(defconstant rlimit_fsize 1 - _N"File size") -(defconstant rlimit_data 2 - _N"Data segment size") -(defconstant rlimit_stack 3 - _N"Stack size") -(defconstant rlimit_core 4 - _N"Core file size") -(defconstant rlimit_as 5 - _N"Addess space (resident set size)") -(defconstant rlimit_rss rlimit_as) -(defconstant rlimit_memlock 6 - _N"Locked-in-memory address space") -(defconstant rlimit_nproc 7 - _N"Number of processes") -(defconstant rlimit_nofile 8 - _N"Number of open files") -) - - -#+(or solaris (and darwin x86)) -(export '(unix-getrlimit)) -#+(or solaris (and darwin x86)) -(defun unix-getrlimit (resource) - _N"Get the limits on the consumption of system resouce specified by - Resource. If successful, return three values: T, the current (soft) - limit, and the maximum (hard) limit." - - (with-alien ((rlimit (struct rlimit))) - (syscall ("getrlimit" c-call:int (* (struct rlimit))) - (values t - (slot rlimit 'rlim-cur) - (slot rlimit 'rlim-max)) - resource (addr rlimit)))) -;; EOF diff --git a/src/code/unix.lisp b/src/contrib/unix/unix.lisp similarity index 100% copy from src/code/unix.lisp copy to src/contrib/unix/unix.lisp commit f2fd2ab4ebbecf9ab08dcb30ca62100ada3f6400 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 15 10:43:46 2014 -0800 Don't stat each directory as it's being added to the path in %enumerate-directories. This makes this part of the function the same as the version from 18a. Don't see any real reason why stat was required anyway. diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index ee844e3..fe997a7 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -735,11 +735,10 @@ (etypecase piece (simple-string (let ((head (concatenate 'string head piece))) - (with-directory-node-noted (head) - (%enumerate-directories (concatenate 'string head "/") - (cdr tail) pathname - verify-existence follow-links - nodes function)))) + (%enumerate-directories (concatenate 'string head "/") + (cdr tail) pathname + verify-existence follow-links + nodes function))) ((member :wild-inferiors) (%enumerate-directories head (rest tail) pathname verify-existence follow-links ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0