[Wisp-cvs] wisp/src/builtin modular.wisp,1.63,1.64 sys.wisp,1.107,1.108

[<di...@us...>]

Update of /cvsroot/wisp/wisp/src/builtin
In directory usw-pr-cvs1:/tmp/cvs-serv3363/src/builtin

Modified Files:
	modular.wisp sys.wisp 
Log Message:
Dropped |sys:fcntl:dupfd|, |sys:fcntl:cloexec|, |sys:fcntl:flags|, |sys:fcntl:getlk|, |sys:fcntl:setlk|, and |sys:fcntl:setlkw|.

Index: modular.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/src/builtin/modular.wisp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- modular.wisp	4 Sep 2002 14:36:25 -0000	1.63
+++ modular.wisp	7 Sep 2002 21:51:14 -0000	1.64
@@ -55,17 +55,14 @@
           (map (lambda (x) `(cons ',x ,x))
             '(fdset-ref make-fdset sys:chdir sys:chmod sys:close
               sys:dup sys:dup2 sys:errno->name sys:execve sys:exit
-              sys:fcntl:cloexec sys:fcntl:dupfd sys:fcntl:flags
-              sys:fcntl:getlk sys:fcntl:setlk sys:fcntl:setlkw
               sys:for-dir-entries sys:fork sys:fstat sys:ftruncate
-              sys:getcwd sys:getegid sys:geteuid sys:getgid
-              sys:getpgid sys:getpgrp sys:getpid sys:getppid
-              sys:getuid sys:kill sys:link sys:listen sys:lseek
-              sys:lstat sys:mkdir sys:nanosleep sys:open sys:pipe
-              sys:read sys:rename sys:select sys:setpgid sys:setpgrp
-              sys:setsid sys:stat sys:symlink sys:sync sys:tcgetattr
-              sys:tcsetattr sys:truncate sys:unlink sys:waitpid
-              sys:write))))))
+              sys:getcwd sys:getegid sys:geteuid sys:getgid sys:getpgid
+              sys:getpgrp sys:getpid sys:getppid sys:getuid sys:kill
+              sys:link sys:listen sys:lseek sys:lstat sys:mkdir
+              sys:nanosleep sys:open sys:pipe sys:read sys:rename
+              sys:select sys:setpgid sys:setpgrp sys:setsid sys:stat
+              sys:symlink sys:sync sys:tcgetattr sys:tcsetattr
+              sys:truncate sys:unlink sys:waitpid sys:write))))))
 
   (define modules ; a box containing an alist
     (make-box builtin-module-data))

Index: sys.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/src/builtin/sys.wisp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- sys.wisp	4 Sep 2002 14:35:28 -0000	1.107
+++ sys.wisp	7 Sep 2002 21:51:14 -0000	1.108
@@ -257,52 +257,6 @@
       (set! (bitstring-ref set pos) new-val)
       (bitstring-ref set pos))))
 
-(define (sys:fcntl:dupfd fd)
-  (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                         (decui (system-constant
-                                                  'fcntl 'F_DUPFD)) '()))
-    (if (negative? res)
-      (signal-system-error res `(sys:fcntl:dupfd ,fd))
-      res)))
-
-(define (sys:fcntl:cloexec fd (:= new-val))
-  (if :=?
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_SETFD))
-                                           (decui (if new-val
-                                                    (system-constant
-                                                      'fcntl 'FD_CLOEXEC)
-                                                    0))))
-      (if (negative? res)
-        (signal-system-error res `(set! (sys:fcntl:cloexec-ref ,fd) ,new-val))
-        (begin)))
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_GETFD))
-                                           '()))
-      (if (negative? res)
-        (signal-system-error res `(sys:fcntl:cloexec-ref ,fd))
-        (not (zero? res))))))
-
-(define (sys:fcntl:flags fd (:= new-flags))
-  (if :=?
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_SETFL))
-                                           (decui new-flags)))
-      (if (negative? res)
-        (signal-system-error res `(set! (sys:fcntl:flags ,fd)
-                                    ,new-flags))
-        (begin)))
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_GETFL))
-                                           '()))
-      (if (negative? res)
-        (signal-system-error res `(sys:fcntl:flags ,fd))
-        res))))
-
 (define (pack-struct-flock type whence start length (pid 0))
   (if (symbol? type)
     (set! type (system-constant 'fcntl 'flock type)))
@@ -325,39 +279,5 @@
     (set! type (system-constant 'fcntl 'flock type))
     (set! whence (system-constant 'fcntl 'seek whence))
     (list type whence start length pid)))
-
-(define (sys:fcntl:getlk fd type whence start length)
-  (my buffer (pack-struct-flock type whence start length)
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_GETLK))
-                                           (asm buffer (l . 2))))
-      (if (negative? res)
-        (signal-system-error res `(sys:fcntl:getlk ,fd ,type ,whence
-                                                   ,start ,length))
-        (and (unpack-struct-flock buffer) -> flock
-             (not (eq? (car flock) 'F_UNLCK)) flock)))))
-
-(define (sys:fcntl:setlk fd type whence start length)
-  (my buffer (pack-struct-flock type whence start length)
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_SETLK))
-                                           (asm buffer (l . 2))))
-      (if (negative? res)
-        (signal-system-error res `(sys:fcntl:setlk ,fd ,type ,whence
-                                                   ,start ,length))
-        (begin)))))
-
-(define (sys:fcntl:setlkw fd type whence start length)
-  (my buffer (pack-struct-flock type whence start length)
-    (my res (encsi ((asm NN_sys_raw_fcntl) (decui fd)
-                                           (decui (system-constant
-                                                    'fcntl 'F_SETLKW))
-                                           (asm buffer (l . 2))))
-      (if (negative? res)
-        (signal-system-error res `(sys:fcntl:setlkw ,fd ,type ,whence
-                                                    ,start ,length))
-        (begin)))))
 
 ; vim: lispwords+=,local