[Scsh-checkins] CVS: scsh-0.6/scsh network.scm,1.22,1.23 scsh-package.scm,1.24,1.25 sighandlers.scm,1.17,1.18

[Martin Gasbichler <mainzelm@users.sourceforge.net>]

Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv28271

Modified Files:
        network.scm scsh-package.scm sighandlers.scm 
Log Message:
+ Replaced define-stubless-foreign by import-lambda-definition or 
  import-os-error-syscall
+ Removed loading of cig-aux and define-foreign


Index: network.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network.scm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** network.scm 2001/09/12 14:08:24     1.22
--- network.scm 2001/09/13 07:59:40     1.23
***************
*** 208,212 ****
                      (socket-address:address name)))))))
  
! (define-stubless-foreign %bind (sockfd family name) "scheme_bind")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 208,212 ----
                      (socket-address:address name)))))))
  
! (import-os-error-syscall %bind (sockfd family name) "scheme_bind")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 247,251 ****
        (errno-error val "scheme_connect"))))
  
! (define-stubless-foreign %connect (sockfd family name) "scheme_connect")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 247,251 ----
        (errno-error val "scheme_connect"))))
  
! (import-os-error-syscall %connect (sockfd family name) "scheme_connect")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 286,290 ****
                        (loop))))))))
  
! (define-stubless-foreign %accept (sockfd family) "scheme_accept")
  
  
--- 286,290 ----
                        (loop))))))))
  
! (import-os-error-syscall %accept (sockfd family) "scheme_accept")
  
  
***************
*** 301,305 ****
        (make-socket-address family addr))))
  
! (define-stubless-foreign %peer-name  (sockfd family) "scheme_peer_name")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 301,305 ----
        (make-socket-address family addr))))
  
! (import-os-error-syscall %peer-name  (sockfd family) "scheme_peer_name")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 314,318 ****
        (make-socket-address family addr))))
  
! (define-stubless-foreign %socket-name (sockfd family) "scheme_socket_name")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 314,318 ----
        (make-socket-address family addr))))
  
! (import-os-error-syscall %socket-name (sockfd family) "scheme_socket_name")
  
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 345,349 ****
         (%socket-pair type))))
  
! (define-stubless-foreign %socket-pair (type) "scheme_socket_pair")
  
  
--- 345,349 ----
         (%socket-pair type))))
  
! (import-os-error-syscall %socket-pair (type) "scheme_socket_pair")
  
  
***************
*** 464,468 ****
                        (loop))))))
  
! (define-stubless-foreign %recv-substring! (sockfd flags buf start end)
    "recv_substring")
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 464,468 ----
                        (loop))))))
  
! (import-os-error-syscall %recv-substring! (sockfd flags buf start end)
    "recv_substring")
  ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 537,541 ****
                (loop)))))
  
! (define-stubless-foreign 
    %send-substring (sockfd flags buf start end family name)
    "send_substring")
--- 537,541 ----
                (loop)))))
  
! (import-os-error-syscall 
    %send-substring (sockfd flags buf start end family name)
    "send_substring")
***************
*** 568,579 ****
         "socket-option: unknown option type ~s" option)))
  
! (define-stubless-foreign %getsockopt (sock level option) "scheme_getsockopt")
  
  ;;; returns (list on-off linger)
! (define-stubless-foreign %getsockopt-linger (sockfd level optname) 
    "scheme_getsockopt_linger") 
  
  ;;; returns (list secs usecs)
! (define-stubless-foreign %getsockopt-timeout (sockfd level optname) 
    "scheme_getsockopt_timeout")
  
--- 568,579 ----
         "socket-option: unknown option type ~s" option)))
  
! (import-os-error-syscall %getsockopt (sock level option) "scheme_getsockopt")
  
  ;;; returns (list on-off linger)
! (import-os-error-syscall %getsockopt-linger (sockfd level optname) 
    "scheme_getsockopt_linger") 
  
  ;;; returns (list secs usecs)
! (import-os-error-syscall %getsockopt-timeout (sockfd level optname) 
    "scheme_getsockopt_timeout")
  
***************
*** 604,614 ****
         "set-socket-option: unknown option type")))
  
! (define-stubless-foreign %setsockopt (sockfd level optname optval)
    "scheme_setsockopt")
  
! (define-stubless-foreign %setsockopt-linger
    (sockfd level optname on-off time) "scheme_setsockopt_linger")
  
! (define-stubless-foreign %setsockopt-timeout
    (sockfd level optname secs usecs) "scheme_setsockopt_timeout")
  
--- 604,614 ----
         "set-socket-option: unknown option type")))
  
! (import-os-error-syscall %setsockopt (sockfd level optname optval)
    "scheme_setsockopt")
  
! (import-os-error-syscall %setsockopt-linger
    (sockfd level optname on-off time) "scheme_setsockopt_linger")
  
! (import-os-error-syscall %setsockopt-timeout
    (sockfd level optname secs usecs) "scheme_setsockopt_timeout")
  
***************
*** 654,661 ****
                  (socket-address:address name))))
        (if (number? res)
!           (error "address->host-info: non-zero herrno ~s ~s" res name)
            res))))
  
! (define-stubless-foreign %host-address->host-info/h-errno (name)
    "scheme_host_address2host_info")
  
--- 654,661 ----
                  (socket-address:address name))))
        (if (number? res)
!           (error "address->host-info: non-zero herrno" res name)
            res))))
  
! (import-lambda-definition %host-address->host-info/h-errno (name)
    "scheme_host_address2host_info")
  
***************
*** 665,672 ****
        (let ((res (%host-name->host-info/h-errno name)))
         (if (number? res)
!            (error "name->host-info: non-zero herrno ~s ~s" res name)
             res))))
  
! (define-stubless-foreign %host-name->host-info/h-errno (name) 
    "scheme_host_name2host_info")
  
--- 665,672 ----
        (let ((res (%host-name->host-info/h-errno name)))
         (if (number? res)
!            (error "name->host-info: non-zero herrno" res name)
             res))))
  
! (import-lambda-definition %host-name->host-info/h-errno (name) 
    "scheme_host_name2host_info")
  
***************
*** 692,696 ****
        (%net-address->network-info addr)))
  
! (define-stubless-foreign %net-address->network-info (addr) 
    "scheme_net_address2net_info")
   
--- 692,696 ----
        (%net-address->network-info addr)))
  
! (import-lambda-definition %net-address->network-info (addr) 
    "scheme_net_address2net_info")
   
***************
*** 700,704 ****
        (%net-name->network-info name)))
  
! (define-stubless-foreign %net-name->network-info (name)
    "scheme_net_name2net_info")
                  
--- 700,704 ----
        (%net-name->network-info name)))
  
! (import-lambda-definition %net-name->network-info (name)
    "scheme_net_name2net_info")
                  
***************
*** 731,735 ****
                                                 proto))))))
             
! (define-stubless-foreign %service-port->service-info (port proto)
    "scheme_serv_port2serv_info")
    
--- 731,735 ----
                                                 proto))))))
             
! (import-lambda-definition %service-port->service-info (port proto)
    "scheme_serv_port2serv_info")
    
***************
*** 745,749 ****
                                                 proto))))))
  
! (define-stubless-foreign  %service-name->service-info (name proto)
    "scheme_serv_name2serv_info")
  
--- 745,749 ----
                                                 proto))))))
  
! (import-lambda-definition %service-name->service-info (name proto)
    "scheme_serv_name2serv_info")
  
***************
*** 768,772 ****
        (%protocol-port->protocol-info name)))
  
! (define-stubless-foreign %protocol-port->protocol-info (name)
    "scheme_proto_num2proto_info")
    
--- 768,772 ----
        (%protocol-port->protocol-info name)))
  
! (import-lambda-definition %protocol-port->protocol-info (name)
    "scheme_proto_num2proto_info")
    
***************
*** 776,780 ****
        (%protocol-name->protocol-info name)))
  
! (define-stubless-foreign %protocol-name->protocol-info (name)
    "scheme_proto_name2proto_info")
  
--- 776,780 ----
        (%protocol-name->protocol-info name)))
  
! (import-lambda-definition %protocol-name->protocol-info (name)
    "scheme_proto_name2proto_info")
  

Index: scsh-package.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/scsh-package.scm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** scsh-package.scm    2001/09/12 14:02:09     1.24
--- scsh-package.scm    2001/09/13 07:59:40     1.25
***************
*** 145,153 ****
        external-calls           ;JMG new FFI
        structure-refs
-       cig-aux
        receiving
        defrec-package
        define-record-types
-       define-foreign-syntax
        formats
        os-dependent            ; OS dependent stuff
--- 145,151 ----

Index: sighandlers.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/sighandlers.scm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** sighandlers.scm     2001/09/07 15:14:50     1.17
--- sighandlers.scm     2001/09/13 07:59:40     1.18
***************
*** 33,37 ****
  ;;; Map a Unix async signal to its S48 interrupt value.
  ;;; -1 => Not defined.
! (define-stubless-foreign %signal->interrupt (sig) "sig2interrupt")
  
  (define (signal->interrupt sig)
--- 33,37 ----
  ;;; Map a Unix async signal to its S48 interrupt value.
  ;;; -1 => Not defined.
! (import-lambda-definition %signal->interrupt (sig) "sig2interrupt")
  
  (define (signal->interrupt sig)
***************
*** 124,128 ****
  ;;; makes the core dump happen if it should. Details, details.
  
! (define-stubless-foreign %do-default-sigaction (signal) 
"do_default_sigaction")
  
  (define default-int-handler-vec
--- 124,128 ----
  ;;; makes the core dump happen if it should. Details, details.
  
! (import-lambda-definition %do-default-sigaction (signal) 
"do_default_sigaction")
  
  (define default-int-handler-vec