Update of /cvsroot/scsh/scsh-0.6/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv16641/scsh
Modified Files:
network.scm network1.c network1.h
Removed Files:
network.c
Log Message:
Removed remaining define-foreign. Network code is cig-less now.
Index: network.scm
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network.scm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** network.scm 2001/07/10 11:26:54 1.19
--- network.scm 2001/08/08 11:54:04 1.20
***************
*** 198,210 ****
(make-socket pf in out)))
! (define-foreign %socket/errno
! (socket (fixnum pf)
! (fixnum type)
! (fixnum protocol))
! (multi-rep (to-scheme fixnum errno_or_false)
! fixnum))
! (define-errno-syscall (%socket pf type protocol) %socket/errno
! sockfd)
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 198,204 ----
(make-socket pf in out)))
! (define-stubless-foreign %socket/eintr (pf type protocol) "scsh_socket")
! (define-retrying-syscall %socket %socket/eintr)
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
***************
*** 285,296 ****
(%listen (socket->fdes sock) backlog))))
! (define-foreign %listen/errno
! (listen (fixnum sockfd) ; socket fdes
! (fixnum backlog)) ; backlog
! no-declare ; for Linux
! (to-scheme fixnum errno_or_false))
- (define-errno-syscall (%listen sockfd backlog) %listen/errno)
-
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
;;; accept syscall
--- 279,285 ----
(%listen (socket->fdes sock) backlog))))
! (define-stubless-foreign %listen/eintr (sockfd backlog) "scsh_listen")
! (define-retrying-syscall %listen %listen/eintr)
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
;;; accept syscall
***************
*** 357,368 ****
(else
(%shutdown (socket->fdes sock) how))))
-
- (define-foreign %shutdown/errno
- (shutdown (fixnum sockfd)
- (fixnum how))
- (to-scheme fixnum errno_or_false))
! (define-errno-syscall
! (%shutdown sock how) %shutdown/errno)
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- 346,352 ----
(else
(%shutdown (socket->fdes sock) how))))
! (define-stubless-foreign %shutdown/eintr (sockfd how) "scsh_shutdown")
! (define-retrying-syscall %shutdown %shutdown/eintr)
;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Index: network1.c
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network1.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** network1.c 2001/07/07 19:32:51 1.21
--- network1.c 2001/08/08 11:54:04 1.22
***************
*** 22,25 ****
--- 22,36 ----
#include "scheme48.h"
+ s48_value scsh_socket (s48_value sch_pf, s48_value sch_type,
+ s48_value sch_protocol)
+ {
+ int retval = socket (s48_extract_integer (sch_pf),
+ s48_extract_integer (sch_type),
+ s48_extract_integer (sch_protocol));
+ if (retval == -1)
+ s48_raise_os_error_3 (errno, sch_pf, sch_type, sch_protocol);
+ return s48_enter_fixnum (retval);
+ }
+
/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
s48_value scheme_bind(s48_value sock, s48_value family, s48_value scheme_name)
***************
*** 134,137 ****
--- 145,157 ----
}
}
+ /*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+ s48_value scsh_listen (s48_value sch_sockfd, s48_value sch_backlog)
+ {
+ int retval = listen (s48_extract_fixnum (sch_sockfd),
+ s48_extract_integer (sch_backlog));
+ if (retval == -1)
+ s48_raise_os_error_2(errno, sch_sockfd, sch_backlog);
+ return S48_UNSPECIFIC;
+ }
/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
***************
*** 227,230 ****
--- 247,259 ----
}
}
+ /*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
+ s48_value scsh_shutdown (s48_value sch_sockfd, s48_value sch_how)
+ {
+ int retval = shutdown (s48_extract_fixnum (sch_sockfd),
+ s48_extract_integer (sch_how));
+ if (retval == -1)
+ s48_raise_os_error_2 (errno, sch_sockfd, sch_how);
+ return S48_UNSPECIFIC;
+ }
/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
***************
*** 763,767 ****
return protoent2protocol_info (proto);
}
-
!
--- 792,822 ----
return protoent2protocol_info (proto);
}
! void s48_init_network(void)
! {
! S48_EXPORT_FUNCTION(scsh_socket);
! S48_EXPORT_FUNCTION(scheme_bind);
! S48_EXPORT_FUNCTION(scheme_connect);
! S48_EXPORT_FUNCTION(scsh_listen);
! S48_EXPORT_FUNCTION(scheme_accept);
! S48_EXPORT_FUNCTION(scheme_peer_name);
! S48_EXPORT_FUNCTION(scheme_socket_name);
! S48_EXPORT_FUNCTION(scsh_shutdown);
! S48_EXPORT_FUNCTION(scheme_socket_pair);
! S48_EXPORT_FUNCTION(recv_substring);
! S48_EXPORT_FUNCTION(send_substring);
! S48_EXPORT_FUNCTION(scheme_getsockopt);
! S48_EXPORT_FUNCTION(scheme_getsockopt_linger);
! S48_EXPORT_FUNCTION(scheme_getsockopt_timeout);
! S48_EXPORT_FUNCTION(scheme_setsockopt);
! S48_EXPORT_FUNCTION(scheme_setsockopt_linger);
! S48_EXPORT_FUNCTION(scheme_setsockopt_timeout);
! S48_EXPORT_FUNCTION(scheme_host_address2host_info);
! S48_EXPORT_FUNCTION(scheme_host_name2host_info);
! S48_EXPORT_FUNCTION(scheme_net_address2net_info);
! S48_EXPORT_FUNCTION(scheme_net_name2net_info);
! S48_EXPORT_FUNCTION(scheme_serv_port2serv_info);
! S48_EXPORT_FUNCTION(scheme_serv_name2serv_info);
! S48_EXPORT_FUNCTION(scheme_proto_num2proto_info);
! S48_EXPORT_FUNCTION(scheme_proto_name2proto_info);
! }
Index: network1.h
===================================================================
RCS file: /cvsroot/scsh/scsh-0.6/scsh/network1.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** network1.h 2001/01/01 17:34:08 1.10
--- network1.h 2001/08/08 11:54:04 1.11
***************
*** 1,4 ****
--- 1,7 ----
/* Exports from network1.c. */
+ s48_value scsh_socket (s48_value sch_pf, s48_value sch_type,
+ s48_value sch_protocol);
+
s48_value scheme_bind(s48_value sockfd, s48_value family, s48_value
scheme_name);
***************
*** 6,13 ****
--- 9,20 ----
s48_value scheme_name);
+ s48_value scsh_listen (s48_value sch_sockfd, s48_value sch_backlog);
+
s48_value scheme_accept(s48_value sockfd, s48_value family);
s48_value scheme_peer_name(s48_value sockfd, s48_value family);
+ s48_value scsh_shutdown (s48_value sch_sockfd, s48_value sch_how);
+
s48_value scheme_socket_name(s48_value sockfd, s48_value family);
***************
*** 58,63 ****
s48_value scheme_net_name2net_info(s48_value scheme_name);
- /* in_port should be declared u_short, but cig doesn't know about them. */
-
s48_value scheme_serv_port2serv_info(s48_value in_port,
s48_value in_proto);
--- 65,68 ----
***************
*** 69,74 ****
s48_value scheme_proto_name2proto_info(s48_value name);
-
- void set_longvec_carriers(s48_value svec, long const * const * cvec);
! s48_value veclen(const long *vec);
--- 74,77 ----
s48_value scheme_proto_name2proto_info(s48_value name);
! void s48_init_network(void);
--- network.c DELETED ---
|