fix dependencies

GNUmakefile

@@ -288,9 +288,13 @@ libsocket: trysocket.c
 	fi; fi > libsocket
 	rm -f blah trysocket
 
-socket_accept6.o socket_connect6.o socket_local6.o socket_mchopcount6.o \
+socket_accept6.o socket_bind6.o socket_connect6.o socket_local6.o \
-socket_mcjoin6.o socket_mcleave6.o socket_mcloop6.o socket_recv6.o \
+socket_mchopcount6.o socket_mcjoin6.o socket_mcleave6.o socket_mcloop6.o \
-socket_remote6.o socket_send6.o socket_tcp6.o socket_udp6.o: haveip6.h havescope.h
+socket_recv6.o socket_remote6.o socket_sctp6b.o socket_send6.o \
+socket_tcp6b.o socket_udp6.o: haveip6.h
+
+socket_accept6.o socket_connect6.o socket_local6.o socket_recv6.o \
+socket_remote6.o socket_send6.o: havescope.h
 
 socket_getifidx.o socket_getifname.o: haven2i.h
 

Makefile

@@ -57,6 +57,7 @@ buffer_2.o: buffer/buffer_2.c buffer.h
 buffer_close.o: buffer/buffer_close.c buffer.h
 buffer_feed.o: buffer/buffer_feed.c buffer.h
 buffer_flush.o: buffer/buffer_flush.c buffer.h
+buffer_fromarray.o: buffer/buffer_fromarray.c array.h uint64.h buffer.h
 buffer_frombuf.o: buffer/buffer_frombuf.c stralloc.h buffer.h
 buffer_fromsa.o: buffer/buffer_fromsa.c stralloc.h buffer.h
 buffer_get.o: buffer/buffer_get.c byte.h buffer.h
@@ -128,7 +129,6 @@ cdb.o: cdb/cdb.c byte.h cdb.h uint32.h uint64.h
 cdb_hash.o: cdb/cdb_hash.c cdb.h uint32.h uint64.h
 cdb_make.o: cdb/cdb_make.c cdb.h uint32.h uint64.h cdb_make.h buffer.h
 cdb_traverse.o: cdb/cdb_traverse.c cdb.h uint32.h uint64.h
-critbit.o: critbit/critbit.c
 dns_dfd.o: dns/dns_dfd.c byte.h dns.h stralloc.h iopause.h taia.h tai.h \
  uint64.h uint32.h
 dns_domain.o: dns/dns_domain.c case.h byte.h dns.h stralloc.h iopause.h \
@@ -197,7 +197,6 @@ fmt_ulonglong.o: fmt/fmt_ulonglong.c fmt.h byte.h
 fmt_utf8.o: fmt/fmt_utf8.c fmt.h byte.h
 fmt_xlong.o: fmt/fmt_xlong.c fmt.h byte.h haveinline.h
 fmt_xlonglong.o: fmt/fmt_xlonglong.c fmt.h byte.h
-fmt_xmlescape.o: fmt/fmt_xmlescape.c fmt.h byte.h
 io_appendfile.o: io/io_appendfile.c io_internal.h io.h uint64.h taia.h \
  tai.h uint32.h array.h haveepoll.h havekqueue.h havedevpoll.h \
  havesigio.h
@@ -261,6 +260,9 @@ io_sigpipe.o: io/io_sigpipe.c io_internal.h io.h uint64.h taia.h tai.h \
 io_socketpair.o: io/io_socketpair.c windoze.h io_internal.h io.h uint64.h \
  taia.h tai.h uint32.h array.h haveepoll.h havekqueue.h havedevpoll.h \
  havesigio.h
+io_starteventloop.o: io/io_starteventloop.c io_internal.h io.h uint64.h \
+ taia.h tai.h uint32.h array.h haveepoll.h havekqueue.h havedevpoll.h \
+ havesigio.h
 io_timeout.o: io/io_timeout.c io_internal.h io.h uint64.h taia.h tai.h \
  uint32.h array.h haveepoll.h havekqueue.h havedevpoll.h havesigio.h
 io_timeouted.o: io/io_timeouted.c io_internal.h io.h uint64.h taia.h \
@@ -352,6 +354,7 @@ openreadclose.o: open/openreadclose.c open.h readclose.h stralloc.h \
 readclose.o: open/readclose.c readclose.h stralloc.h
 scan_8int.o: scan/scan_8int.c scan.h
 scan_8long.o: scan/scan_8long.c scan.h
+scan_8longn.o: scan/scan_8longn.c scan.h
 scan_8short.o: scan/scan_8short.c scan.h
 scan_asn1derlength.o: scan/scan_asn1derlength.c scan.h
 scan_asn1dertag.o: scan/scan_asn1dertag.c scan.h
@@ -362,6 +365,7 @@ scan_httpdate.o: scan/scan_httpdate.c scan.h byte.h case.h
 scan_int.o: scan/scan_int.c scan.h
 scan_long.o: scan/scan_long.c scan.h
 scan_longlong.o: scan/scan_longlong.c scan.h
+scan_longn.o: scan/scan_longn.c scan.h
 scan_netstring.o: scan/scan_netstring.c scan.h
 scan_noncharsetnskip.o: scan/scan_noncharsetnskip.c scan.h
 scan_nonwhitenskip.o: scan/scan_nonwhitenskip.c scan.h
@@ -370,12 +374,14 @@ scan_short.o: scan/scan_short.c scan.h
 scan_uint.o: scan/scan_uint.c scan.h
 scan_ulong.o: scan/scan_ulong.c scan.h
 scan_ulonglong.o: scan/scan_ulonglong.c scan.h
+scan_ulongn.o: scan/scan_ulongn.c scan.h
 scan_ushort.o: scan/scan_ushort.c scan.h
 scan_utf8.o: scan/scan_utf8.c fmt.h byte.h
 scan_whitenskip.o: scan/scan_whitenskip.c scan.h
 scan_xint.o: scan/scan_xint.c scan.h
 scan_xlong.o: scan/scan_xlong.c scan.h
 scan_xlonglong.o: scan/scan_xlonglong.c scan.h
+scan_xlongn.o: scan/scan_xlongn.c scan.h
 scan_xshort.o: scan/scan_xshort.c scan.h
 fmt_ip4.o: socket/fmt_ip4.c fmt.h byte.h ip4.h
 fmt_ip6.o: socket/fmt_ip6.c fmt.h byte.h byte.h ip4.h ip6.h uint32.h
@@ -591,14 +597,14 @@ t.o: t.c fmt.h byte.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
  tai.h uint64.h case.h errmsg.h iob.h io.h array.h safemult.h iarray.h \
  CAS.h io_internal.h haveepoll.h havekqueue.h havedevpoll.h havesigio.h
 BYTE_OBJS=byte_chr.o byte_copy.o byte_copyr.o byte_diff.o byte_rchr.o byte_zero.o 
-FMT_OBJS=fmt_8long.o fmt_8longlong.o fmt_asn1derlength.o fmt_asn1dertag.o fmt_double.o fmt_fill.o fmt_httpdate.o fmt_human.o fmt_humank.o fmt_long.o fmt_longlong.o fmt_minus.o fmt_pad.o fmt_plusminus.o fmt_str.o fmt_strm_internal.o fmt_strn.o fmt_tohex.o fmt_ulong.o fmt_ulong0.o fmt_ulonglong.o fmt_utf8.o fmt_xlong.o fmt_xlonglong.o 
+FMT_OBJS=fmt_8long.o fmt_8longlong.o fmt_double.o fmt_fill.o fmt_httpdate.o fmt_human.o fmt_humank.o fmt_long.o fmt_longlong.o fmt_minus.o fmt_pad.o fmt_plusminus.o fmt_str.o fmt_strm_internal.o fmt_strn.o fmt_tohex.o fmt_ulong.o fmt_ulong0.o fmt_ulonglong.o fmt_xlong.o fmt_xlonglong.o 
-SCAN_OBJS=scan_8int.o scan_8long.o scan_8short.o scan_asn1derlength.o scan_asn1dertag.o scan_charsetnskip.o scan_double.o scan_fromhex.o scan_httpdate.o scan_int.o scan_long.o scan_longlong.o scan_noncharsetnskip.o scan_nonwhitenskip.o scan_plusminus.o scan_short.o scan_uint.o scan_ulong.o scan_ulonglong.o scan_ushort.o scan_utf8.o scan_whitenskip.o scan_xint.o scan_xlong.o scan_xlonglong.o scan_xshort.o 
+SCAN_OBJS=scan_8int.o scan_8long.o scan_8short.o scan_charsetnskip.o scan_double.o scan_fromhex.o scan_httpdate.o scan_int.o scan_long.o scan_longlong.o scan_noncharsetnskip.o scan_nonwhitenskip.o scan_plusminus.o scan_short.o scan_uint.o scan_ulong.o scan_ulonglong.o scan_ushort.o scan_whitenskip.o scan_xint.o scan_xlong.o scan_xlonglong.o scan_xshort.o 
 STR_OBJS=str_chr.o str_copy.o str_diff.o str_diffn.o str_len.o str_rchr.o str_start.o 
 UINT_OBJS=uint16_pack.o uint16_pack_big.o uint16_read.o uint16_read_big.o uint16_unpack.o uint16_unpack_big.o uint32_pack.o uint32_pack_big.o uint32_read.o uint32_read_big.o uint32_unpack.o uint32_unpack_big.o uint64_pack.o uint64_pack_big.o uint64_read.o uint64_read_big.o uint64_unpack.o uint64_unpack_big.o 
 OPEN_OBJS=open_append.o open_excl.o open_read.o open_rw.o open_trunc.o open_write.o openreadclose.o readclose.o 
 STRALLOC_OBJS=stralloc_append.o stralloc_cat.o stralloc_catb.o stralloc_catlong0.o stralloc_catm_internal.o stralloc_cats.o stralloc_catulong0.o stralloc_chomp.o stralloc_chop.o stralloc_copy.o stralloc_copyb.o stralloc_copys.o stralloc_diff.o stralloc_diffs.o stralloc_free.o stralloc_init.o stralloc_ready.o stralloc_readyplus.o stralloc_starts.o stralloc_zero.o 
 UNIX_OBJS=iopause.o ndelay_off.o ndelay_on.o winsock2errno.o 
-SOCKET_OBJS=fmt_ip4.o fmt_ip6.o fmt_ip6_flat.o fmt_ip6c.o fmt_ip6if.o fmt_ip6ifc.o init.o scan_ip4.o scan_ip6.o scan_ip6_flat.o scan_ip6if.o socket_accept4.o socket_accept6.o socket_bind4.o socket_bind4_reuse.o socket_bind6.o socket_bind6_reuse.o socket_broadcast.o socket_connect4.o socket_connect6.o socket_connected.o socket_deferaccept.o socket_getifidx.o socket_getifname.o socket_ip4loopback.o socket_listen.o socket_local4.o socket_local6.o socket_mchopcount6.o socket_mcjoin4.o socket_mcjoin6.o socket_mcleave4.o socket_mcleave6.o socket_mcloop4.o socket_mcloop6.o socket_mcttl4.o socket_noipv6.o socket_recv4.o socket_recv6.o socket_remote4.o socket_remote6.o socket_sctp4.o socket_sctp4b.o socket_sctp6.o socket_sctp6b.o socket_send4.o socket_send6.o socket_tcp4.o socket_tcp4b.o socket_tcp6.o socket_tcp6b.o socket_tryreservein.o socket_udp4.o socket_udp6.o socket_v4mappedprefix.o socket_v6any.o socket_v6loopback.o 
+SOCKET_OBJS=fmt_ip4.o fmt_ip6.o fmt_ip6_flat.o fmt_ip6c.o fmt_ip6if.o fmt_ip6ifc.o init.o scan_ip4.o scan_ip6.o scan_ip6_flat.o scan_ip6if.o socket_accept4.o socket_accept6.o socket_bind4.o socket_bind4_reuse.o socket_bind6.o socket_bind6_reuse.o socket_broadcast.o socket_connect4.o socket_connect6.o socket_connected.o socket_deferaccept.o socket_getifidx.o socket_getifname.o socket_ip4loopback.o socket_listen.o socket_local4.o socket_local6.o socket_mchopcount6.o socket_mcjoin4.o socket_mcjoin6.o socket_mcleave4.o socket_mcleave6.o socket_mcloop4.o socket_mcloop6.o socket_mcttl4.o socket_noipv6.o socket_recv4.o socket_recv6.o socket_remote4.o socket_remote6.o socket_send4.o socket_send6.o socket_tcp4.o socket_tcp4b.o socket_tcp6.o socket_tcp6b.o socket_tryreservein.o socket_udp4.o socket_udp6.o socket_v4mappedprefix.o socket_v6any.o socket_v6loopback.o 
 BUFFER_OBJS=buffer_0.o buffer_0small.o buffer_1.o buffer_1small.o buffer_2.o buffer_close.o buffer_feed.o buffer_flush.o buffer_fromsa.o buffer_get.o buffer_get_new_token_sa.o buffer_get_new_token_sa_pred.o buffer_get_token.o buffer_get_token_pred.o buffer_get_token_sa.o buffer_get_token_sa_pred.o buffer_getc.o buffer_getline.o buffer_getline_sa.o buffer_getn.o buffer_getnewline_sa.o buffer_init.o buffer_init_free.o buffer_mmapread.o buffer_peek.o buffer_put.o buffer_put8long.o buffer_putalign.o buffer_puterror.o buffer_puterror2.o buffer_putflush.o buffer_putlong.o buffer_putlonglong.o buffer_putm_internal.o buffer_putm_internal_flush.o buffer_putnlflush.o buffer_puts.o buffer_putsa.o buffer_putsaflush.o buffer_putsalign.o buffer_putsflush.o buffer_putspace.o buffer_putulong.o buffer_putulonglong.o buffer_putxlong.o buffer_seek.o buffer_stubborn.o buffer_stubborn2.o buffer_tosa.o errmsg_iam.o errmsg_info.o errmsg_infosys.o errmsg_puts.o errmsg_warn.o errmsg_warnsys.o errmsg_write.o 
 MMAP_OBJS=mmap_private.o mmap_read.o mmap_shared.o mmap_unmap.o 
 TAIA_OBJS=taia_add.o taia_addsec.o taia_approx.o taia_frac.o taia_half.o taia_less.o taia_now.o taia_pack.o taia_sub.o taia_tai.o taia_uint.o taia_unpack.o 
@@ -606,7 +612,7 @@ TAI_OBJS=tai_add.o tai_now.o tai_pack.o tai_sub.o tai_uint.o tai_unpack.o
 DNS_OBJS=dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ip6.o dns_ipq.o dns_ipq6.o dns_mx.o dns_name.o dns_nd.o dns_nd6.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o dns_resolve.o dns_sortip.o dns_sortip6.o dns_transmit.o dns_txt.o 
 CASE_OBJS=case_diffb.o case_diffs.o case_lowerb.o case_lowers.o case_starts.o 
 MULT_OBJS=imult16.o imult32.o imult64.o range_arrayinbuf.o range_str2inbuf.o range_str4inbuf.o range_strinbuf.o umult16.o umult32.o umult64.o 
-ARRAY_OBJS=array_allocate.o array_bytes.o array_cat.o array_cat0.o array_catb.o array_cate.o array_cats.o array_cats0.o array_equal.o array_fail.o array_get.o array_length.o array_reset.o array_start.o array_trunc.o array_truncate.o iarray_allocate.o iarray_free.o iarray_get.o iarray_init.o 
+ARRAY_OBJS=array_allocate.o array_bytes.o array_cat.o array_cat0.o array_catb.o array_cate.o array_cats.o array_cats0.o array_equal.o array_fail.o array_get.o array_length.o array_reset.o array_start.o array_trunc.o array_truncate.o
 IO_OBJS=io_appendfile.o io_block.o io_canread.o io_canwrite.o io_check.o io_close.o io_closeonexec.o io_createfile.o io_dontwantread.o io_dontwantwrite.o io_eagain.o io_fd.o io_finishandshutdown.o io_getcookie.o io_mmapwritefile.o io_nonblock.o io_passfd.o io_pipe.o io_readfile.o io_readwritefile.o io_receivefd.o io_sendfile.o io_setcookie.o io_sigpipe.o io_socketpair.o io_timeout.o io_timeouted.o io_tryread.o io_tryreadtimeout.o io_trywrite.o io_trywritetimeout.o io_wait.o io_waitread.o io_waituntil.o io_waituntil2.o io_waitwrite.o io_wantread.o io_wantwrite.o iob_addbuf.o iob_addbuf_free.o iob_addbuf_internal.o iob_addbuf_munmap.o iob_addfile.o iob_addfile_close.o iob_adds.o iob_adds_free.o iob_bytesleft.o iob_free.o iob_new.o iob_prefetch.o iob_reset.o iob_send.o iob_write.o 
 TEXTCODE_OBJS=base64.o fmt_base64.o fmt_cescape.o fmt_foldwhitespace.o fmt_hexdump.o fmt_html.o fmt_ldapescape.o fmt_ldapescape2.o fmt_quotedprintable.o fmt_to_array.o fmt_to_sa.o fmt_tofrom_array.o fmt_urlencoded.o fmt_uuencoded.o fmt_yenc.o scan_base64.o scan_cescape.o scan_hexdump.o scan_html.o scan_ldapescape.o scan_quotedprintable.o scan_to_array.o scan_to_sa.o scan_tofrom_array.o scan_urlencoded.o scan_uuencoded.o scan_yenc.o 
 CDB_OBJS=cdb.o cdb_hash.o cdb_make.o cdb_traverse.o 
@@ -692,7 +698,7 @@ uninstall:
 	rm -f $(LIBDIR)/libowfat.a
 
 VERSION=libowfat-0.30
-CURNAME=libowfat-0.27
+CURNAME=libowfat-0.28
 
 tar: clean rename
 	rm -f dep libdep
@@ -792,9 +798,13 @@ libsocket: trysocket.c
 	fi; fi > libsocket
 	rm -f blah trysocket
 
-socket_accept6.o socket_connect6.o socket_local6.o socket_mchopcount6.o \
+socket_accept6.o socket_bind6.o socket_connect6.o socket_local6.o \
-socket_mcjoin6.o socket_mcleave6.o socket_mcloop6.o socket_recv6.o \
+socket_mchopcount6.o socket_mcjoin6.o socket_mcleave6.o socket_mcloop6.o \
-socket_remote6.o socket_send6.o socket_tcp6.o socket_udp6.o: haveip6.h havescope.h
+socket_recv6.o socket_remote6.o socket_sctp6b.o socket_send6.o \
+socket_tcp6b.o socket_udp6.o: haveip6.h
+
+socket_accept6.o socket_connect6.o socket_local6.o socket_recv6.o \
+socket_remote6.o socket_send6.o: havescope.h
 
 socket_getifidx.o socket_getifname.o: haven2i.h