summaryrefslogtreecommitdiff
path: root/libguile/socket.c
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>1999-11-18 22:36:28 +0000
committerGary Houston <ghouston@arglist.com>1999-11-18 22:36:28 +0000
commit5c11cc9deb3962c0a7b4603327b9414579efe2bf (patch)
treea0635558e053bd1d54716f4f6e3dd4082510e431 /libguile/socket.c
parent93a6b6f5a75f3387fae66f815c794f8fcfbdebaf (diff)
downloadguile-5c11cc9deb3962c0a7b4603327b9414579efe2bf.tar.gz
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new functions for network data conversion. * numbers.c (scm_num2long, scm_num2longlong): throw out-of-range instead of wrong-type-arg if appropriate. (scm_iint2str): handle -2^31 correctly. (scm_num2long): handle -2^31 bignum correctly. (scm_num2long_long): rewrite the bigdig case: basically copied from scm_num2long. numbers.h: (SCM_BITSPERLONGLONG): deleted. * unif.c (rapr1): use sprintf instead of intprint for unsigned longs: intprint can't cope with large values. * numbers.c (scm_num2ulong): check more consistently that the input is not negative. if it is, throw out-of-range instead of wrong-type-arg. * ramap.c (scm_array_fill_int): don't limit fill to INUM for uvect, ivect or llvect. Check that fill doesn't overflow short uniform array. * __scm.h: add another long to the definition of long_long and ulong_long. * unif.c (scm_raprin1): use 'l' instead of "long_long" in the print representation of llvect. read can't handle more than one character. (scm_dimensions_to_uniform_array): make "fill" an optional argument instead of a rest argument. * tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free tag 29 for now. * __scm.h: don't mention LONGLONGS. * unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c: replace LONGLONGS with HAVE_LONG_LONGS as set by configure. * net_db.c (scm_inet_aton): throw errors using the misc-error key instead of system-error. inet_aton doesn't set errno. system-error isn't right in gethost either, since it's throwing the value of h_errno instead of errno. so: (scm_host_not_found_key, scm_try_again_key, scm_no_recovery_key, scm_no_data_key): new error keys. (scm_resolv_error): new procedure, use the new keys. (scm_gethost): call scm_resolv_error not scm_syserror_msg. * error.c: (various): use scm_cons instead of scm_listify to build short lists. * boot-9.scm (read-hash-extend to set up arrays): add 'l' for long_long uniform vectors. * networking.scm (sethostent, setnetent, setprotoent, setservent): take an optional argument STAYOPEN. default is #f. * readline.c (scm_init_readline): set rl_readline_name to Guile, to allow conditionals in .inputrc.
Diffstat (limited to 'libguile/socket.c')
-rw-r--r--libguile/socket.c46
1 files changed, 46 insertions, 0 deletions
diff --git a/libguile/socket.c b/libguile/socket.c
index 1447e940a..dcaa32b08 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -66,6 +66,52 @@
+SCM_PROC (s_htons, "htons", 1, 0, 0, scm_htons);
+SCM
+scm_htons (SCM in)
+{
+ unsigned short c_in;
+
+ SCM_ASSERT (SCM_INUMP (in), in, SCM_ARG1, s_htons);
+ c_in = SCM_INUM (in);
+ if (c_in != SCM_INUM (in))
+ scm_out_of_range (s_htons, in);
+
+ return SCM_MAKINUM (htons (c_in));
+}
+
+SCM_PROC (s_ntohs, "ntohs", 1, 0, 0, scm_ntohs);
+SCM
+scm_ntohs (SCM in)
+{
+ unsigned short c_in;
+
+ SCM_ASSERT (SCM_INUMP (in), in, SCM_ARG1, s_ntohs);
+ c_in = SCM_INUM (in);
+ if (c_in != SCM_INUM (in))
+ scm_out_of_range (s_ntohs, in);
+
+ return SCM_MAKINUM (ntohs (c_in));
+}
+
+SCM_PROC (s_htonl, "htonl", 1, 0, 0, scm_htonl);
+SCM
+scm_htonl (SCM in)
+{
+ unsigned long c_in = scm_num2ulong (in, (char *) SCM_ARG1, s_htonl);
+
+ return scm_ulong2num (htonl (c_in));
+}
+
+SCM_PROC (s_ntohl, "ntohl", 1, 0, 0, scm_ntohl);
+SCM
+scm_ntohl (SCM in)
+{
+ unsigned long c_in = scm_num2ulong (in, (char *) SCM_ARG1, s_ntohl);
+
+ return scm_ulong2num (ntohl (c_in));
+}
+
SCM_SYMBOL (sym_socket, "socket");
static SCM scm_sock_fd_to_port SCM_P ((int fd, const char *proc));