update entities.json

fix build fails (never happened to me because I have the headers installed system-wide)

GNUmakefile

@@ -46,7 +46,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
 
 #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
 
-ent: ent.c haveuint128.h
+ent: ent.c haveuint128.h headers
 	$(CC) -g -o ent ent.c -I.
 
 # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
@@ -110,25 +110,25 @@ IO_OBJS=$(patsubst io/%.c,%.o,$(wildcard io/*.c))
 CDB_OBJS=$(patsubst cdb/%.c,%.o,$(wildcard cdb/*.c))
 CRITBIT_OBJS=$(patsubst critbit/%.c,%.o,$(wildcard critbit/*.c))
 
-$(BYTE_OBJS): byte.h
-$(FMT_OBJS): fmt.h
-$(SCAN_OBJS): scan.h haveuint128.h
-$(STR_OBJS): str.h
+$(BYTE_OBJS): byte.h headers
+$(FMT_OBJS): fmt.h headers
+$(SCAN_OBJS): scan.h haveuint128.h headers
+$(STR_OBJS): str.h headers
 $(UINT_OBJS): uint16.h uint32.h
-$(STRALLOC_OBJS): stralloc.h
-$(SOCKET_OBJS): socket.h
-$(BUFFER_OBJS): buffer.h
-$(MMAP_OBJS): mmap.h open.h
-$(TEXTCODE_OBJS): textcode.h
-$(TAI_OBJS): tai.h uint64.h
-$(TAIA_OBJS): taia.h tai.h uint64.h
-$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h
-$(CASE_OBJS): case.h
-$(ARRAY_OBJS): uint64.h array.h
-$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h
-$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h
-$(CDB_OBJS): cdb.h uint32.h
-$(CRITBIT_OBJS): critbit.h
+$(STRALLOC_OBJS): stralloc.h headers
+$(SOCKET_OBJS): socket.h headers
+$(BUFFER_OBJS): buffer.h headers
+$(MMAP_OBJS): mmap.h open.h headers
+$(TEXTCODE_OBJS): textcode.h headers
+$(TAI_OBJS): tai.h uint64.h headers
+$(TAIA_OBJS): taia.h tai.h uint64.h headers
+$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h headers
+$(CASE_OBJS): case.h headers
+$(ARRAY_OBJS): uint64.h array.h headers
+$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h headers
+$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h headers
+$(CDB_OBJS): cdb.h uint32.h headers
+$(CRITBIT_OBJS): critbit.h headers
 
 mult64.o: haveuint128.h
 
@@ -206,6 +206,7 @@ havesl.h haveinline.h iopause.h select.h havekqueue.h haveepoll.h \
 libepoll havesigio.h havebsdsf.h havesendfile.h havescope.h havedevpoll.h \
 dep libsocket havealloca.h haveuint128.h entities.h ent havepread.h haveaccept4.h \
 *.gcda *.gcno
+	rm -rf libowfat
 
 INCLUDES=buffer.h byte.h fmt.h ip4.h ip6.h mmap.h scan.h socket.h str.h stralloc.h \
 uint16.h uint32.h uint64.h open.h textcode.h tai.h taia.h dns.h iopause.h case.h \
@@ -394,7 +395,8 @@ windoze64:
 	$(MAKE) DIET= CROSS=x86_64-w64-mingw32-
 
 update:
-	dl -n http://www.w3.org/TR/html5/entities.json
+#	dl -n https://www.w3.org/TR/html5/entities.json
+	dl -n https://html.spec.whatwg.org/entities.json
 
 entities.h: entities.json ent
 	./ent

Makefile

@@ -47,7 +47,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
 
 #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
 
-ent: ent.c haveuint128.h
+ent: ent.c haveuint128.h headers
 	$(CC) -g -o ent ent.c -I.
 
 # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
@@ -764,8 +764,8 @@ scan_ip6if.o: socket/scan_ip6if.c ip6.h libowfat/byte.h \
 socket_accept4.o: socket/socket_accept4.c windoze.h socket.h \
  libowfat/compiler.h libowfat/uint16.h libowfat/uint32.h havesl.h
 socket_accept4_flags.o: socket/socket_accept4_flags.c windoze.h socket.h \
- libowfat/compiler.h libowfat/uint16.h libowfat/uint32.h havesl.h \
- haveaccept4.h
+ libowfat/compiler.h libowfat/uint16.h libowfat/uint32.h iarray.h \
+ libowfat/uint64.h havesl.h haveaccept4.h
 socket_accept4_makenonblocking.o: socket/socket_accept4_makenonblocking.c \
  windoze.h socket.h libowfat/compiler.h libowfat/uint16.h \
  libowfat/uint32.h
@@ -778,9 +778,10 @@ socket_accept4_setcloseonexec.o: socket/socket_accept4_setcloseonexec.c \
 socket_accept6.o: socket/socket_accept6.c windoze.h byte.h \
  libowfat/compiler.h socket.h libowfat/uint16.h libowfat/uint32.h ip6.h \
  libowfat/byte.h haveip6.h havesl.h havescope.h
-socket_accept6_flags.o: socket/socket_accept6_flags.c windoze.h byte.h \
- libowfat/compiler.h socket.h libowfat/uint16.h libowfat/uint32.h ip6.h \
- libowfat/byte.h haveip6.h havesl.h havescope.h haveaccept4.h
+socket_accept6_flags.o: socket/socket_accept6_flags.c iarray.h \
+ libowfat/uint64.h windoze.h byte.h libowfat/compiler.h socket.h \
+ libowfat/uint16.h libowfat/uint32.h ip6.h libowfat/byte.h haveip6.h \
+ havesl.h havescope.h haveaccept4.h
 socket_accept6_makenonblocking.o: socket/socket_accept6_makenonblocking.c \
  windoze.h socket.h libowfat/compiler.h libowfat/uint16.h \
  libowfat/uint32.h
@@ -1064,7 +1065,7 @@ t.o: t.c fmt.h libowfat/byte.h libowfat/compiler.h scan.h str.h uint16.h \
  havedevpoll.h havesigio.h
 BYTE_OBJS=byte_chr.o byte_copy.o byte_copyr.o byte_diff.o byte_equal_notimingattack.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_escapecharc.o fmt_escapecharhtml.o fmt_escapecharjson.o fmt_escapecharquotedprintable.o fmt_escapecharquotedprintableutf8.o fmt_escapecharxml.o fmt_fill.o fmt_httpdate.o fmt_human.o fmt_humank.o fmt_iso8601.o fmt_long.o fmt_longlong.o fmt_minus.o fmt_netstring.o fmt_pad.o fmt_pb_double.o fmt_pb_float.o fmt_pb_int.o fmt_pb_sint.o fmt_pb_string.o fmt_pb_tag.o fmt_pb_type0_sint.o fmt_pb_type1_double.o fmt_pb_type1_fixed64.o fmt_pb_type2_string.o fmt_pb_type5_fixed32.o fmt_pb_type5_float.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_varint.o fmt_xlong.o fmt_xlonglong.o fmt_xmlescape.o 
-SCAN_OBJS=scan_8int.o scan_8long.o scan_8longlong.o scan_8longn.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_iso8601.o scan_long.o scan_longlong.o scan_longn.o scan_netstring.o scan_noncharsetnskip.o scan_nonwhitenskip.o scan_pb_tag.o scan_pb_type0_sint.o scan_pb_type1_double.o scan_pb_type1_fixed64.o scan_pb_type2_stringlen.o scan_pb_type5_fixed32.o scan_pb_type5_float.o scan_plusminus.o scan_short.o scan_uint.o scan_ulong.o scan_ulonglong.o scan_ulongn.o scan_ushort.o scan_utf8.o scan_varint.o scan_whitenskip.o scan_xint.o scan_xlong.o scan_xlonglong.o scan_xlongn.o scan_xshort.o 
+SCAN_OBJS=scan_8int.o scan_8long.o scan_8longlong.o scan_8longn.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_iso8601.o scan_long.o scan_longlong.o scan_longn.o scan_netstring.o scan_noncharsetnskip.o scan_nonwhitenskip.o scan_pb_tag.o scan_pb_type0_sint.o scan_pb_type1_double.o scan_pb_type1_fixed64.o scan_pb_type2_stringlen.o scan_pb_type5_fixed32.o scan_pb_type5_float.o scan_plusminus.o scan_short.o scan_uint.o scan_ulong.o scan_ulonglong.o scan_ulongn.o scan_ushort.o scan_utf8.o scan_utf8_sem.o scan_varint.o scan_whitenskip.o scan_xint.o scan_xlong.o scan_xlonglong.o scan_xlongn.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 
@@ -1079,7 +1080,7 @@ DNS_OBJS=dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ip6.o dns_ipq.o dns_ipq6
 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 iarray_length.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_debugstring.o io_dontwantread.o io_dontwantwrite.o io_eagain.o io_eagain_read.o io_eagain_write.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_timedout.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 
+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_debugstring.o io_dontwantread.o io_dontwantwrite.o io_eagain.o io_eagain_read.o io_eagain_write.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_timedout.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 iom_abort.o iom_add.o iom_init.o iom_wait.o 
 TEXTCODE_OBJS=base64.o base64url.o fmt_base64.o fmt_base64url.o fmt_cescape.o fmt_foldwhitespace.o fmt_hexdump.o fmt_html.o fmt_html_tagarg.o fmt_jsonescape.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_xml.o fmt_yenc.o scan_base64.o scan_base64url.o scan_cescape.o scan_hexdump.o scan_html.o scan_jsonescape.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 
 CRITBIT_OBJS=critbit.o 
@@ -1145,6 +1146,7 @@ havesl.h haveinline.h iopause.h select.h havekqueue.h haveepoll.h \
 libepoll havesigio.h havebsdsf.h havesendfile.h havescope.h havedevpoll.h \
 dep libsocket havealloca.h haveuint128.h entities.h ent havepread.h haveaccept4.h \
 *.gcda *.gcno
+	rm -rf libowfat
 
 INCLUDES=buffer.h byte.h fmt.h ip4.h ip6.h mmap.h scan.h socket.h str.h stralloc.h \
 uint16.h uint32.h uint64.h open.h textcode.h tai.h taia.h dns.h iopause.h case.h \
@@ -1180,8 +1182,8 @@ uninstall:
 	rm -f $(patsubst %.3,$(MAN3DIR)/%.3,$(notdir $(wildcard */*.3)))
 	rm -f $(LIBDIR)/libowfat.a
 
-VERSION=libowfat-0.33
-CURNAME=libowfat-0.32
+VERSION=libowfat-0.34
+CURNAME=libowfat-0.34
 
 tar: clean rename
 	rm -f dep libdep
@@ -1333,7 +1335,8 @@ windoze64:
 	$(MAKE) DIET= CROSS=x86_64-w64-mingw32-
 
 update:
-	dl -n http://www.w3.org/TR/html5/entities.json
+#	dl -n https://www.w3.org/TR/html5/entities.json
+	dl -n https://html.spec.whatwg.org/entities.json
 
 entities.h: entities.json ent
 	./ent