mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 09:10:22 +02:00
Code Activity

* filesys.c (scm_input_waiting_p): use select in preference to

Browse source 
FIONREAD, since the latter doesn't detect EOF.
Throw error if neither select nor FIONREAD available.

* socket.c (scm_connect): take a port, not a fd object.
(scm_fill_sockaddr): throw an error if fam is not recognised.
(scm_bind): use scm_fill_sockaddr.
(scm_listen): take a port, not a fd object.
(scm_accept): take and return a port.  return CDR in the car if
address can't be got
(scm_sock_fd_to_port): new procedure.
(scm_socket): use scm_sock_fd_to_port.
(scm_addr_vector): throw error if unrecognised address type.
take an extra argument with the calling procedure name.
(scm_getsockname): take a port.  return #f if address can't be got.
(scm_getpeername): take a port.  return #f if address can't be got.
(scm_recvfrom): take a port.  return #f for address component if can't
be got.
(scm_sendto, scm_socketpair, scm_getsockopt scm_shutdown,
scm_setsockopt, scm_recv, scm_send): take a port not a fd object.
* socket.h (SCM_P): update bind prototype.
* socket.c (scm_init_socket): intern PF_UNSPEC, PF_UNIX, PF_INET.
include "feature.h".
(scm_socket): return a port, not a file descriptor object.
include "fports.h" and <unistd.h>
(scm_bind): take a port, not a file descriptor object.
take an extra argument for address args.

* net_db.c (scm_init_net_db): intern INADDR_ANY, INADDR_BROADCAST,
INADDR_NONE, INADDR_LOOPBACK.
* init.c: include net_db.h and not fdsocket.h.
(scm_boot_guile_1): call scm_init_net_db and not scm_init_fdsocket.

* Makefile.am: corresponding changes.
* socket.h: renamed from fdsocket.h, fix names.
* net_db.h: renamed from socket.h, fix names.
* socket.c: renamed from fdsocket.c.
remove _sys from procedure names.
(scm_init_socket): rename from scm_init_fdsocket.  include socket.x.
add "socket" to features list.
* net_db.c: renamed from socket.c.
remove _sys from procedure names.
(scm_init_net_db): rename from scm_init_socket.  include net_db.x.
add "net-db" to features list.
include "net_db.h".  don't include <sys/socket.h> or
<sys/un.h>.
This commit is contained in:
Gary Houston 1996-12-21 04:13:54 +00:00
parent 80df313695
commit 370312ae6e
10 changed files with 1352 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

55
libguile/ChangeLog
View file

@ -1,3 +1,58 @@
Sat Dec 21 00:33:03 1996 Gary Houston <ghouston@actrix.gen.nz>
* filesys.c (scm_input_waiting_p): use select in preference to
FIONREAD, since the latter doesn't detect EOF.
Throw error if neither select nor FIONREAD available.
* socket.c (scm_connect): take a port, not a fd object.
(scm_fill_sockaddr): throw an error if fam is not recognised.
(scm_bind): use scm_fill_sockaddr.
(scm_listen): take a port, not a fd object.
(scm_accept): take and return a port. return CDR in the car if
address can't be got
(scm_sock_fd_to_port): new procedure.
(scm_socket): use scm_sock_fd_to_port.
(scm_addr_vector): throw error if unrecognised address type.
take an extra argument with the calling procedure name.
(scm_getsockname): take a port. return #f if address can't be got.
(scm_getpeername): take a port. return #f if address can't be got.
(scm_recvfrom): take a port. return #f for address component if can't
be got.
(scm_sendto, scm_socketpair, scm_getsockopt scm_shutdown,
scm_setsockopt, scm_recv, scm_send): take a port not a fd object.
Thu Dec 19 00:00:26 1996 Gary Houston <ghouston@actrix.gen.nz>
* socket.h (SCM_P): update bind prototype.
* socket.c (scm_init_socket): intern PF_UNSPEC, PF_UNIX, PF_INET.
include "feature.h".
(scm_socket): return a port, not a file descriptor object.
include "fports.h" and <unistd.h>
(scm_bind): take a port, not a file descriptor object.
take an extra argument for address args.
* net_db.c (scm_init_net_db): intern INADDR_ANY, INADDR_BROADCAST,
INADDR_NONE, INADDR_LOOPBACK.
Tue Dec 17 22:58:26 1996 Gary Houston <ghouston@actrix.gen.nz>
* init.c: include net_db.h and not fdsocket.h.
(scm_boot_guile_1): call scm_init_net_db and not scm_init_fdsocket.
* Makefile.am: corresponding changes.
* socket.h: renamed from fdsocket.h, fix names.
* net_db.h: renamed from socket.h, fix names.
* socket.c: renamed from fdsocket.c.
remove _sys from procedure names.
(scm_init_socket): rename from scm_init_fdsocket. include socket.x.
add "socket" to features list.
* net_db.c: renamed from socket.c.
remove _sys from procedure names.
(scm_init_net_db): rename from scm_init_socket. include net_db.x.
add "net-db" to features list.
include "net_db.h". don't include <sys/socket.h> or
<sys/un.h>.
Thu Dec 19 14:03:24 1996 Mikael Djurfeldt <mdj@mdj.nada.kth.se> Thu Dec 19 14:03:24 1996 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
* tags.h (scm_tags): Removed comma at end of last enumerator. * tags.h (scm_tags): Removed comma at end of last enumerator.

10
libguile/Makefile.am
View file

@ -10,9 +10,10 @@ INCLUDES = -I.. -I$(srcdir)/..
lib_LIBRARIES = libguile.a lib_LIBRARIES = libguile.a
libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \ libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \ backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \
error.c eval.c extchrs.c fdsocket.c feature.c filesys.c fports.c gc.c \ error.c eval.c extchrs.c feature.c filesys.c fports.c gc.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \ gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
kw.c list.c load.c mallocs.c markers.c mbstrings.c numbers.c objprop.c \ kw.c list.c load.c mallocs.c markers.c mbstrings.c net_db.c \
numbers.c objprop.c \
options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \ options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \ read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \ stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
@ -25,9 +26,10 @@ include_HEADERS = libguile.h
modincludedir = $(includedir)/@module@ modincludedir = $(includedir)/@module@
modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \ modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \
backtrace.h boolean.h chars.h continuations.h debug.h dynl.h dynwind.h eq.h \ backtrace.h boolean.h chars.h continuations.h debug.h dynl.h dynwind.h eq.h \
error.h eval.h extchrs.h fdsocket.h feature.h filesys.h fports.h gc.h \ error.h eval.h extchrs.h feature.h filesys.h fports.h gc.h \
gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \ gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \
kw.h list.h load.h mallocs.h markers.h mbstrings.h numbers.h objprop.h \ kw.h list.h load.h mallocs.h markers.h mbstrings.h net_db.h \
numbers.h objprop.h \
options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \ options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \
root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \ root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \
stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \ stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \

76
libguile/Makefile.in
View file

@ -37,13 +37,13 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@ transform = @program_transform_name@
VERSION = @VERSION@ FD_SETTER = @FD_SETTER@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
module = @module@ module = @module@
CC = @CC@ CC = @CC@
PACKAGE = @PACKAGE@
FD_SETTER = @FD_SETTER@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
@ -52,9 +52,10 @@ INCLUDES = -I.. -I$(srcdir)/..
lib_LIBRARIES = libguile.a lib_LIBRARIES = libguile.a
libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \ libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \ backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \
error.c eval.c extchrs.c fdsocket.c feature.c filesys.c fports.c gc.c \ error.c eval.c extchrs.c feature.c filesys.c fports.c gc.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \ gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
kw.c list.c load.c mallocs.c markers.c mbstrings.c numbers.c objprop.c \ kw.c list.c load.c mallocs.c markers.c mbstrings.c net_db.c \
numbers.c objprop.c \
options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \ options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \ read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \ stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
@ -67,9 +68,10 @@ include_HEADERS = libguile.h
modincludedir = $(includedir)/@module@ modincludedir = $(includedir)/@module@
modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \ modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \
backtrace.h boolean.h chars.h continuations.h debug.h dynl.h dynwind.h eq.h \ backtrace.h boolean.h chars.h continuations.h debug.h dynl.h dynwind.h eq.h \
error.h eval.h extchrs.h fdsocket.h feature.h filesys.h fports.h gc.h \ error.h eval.h extchrs.h feature.h filesys.h fports.h gc.h \
gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \ gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \
kw.h list.h load.h mallocs.h markers.h mbstrings.h numbers.h objprop.h \ kw.h list.h load.h mallocs.h markers.h mbstrings.h net_db.h \
numbers.h objprop.h \
options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \ options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \
root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \ root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \
stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \ stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \
@ -101,9 +103,9 @@ LIBS = @LIBS@
libguile_a_LIBADD = libguile_a_LIBADD =
libguile_a_OBJECTS = alist.o append.o appinit.o arbiters.o async.o \ libguile_a_OBJECTS = alist.o append.o appinit.o arbiters.o async.o \
backtrace.o boolean.o chars.o continuations.o debug.o dynl.o dynwind.o \ backtrace.o boolean.o chars.o continuations.o debug.o dynl.o dynwind.o \
eq.o error.o eval.o extchrs.o fdsocket.o feature.o filesys.o fports.o \ eq.o error.o eval.o extchrs.o feature.o filesys.o fports.o gc.o \
gc.o gdbint.o genio.o gsubr.o hash.o hashtab.o inet_aton.o init.o \ gdbint.o genio.o gsubr.o hash.o hashtab.o inet_aton.o init.o ioext.o \
ioext.o kw.o list.o load.o mallocs.o markers.o mbstrings.o numbers.o \ kw.o list.o load.o mallocs.o markers.o mbstrings.o net_db.o numbers.o \
objprop.o options.o pairs.o ports.o posix.o print.o procprop.o procs.o \ objprop.o options.o pairs.o ports.o posix.o print.o procprop.o procs.o \
ramap.o read.o root.o scmsigs.o sequences.o simpos.o smob.o socket.o \ ramap.o read.o root.o scmsigs.o sequences.o simpos.o smob.o socket.o \
srcprop.o stackchk.o stacks.o stime.o strerror.o strings.o strop.o \ srcprop.o stackchk.o stacks.o stime.o strerror.o strings.o strop.o \
@ -117,7 +119,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LINK = $(CC) $(LDFLAGS) -o $@ LINK = $(CC) $(LDFLAGS) -o $@
DATA = $(modinclude_DATA) DATA = $(modinclude_DATA)
HEADERS = $(modinclude_HEADERS) $(include_HEADERS) HEADERS = $(include_HEADERS) $(modinclude_HEADERS)
DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in acconfig.h \ DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in acconfig.h \
acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \ acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \
@ -132,11 +134,11 @@ DEP_FILES = .deps/alist.P .deps/append.P .deps/appinit.P \
.deps/arbiters.P .deps/async.P .deps/backtrace.P .deps/boolean.P \ .deps/arbiters.P .deps/async.P .deps/backtrace.P .deps/boolean.P \
.deps/chars.P .deps/continuations.P .deps/debug.P .deps/dynl.P \ .deps/chars.P .deps/continuations.P .deps/debug.P .deps/dynl.P \
.deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/extchrs.P \ .deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/extchrs.P \
.deps/fdsocket.P .deps/feature.P .deps/filesys.P .deps/fports.P \ .deps/feature.P .deps/filesys.P .deps/fports.P .deps/gc.P \
.deps/gc.P .deps/gdbint.P .deps/genio.P .deps/gsubr.P .deps/hash.P \ .deps/gdbint.P .deps/genio.P .deps/gsubr.P .deps/hash.P .deps/hashtab.P \
.deps/hashtab.P .deps/inet_aton.P .deps/init.P .deps/ioext.P .deps/kw.P \ .deps/inet_aton.P .deps/init.P .deps/ioext.P .deps/kw.P .deps/list.P \
.deps/list.P .deps/load.P .deps/mallocs.P .deps/markers.P \ .deps/load.P .deps/mallocs.P .deps/markers.P .deps/mbstrings.P \
.deps/mbstrings.P .deps/numbers.P .deps/objprop.P .deps/options.P \ .deps/net_db.P .deps/numbers.P .deps/objprop.P .deps/options.P \
.deps/pairs.P .deps/ports.P .deps/posix.P .deps/print.P \ .deps/pairs.P .deps/ports.P .deps/posix.P .deps/print.P \
.deps/procprop.P .deps/procs.P .deps/ramap.P .deps/read.P .deps/root.P \ .deps/procprop.P .deps/procs.P .deps/ramap.P .deps/read.P .deps/root.P \
.deps/scmsigs.P .deps/sequences.P .deps/simpos.P .deps/smob.P \ .deps/scmsigs.P .deps/sequences.P .deps/simpos.P .deps/smob.P \
@ -277,19 +279,6 @@ uninstall-modincludeDATA:
rm -f $(modincludedir)/$$p; \ rm -f $(modincludedir)/$$p; \
done done
install-modincludeHEADERS: $(modinclude_HEADERS)
$(NORMAL_INSTALL)
$(mkinstalldirs) $(modincludedir)
@list="$(modinclude_HEADERS)"; for p in $$list; do \
echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \
$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \
done
uninstall-modincludeHEADERS:
list="$(modinclude_HEADERS)"; for p in $$list; do \
rm -f $(modincludedir)/$$p; \
done
install-includeHEADERS: $(include_HEADERS) install-includeHEADERS: $(include_HEADERS)
$(NORMAL_INSTALL) $(NORMAL_INSTALL)
$(mkinstalldirs) $(includedir) $(mkinstalldirs) $(includedir)
@ -303,6 +292,19 @@ uninstall-includeHEADERS:
rm -f $(includedir)/$$p; \ rm -f $(includedir)/$$p; \
done done
install-modincludeHEADERS: $(modinclude_HEADERS)
$(NORMAL_INSTALL)
$(mkinstalldirs) $(modincludedir)
@list="$(modinclude_HEADERS)"; for p in $$list; do \
echo "$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p"; \
$(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \
done
uninstall-modincludeHEADERS:
list="$(modinclude_HEADERS)"; for p in $$list; do \
rm -f $(modincludedir)/$$p; \
done
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) ID: $(HEADERS) $(SOURCES)
@ -399,21 +401,21 @@ installcheck:
install-exec: install-libLIBRARIES install-binSCRIPTS install-exec: install-libLIBRARIES install-binSCRIPTS
$(NORMAL_INSTALL) $(NORMAL_INSTALL)
install-data: install-modincludeDATA install-modincludeHEADERS install-includeHEADERS install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS
$(NORMAL_INSTALL) $(NORMAL_INSTALL)
install: install-exec install-data all install: install-exec install-data all
@: @:
uninstall: uninstall-libLIBRARIES uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-modincludeHEADERS uninstall-includeHEADERS uninstall: uninstall-libLIBRARIES uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS
all: $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h all: $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h
install-strip: install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
installdirs: installdirs:
$(mkinstalldirs) $(libdir) $(bindir) $(modincludedir) $(modincludedir) \ $(mkinstalldirs) $(libdir) $(bindir) $(modincludedir) $(includedir) \
$(includedir) $(modincludedir)
mostlyclean-generic: mostlyclean-generic:
@ -455,10 +457,10 @@ clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
install-libLIBRARIES mostlyclean-compile distclean-compile \ install-libLIBRARIES mostlyclean-compile distclean-compile \
clean-compile maintainer-clean-compile uninstall-binSCRIPTS \ clean-compile maintainer-clean-compile uninstall-binSCRIPTS \
install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \ install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \
uninstall-modincludeHEADERS install-modincludeHEADERS \ uninstall-includeHEADERS install-includeHEADERS \
uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \ uninstall-modincludeHEADERS install-modincludeHEADERS tags \
distclean-tags clean-tags maintainer-clean-tags distdir \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
mostlyclean-depend distclean-depend clean-depend \ distdir mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info dvi installcheck install-exec install-data \ maintainer-clean-depend info dvi installcheck install-exec install-data \
install uninstall all installdirs mostlyclean-generic distclean-generic \ install uninstall all installdirs mostlyclean-generic distclean-generic \
clean-generic maintainer-clean-generic clean mostlyclean distclean \ clean-generic maintainer-clean-generic clean mostlyclean distclean \

1
libguile/configure vendored
View file

@ -3043,7 +3043,6 @@ fi; done
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADER" || echo timestamp > stamp-h test -z "$CONFIG_HEADER" || echo timestamp > stamp-h

18
libguile/filesys.c
View file

@ -1125,14 +1125,7 @@ scm_input_waiting_p (f, caller)
# endif # endif
/* Is the file prepared to deliver input? */ /* Is the file prepared to deliver input? */
# ifdef FIONREAD # ifdef HAVE_SELECT
{
long remir;
ioctl(fileno(f), FIONREAD, &remir);
return remir;
}
# else
# ifdef HAVE_SELECT
{ {
struct timeval timeout; struct timeval timeout;
SELECT_TYPE read_set; SELECT_TYPE read_set;
@ -1157,8 +1150,15 @@ scm_input_waiting_p (f, caller)
SCM_ALLOW_INTS; SCM_ALLOW_INTS;
return FD_ISSET (fno, &read_set); return FD_ISSET (fno, &read_set);
} }
# else
# ifdef FIONREAD
{
long remir;
ioctl(fileno(f), FIONREAD, &remir);
return remir;
}
# else # else
return -1; scm_misc_error ("char-ready?", "Not fully implemented\n");
# endif # endif
# endif # endif
} }

4
libguile/init.c
View file

@ -60,7 +60,6 @@
#include "eq.h" #include "eq.h"
#include "error.h" #include "error.h"
#include "eval.h" #include "eval.h"
#include "fdsocket.h"
#include "feature.h" #include "feature.h"
#include "filesys.h" #include "filesys.h"
#include "fports.h" #include "fports.h"
@ -75,6 +74,7 @@
#include "load.h" #include "load.h"
#include "mallocs.h" #include "mallocs.h"
#include "mbstrings.h" #include "mbstrings.h"
#include "net_db.h"
#include "numbers.h" #include "numbers.h"
#include "objprop.h" #include "objprop.h"
#include "options.h" #include "options.h"
@ -362,7 +362,6 @@ scm_boot_guile_1 (base, argc, argv, main_func, closure)
scm_init_dynwind (); scm_init_dynwind ();
scm_init_eq (); scm_init_eq ();
scm_init_error (); scm_init_error ();
scm_init_fdsocket ();
scm_init_fports (); scm_init_fports ();
scm_init_filesys (); scm_init_filesys ();
scm_init_gc (); scm_init_gc ();
@ -373,6 +372,7 @@ scm_boot_guile_1 (base, argc, argv, main_func, closure)
scm_init_kw (); scm_init_kw ();
scm_init_list (); scm_init_list ();
scm_init_mallocs (); scm_init_mallocs ();
scm_init_net_db ();
scm_init_numbers (); scm_init_numbers ();
scm_init_objprop (); scm_init_objprop ();
#if DEBUG_EXTENSIONS #if DEBUG_EXTENSIONS

410
libguile/net_db.c Normal file
View file

@ -0,0 +1,410 @@
/* "net_db.c" network database support
* Copyright (C) 1995,1996 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
*
* The exception is that, if you link the GUILE library with other files
* to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the GUILE library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the
* Free Software Foundation under the name GUILE. If you copy
* code from other Free Software Foundation releases into a copy of
* GUILE, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*/
/* Written in 1994 by Aubrey Jaffer.
* Thanks to Hallvard.Tretteberg@si.sintef.no for inspiration and discussion.
* Rewritten by Gary Houston to be a closer interface to the C socket library.
* Split into net_db.c and socket.c.
*/
#include <stdio.h>
#include "_scm.h"
#include "feature.h"
#include "net_db.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include <sys/types.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#ifndef STDC_HEADERS
int close ();
#endif /* STDC_HEADERS */
extern int inet_aton ();
SCM_PROC (s_inet_aton, "inet-aton", 1, 0, 0, scm_inet_aton);
SCM
scm_inet_aton (address)
SCM address;
{
struct in_addr soka;
SCM_ASSERT (SCM_NIMP (address) && SCM_ROSTRINGP (address), address, SCM_ARG1, s_inet_aton);
if (SCM_SUBSTRP (address))
address = scm_makfromstr (SCM_ROCHARS (address), SCM_ROLENGTH (address), 0);
if (inet_aton (SCM_ROCHARS (address), &soka) == 0)
scm_syserror (s_inet_aton);
return scm_ulong2num (ntohl (soka.s_addr));
}
SCM_PROC (s_inet_ntoa, "inet-ntoa", 1, 0, 0, scm_inet_ntoa);
SCM
scm_inet_ntoa (inetid)
SCM inetid;
{
struct in_addr addr;
char *s;
SCM answer;
addr.s_addr = htonl (scm_num2ulong (inetid, (char *) SCM_ARG1, s_inet_ntoa));
SCM_DEFER_INTS;
s = inet_ntoa (addr);
answer = scm_makfromstr (s, strlen (s), 0);
SCM_ALLOW_INTS;
return answer;
}
SCM_PROC (s_inet_netof, "inet-netof", 1, 0, 0, scm_inet_netof);
SCM
scm_inet_netof (address)
SCM address;
{
struct in_addr addr;
addr.s_addr = htonl (scm_num2ulong (address, (char *) SCM_ARG1, s_inet_netof));
return scm_ulong2num ((unsigned long) inet_netof (addr));
}
SCM_PROC (s_lnaof, "lnaof", 1, 0, 0, scm_lnaof);
SCM
scm_lnaof (address)
SCM address;
{
struct in_addr addr;
addr.s_addr = htonl (scm_num2ulong (address, (char *) SCM_ARG1, s_lnaof));
return scm_ulong2num ((unsigned long) inet_lnaof (addr));
}
SCM_PROC (s_inet_makeaddr, "inet-makeaddr", 2, 0, 0, scm_inet_makeaddr);
SCM
scm_inet_makeaddr (net, lna)
SCM net;
SCM lna;
{
struct in_addr addr;
unsigned long netnum;
unsigned long lnanum;
netnum = scm_num2ulong (net, (char *) SCM_ARG1, s_inet_makeaddr);
lnanum = scm_num2ulong (lna, (char *) SCM_ARG2, s_inet_makeaddr);
addr = inet_makeaddr (netnum, lnanum);
return scm_ulong2num (ntohl (addr.s_addr));
}
/* !!! Doesn't take address format.
* Assumes hostent stream isn't reused.
*/
SCM_PROC (s_gethost, "gethost", 0, 1, 0, scm_gethost);
SCM
scm_gethost (name)
SCM name;
{
SCM ans = scm_make_vector (SCM_MAKINUM (5), SCM_UNSPECIFIED, SCM_BOOL_F);
SCM *ve = SCM_VELTS (ans);
SCM lst = SCM_EOL;
struct hostent *entry;
struct in_addr inad;
char **argv;
int i = 0;
#ifdef HAVE_GETHOSTENT
if (SCM_UNBNDP (name))
{
SCM_DEFER_INTS;
entry = gethostent ();
}
else
#endif
if (SCM_NIMP (name) && SCM_STRINGP (name))
{
SCM_DEFER_INTS;
entry = gethostbyname (SCM_CHARS (name));
}
else
{
inad.s_addr = htonl (scm_num2ulong (name, (char *) SCM_ARG1, s_gethost));
SCM_DEFER_INTS;
entry = gethostbyaddr ((char *) &inad, sizeof (inad), AF_INET);
}
SCM_ALLOW_INTS;
if (!entry)
scm_syserror (s_gethost);
ve[0] = scm_makfromstr (entry->h_name, (scm_sizet) strlen (entry->h_name), 0);
ve[1] = scm_makfromstrs (-1, entry->h_aliases);
ve[2] = SCM_MAKINUM (entry->h_addrtype + 0L);
ve[3] = SCM_MAKINUM (entry->h_length + 0L);
if (sizeof (struct in_addr) != entry->h_length)
{
ve[4] = SCM_BOOL_F;
return ans;
}
for (argv = entry->h_addr_list; argv[i]; i++);
while (i--)
{
inad = *(struct in_addr *) argv[i];
lst = scm_cons (scm_ulong2num (ntohl (inad.s_addr)), lst);
}
ve[4] = lst;
return ans;
}
SCM_PROC (s_getnet, "getnet", 0, 1, 0, scm_getnet);
SCM
scm_getnet (name)
SCM name;
{
SCM ans;
SCM *ve;
struct netent *entry;
ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F);
ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name))
{
SCM_DEFER_INTS;
entry = getnetent ();
}
else if (SCM_NIMP (name) && SCM_STRINGP (name))
{
SCM_DEFER_INTS;
entry = getnetbyname (SCM_CHARS (name));
}
else
{
unsigned long netnum;
netnum = scm_num2ulong (name, (char *) SCM_ARG1, s_getnet);
SCM_DEFER_INTS;
entry = getnetbyaddr (netnum, AF_INET);
}
SCM_ALLOW_INTS;
if (!entry)
scm_syserror (s_getnet);
ve[0] = scm_makfromstr (entry->n_name, (scm_sizet) strlen (entry->n_name), 0);
ve[1] = scm_makfromstrs (-1, entry->n_aliases);
ve[2] = SCM_MAKINUM (entry->n_addrtype + 0L);
ve[3] = scm_ulong2num (entry->n_net + 0L);
return ans;
}
SCM_PROC (s_getproto, "getproto", 0, 1, 0, scm_getproto);
SCM
scm_getproto (name)
SCM name;
{
SCM ans;
SCM *ve;
struct protoent *entry;
ans = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F);
ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name))
{
SCM_DEFER_INTS;
entry = getprotoent ();
}
else if (SCM_NIMP (name) && SCM_STRINGP (name))
{
SCM_DEFER_INTS;
entry = getprotobyname (SCM_CHARS (name));
}
else
{
unsigned long protonum;
protonum = scm_num2ulong (name, (char *) SCM_ARG1, s_getproto);
SCM_DEFER_INTS;
entry = getprotobynumber (protonum);
}
SCM_ALLOW_INTS;
if (!entry)
scm_syserror (s_getproto);
ve[0] = scm_makfromstr (entry->p_name, (scm_sizet) strlen (entry->p_name), 0);
ve[1] = scm_makfromstrs (-1, entry->p_aliases);
ve[2] = SCM_MAKINUM (entry->p_proto + 0L);
return ans;
}
static SCM scm_return_entry SCM_P ((struct servent *entry));
static SCM
scm_return_entry (entry)
struct servent *entry;
{
SCM ans;
SCM *ve;
ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F);
ve = SCM_VELTS (ans);
ve[0] = scm_makfromstr (entry->s_name, (scm_sizet) strlen (entry->s_name), 0);
ve[1] = scm_makfromstrs (-1, entry->s_aliases);
ve[2] = SCM_MAKINUM (ntohs (entry->s_port) + 0L);
ve[3] = scm_makfromstr (entry->s_proto, (scm_sizet) strlen (entry->s_proto), 0);
SCM_ALLOW_INTS;
return ans;
}
SCM_PROC (s_getserv, "getserv", 0, 2, 0, scm_getserv);
SCM
scm_getserv (name, proto)
SCM name;
SCM proto;
{
struct servent *entry;
if (SCM_UNBNDP (name))
{
SCM_DEFER_INTS;
entry = getservent ();
if (!entry)
scm_syserror (s_getserv);
return scm_return_entry (entry);
}
SCM_ASSERT (SCM_NIMP (proto) && SCM_STRINGP (proto), proto, SCM_ARG2, s_getserv);
if (SCM_NIMP (name) && SCM_STRINGP (name))
{
SCM_DEFER_INTS;
entry = getservbyname (SCM_CHARS (name), SCM_CHARS (proto));
}
else
{
SCM_ASSERT (SCM_INUMP (name), name, SCM_ARG1, s_getserv);
SCM_DEFER_INTS;
entry = getservbyport (SCM_INUM (name), SCM_CHARS (proto));
}
if (!entry)
scm_syserror (s_getserv);
return scm_return_entry (entry);
}
SCM_PROC (s_sethost, "sethost", 0, 1, 0, scm_sethost);
SCM
scm_sethost (arg)
SCM arg;
{
if (SCM_UNBNDP (arg))
endhostent ();
else
sethostent (SCM_NFALSEP (arg));
return SCM_UNSPECIFIED;
}
SCM_PROC (s_setnet, "setnet", 0, 1, 0, scm_setnet);
SCM
scm_setnet (arg)
SCM arg;
{
if (SCM_UNBNDP (arg))
endnetent ();
else
setnetent (SCM_NFALSEP (arg));
return SCM_UNSPECIFIED;
}
SCM_PROC (s_setproto, "setproto", 0, 1, 0, scm_setproto);
SCM
scm_setproto (arg)
SCM arg;
{
if (SCM_UNBNDP (arg))
endprotoent ();
else
setprotoent (SCM_NFALSEP (arg));
return SCM_UNSPECIFIED;
}
SCM_PROC (s_setserv, "setserv", 0, 1, 0, scm_setserv);
SCM
scm_setserv (arg)
SCM arg;
{
if (SCM_UNBNDP (arg))
endservent ();
else
setservent (SCM_NFALSEP (arg));
return SCM_UNSPECIFIED;
}
void
scm_init_net_db ()
{
#ifdef INADDR_ANY
scm_sysintern ("INADDR_ANY", scm_ulong2num (INADDR_ANY));
#endif
#ifdef INADDR_BROADCAST
scm_sysintern ("INADDR_BROADCAST", scm_ulong2num (INADDR_BROADCAST));
#endif
#ifdef INADDR_NONE
scm_sysintern ("INADDR_NONE", scm_ulong2num (INADDR_NONE));
#endif
#ifdef INADDR_LOOPBACK
scm_sysintern ("INADDR_LOOPBACK", scm_ulong2num (INADDR_LOOPBACK));
#endif
scm_add_feature ("net-db");
#include "net_db.x"
}

69
libguile/net_db.h Normal file
View file

@ -0,0 +1,69 @@
/* classes: h_files */
#ifndef NETDBH
#define NETDBH
/* Copyright (C) 1995 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
*
* The exception is that, if you link the GUILE library with other files
* to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the GUILE library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the
* Free Software Foundation under the name GUILE. If you copy
* code from other Free Software Foundation releases into a copy of
* GUILE, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*/
#include "libguile/__scm.h"
extern SCM scm_gethost SCM_P ((SCM name));
extern SCM scm_inet_aton SCM_P ((SCM address));
extern SCM scm_inet_ntoa SCM_P ((SCM inetid));
extern SCM scm_inet_netof SCM_P ((SCM address));
extern SCM scm_lnaof SCM_P ((SCM address));
extern SCM scm_inet_makeaddr SCM_P ((SCM net, SCM lna));
extern SCM scm_getnet SCM_P ((SCM name));
extern SCM scm_getproto SCM_P ((SCM name));
extern SCM scm_getserv SCM_P ((SCM name, SCM proto));
extern SCM scm_sethost SCM_P ((SCM arg));
extern SCM scm_setnet SCM_P ((SCM arg));
extern SCM scm_setproto SCM_P ((SCM arg));
extern SCM scm_setserv SCM_P ((SCM arg));
extern void scm_init_netdb SCM_P ((void));
#endif /* NETDBH */

1042
libguile/socket.c
View file

File diff suppressed because it is too large Load diff

29
libguile/socket.h
View file

@ -49,21 +49,24 @@
extern SCM scm_sys_gethost SCM_P ((SCM name)); extern SCM scm_socket SCM_P ((SCM family, SCM style, SCM proto));
extern SCM scm_sys_inet_aton SCM_P ((SCM address)); extern SCM scm_socketpair SCM_P ((SCM family, SCM style, SCM proto));
extern SCM scm_inet_ntoa SCM_P ((SCM inetid)); extern SCM scm_getsockopt SCM_P ((SCM sfd, SCM level, SCM optname));
extern SCM scm_inet_netof SCM_P ((SCM address)); extern SCM scm_setsockopt SCM_P ((SCM sfd, SCM level, SCM optname, SCM value));
extern SCM scm_lnaof SCM_P ((SCM address)); extern SCM scm_shutdown SCM_P ((SCM sfd, SCM how));
extern SCM scm_inet_makeaddr SCM_P ((SCM net, SCM lna)); extern SCM scm_connect SCM_P ((SCM sockfd, SCM fam, SCM address, SCM args));
extern SCM scm_sys_getnet SCM_P ((SCM name)); extern SCM scm_bind SCM_P ((SCM sockfd, SCM fam, SCM address, SCM args));
extern SCM scm_sys_getproto SCM_P ((SCM name)); extern SCM scm_listen SCM_P ((SCM sfd, SCM backlog));
extern SCM scm_sys_getserv SCM_P ((SCM name, SCM proto)); extern SCM scm_accept SCM_P ((SCM sockfd));
extern SCM scm_sethost SCM_P ((SCM arg)); extern SCM scm_getsockname SCM_P ((SCM sockfd));
extern SCM scm_setnet SCM_P ((SCM arg)); extern SCM scm_getpeername SCM_P ((SCM sockfd));
extern SCM scm_setproto SCM_P ((SCM arg)); extern SCM scm_recv SCM_P ((SCM sockfd, SCM buff_or_size, SCM flags));
extern SCM scm_setserv SCM_P ((SCM arg)); extern SCM scm_send SCM_P ((SCM sockfd, SCM message, SCM flags));
extern SCM scm_recvfrom SCM_P ((SCM sockfd, SCM buff_or_size, SCM flags));
extern SCM scm_sendto SCM_P ((SCM sockfd, SCM message, SCM fam, SCM address, SCM args_and_flags));
extern void scm_init_socket SCM_P ((void)); extern void scm_init_socket SCM_P ((void));
#endif /* SOCKETH */ #endif /* SOCKETH */