fixed some issues in socket address conversion

2018-03-25 03:05:12 +00:00 · 2018-03-25 03:05:12 +00:00 · 5c297d784a
commit 5c297d784a
parent 598f4f0457
48 changed files with 121 additions and 151 deletions
--- a/qse/Makefile.in
+++ b/qse/Makefile.in
@ -166,8 +166,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/README.in \
 	$(top_srcdir)/ac/ar-lib $(top_srcdir)/ac/compile \
 	$(top_srcdir)/ac/config.guess $(top_srcdir)/ac/config.sub \
 	$(top_srcdir)/ac/install-sh $(top_srcdir)/ac/ltmain.sh \
-	$(top_srcdir)/ac/missing ac/ar-lib ac/compile ac/config.guess \
-	ac/config.sub ac/depcomp ac/install-sh ac/ltmain.sh ac/missing
+	$(top_srcdir)/ac/missing README ac/ar-lib ac/compile \
+	ac/config.guess ac/config.sub ac/depcomp ac/install-sh \
+	ac/ltmain.sh ac/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -380,6 +381,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -618,7 +620,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@ -644,7 +646,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@ -662,7 +664,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@ -672,7 +674,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- a/qse/cmd/Makefile.in
+++ b/qse/cmd/Makefile.in
@ -355,6 +355,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/cmd/awk/Makefile.in
+++ b/qse/cmd/awk/Makefile.in
@ -362,6 +362,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/cmd/http/Makefile.in
+++ b/qse/cmd/http/Makefile.in
@ -388,6 +388,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/cmd/sed/Makefile.in
+++ b/qse/cmd/sed/Makefile.in
@ -353,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/cmd/xli/Makefile.in
+++ b/qse/cmd/xli/Makefile.in
@ -353,6 +353,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/configure
+++ b/qse/configure
@ -821,6 +821,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@ -924,6 +925,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1176,6 +1178,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1313,7 +1324,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@ -1466,6 +1477,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@ -22551,24 +22563,6 @@ $as_echo "#define QSE_SA_FAMILY_T_IS_SIGNED 1" >>confdefs.h

 	fi

-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking offset of sa_family in struct sockaddr" >&5
-$as_echo_n "checking offset of sa_family in struct sockaddr... " >&6; }
-	if ac_fn_c_compute_int "$LINENO" "offsetof(struct sockaddr, sa_family)" "ac_cv_offsetof_sa_family"        "#include <stddef.h>
-		 #include <winsock2.h>
-		 #include <ws2tcpip.h>"; then :
-
-else
-  ac_cv_offsteof_sa_family=0
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_offsetof_sa_family" >&5
-$as_echo "$ac_cv_offsetof_sa_family" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define QSE_OFFSETOF_SA_FAMILY ${ac_cv_offsetof_sa_family}
-_ACEOF
-
-
 else
 	# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@ -22914,24 +22908,6 @@ $as_echo "#define QSE_SA_FAMILY_T_IS_SIGNED 1" >>confdefs.h
 fi

 	fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking offset of sa_family in struct sockaddr" >&5
-$as_echo_n "checking offset of sa_family in struct sockaddr... " >&6; }
-	if ac_fn_c_compute_int "$LINENO" "offsetof(struct sockaddr, sa_family)" "ac_cv_offsetof_sa_family"        "#include <stddef.h>
-		 #include <sys/types.h>
-		 #include <sys/socket.h>"; then :
-
-else
-  ac_cv_offsteof_sa_family=0
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_offsetof_sa_family" >&5
-$as_echo "$ac_cv_offsetof_sa_family" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define QSE_OFFSETOF_SA_FAMILY ${ac_cv_offsetof_sa_family}
-_ACEOF
-
 fi

 # The cast to long int works around a bug in the HP C Compiler
--- a/qse/configure.ac
+++ b/qse/configure.ac
@ -487,15 +487,6 @@ then
 			 #include <ws2tcpip.h>])
 	fi

-	AC_MSG_CHECKING([offset of sa_family in struct sockaddr])
-	AC_COMPUTE_INT([ac_cv_offsetof_sa_family],
-		[[offsetof(struct sockaddr, sa_family)]],
-		[#include <stddef.h>
-		 #include <winsock2.h>
-		 #include <ws2tcpip.h>], [ac_cv_offsteof_sa_family=0])
-	AC_MSG_RESULT([$ac_cv_offsetof_sa_family])
-	AC_DEFINE_UNQUOTED(QSE_OFFSETOF_SA_FAMILY, ${ac_cv_offsetof_sa_family}, [offsetof(struct sockaddr, sa_family)])
-
 else
 	AC_CHECK_SIZEOF(struct sockaddr_in,,[
 		#include <sys/types.h>
@ -542,15 +533,6 @@ else
 			 #include <sys/socket.h>
 			 #include <netinet/in.h>])
 	fi
-
-	AC_MSG_CHECKING([offset of sa_family in struct sockaddr])
-	AC_COMPUTE_INT([ac_cv_offsetof_sa_family],
-		[[offsetof(struct sockaddr, sa_family)]],
-		[#include <stddef.h>
-		 #include <sys/types.h>
-		 #include <sys/socket.h>], [ac_cv_offsteof_sa_family=0])
-	AC_MSG_RESULT([$ac_cv_offsetof_sa_family])
-	AC_DEFINE_UNQUOTED(QSE_OFFSETOF_SA_FAMILY, ${ac_cv_offsetof_sa_family}, [offsetof(struct sockaddr, sa_family)])
 fi

 AC_CHECK_SIZEOF(struct iovec,,[#include <sys/uio.h>])
--- a/qse/doc/Makefile.in
+++ b/qse/doc/Makefile.in
@ -298,6 +298,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/Makefile.in
+++ b/qse/include/Makefile.in
@ -356,6 +356,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/Makefile.in
+++ b/qse/include/qse/Makefile.in
@ -396,6 +396,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/awk/Makefile.in
+++ b/qse/include/qse/awk/Makefile.in
@ -347,6 +347,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/cmn/Makefile.in
+++ b/qse/include/qse/cmn/Makefile.in
@ -361,6 +361,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/config.h.in
+++ b/qse/include/qse/config.h.in
@ -987,9 +987,6 @@
 /* offsetof(struct iovec, iov_len) */
 #undef QSE_OFFSETOF_IOV_LEN

-/* offsetof(struct sockaddr, sa_family) */
-#undef QSE_OFFSETOF_SA_FAMILY
-
 /* Author */
 #undef QSE_PACKAGE_AUTHOR

--- a/qse/include/qse/cry/Makefile.in
+++ b/qse/include/qse/cry/Makefile.in
@ -345,6 +345,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/dhcp/Makefile.in
+++ b/qse/include/qse/dhcp/Makefile.in
@ -345,6 +345,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/http/Makefile.in
+++ b/qse/include/qse/http/Makefile.in
@ -345,6 +345,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/rad/Makefile.in
+++ b/qse/include/qse/rad/Makefile.in
@ -345,6 +345,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/sed/Makefile.in
+++ b/qse/include/qse/sed/Makefile.in
@ -347,6 +347,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/si/Makefile.in
+++ b/qse/include/qse/si/Makefile.in
@ -357,6 +357,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/include/qse/si/nwad.h
+++ b/qse/include/qse/si/nwad.h
@ -194,18 +194,7 @@ struct qse_skad_t
 #	undef QSE_SKAD_DATA_SIZE
 #	define QSE_SKAD_DATA_SIZE QSE_SIZEOF(qse_nwad_t)
 #endif
-	/* TODO: is this large enough?? */
-	union
-	{
-		struct
-		{
-		#if defined(QSE_OFFSETOF_SA_FAMILY) && (QSE_OFFSET_OF_SA_FAMILY > 0)
-			qse_uint8_t filler[QSE_OFFSETOF_SA_FAMILY];
-		#endif
-			qse_skaf_t family;
-		} sa;
 	qse_uint8_t data[QSE_SKAD_DATA_SIZE];
-	} u;

 	/* dummy member to secure extra space and force structure alignment */
 	qse_uintptr_t dummy; 
--- a/qse/include/qse/xli/Makefile.in
+++ b/qse/include/qse/xli/Makefile.in
@ -345,6 +345,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/Makefile.in
+++ b/qse/lib/Makefile.in
@ -390,6 +390,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/awk/Makefile.in
+++ b/qse/lib/awk/Makefile.in
@ -546,6 +546,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/cmn/Makefile.in
+++ b/qse/lib/cmn/Makefile.in
@ -443,6 +443,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/cry/Makefile.in
+++ b/qse/lib/cry/Makefile.in
@ -377,6 +377,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/dhcp/Makefile.in
+++ b/qse/lib/dhcp/Makefile.in
@ -376,6 +376,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/http/Makefile.in
+++ b/qse/lib/http/Makefile.in
@ -384,6 +384,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/rad/Makefile.in
+++ b/qse/lib/rad/Makefile.in
@ -377,6 +377,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/sed/Makefile.in
+++ b/qse/lib/sed/Makefile.in
@ -408,6 +408,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/si/Makefile.in
+++ b/qse/lib/si/Makefile.in
@ -423,6 +423,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/lib/si/nwad-skad.c
+++ b/qse/lib/si/nwad-skad.c
@ -83,36 +83,24 @@

 union sockaddr_t
 {
-#if defined(AF_INET) || defined(AF_INET6) || defined(AF_UNIX)
-	#if defined(AF_INET)
+	struct sockaddr sa;
+#if (QSE_SIZEOF_STRUCT_SOCKADDR_IN > 0)
 	struct sockaddr_in in4;
-	#endif
-	#if defined(AF_INET6)
+#endif
+#if (QSE_SIZEOF_STRUCT_SOCKADDR_IN6 > 0)
 	struct sockaddr_in6 in6;
-	#endif
-	#if defined(AF_UNIX)
+#endif
+#if (QSE_SIZEOF_STRUCT_SOCKADDR_UN > 0)
 	struct sockaddr_un un;
-	#endif
-#else
-	int dummy;
+#endif
+#if (QSE_SIZEOF_STRUCT_SOCKADDR_LL > 0)
+	struct sockaddr_ll ll;
 #endif
 };

 typedef union sockaddr_t sockaddr_t;

-/*
-#if defined(AF_INET)
-#	define FAMILY(x) (((struct sockaddr_in*)(x))->sin_family)
-#elif defined(AF_INET6)
-#	define FAMILY(x) (((struct sockaddr_in6*)(x))->sin6_family)
-#elif defined(AF_UNIX)
-#	define FAMILY(x) (((struct sockaddr_un*)(x))->sun_family)
-#else
-#	define FAMILY(x) (-1)
-#endif
-*/
-
-#define FAMILY(x) (((qse_skad_t*)x)->u.sa.family)
+#define FAMILY(x) (((struct sockaddr*)(x))->sa_family)

 static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)
 {
@ -120,7 +108,7 @@ static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)

 	switch (FAMILY(skad))
 	{
-#if defined(AF_INET)
+	#if defined(AF_INET)
 		case AF_INET:
 		{
 			struct sockaddr_in* in;
@ -133,9 +121,9 @@ static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)
 			nwad->u.in4.port = in->sin_port;
 			break;
 		}
-#endif
+	#endif

-#if defined(AF_INET6)
+	#if defined(AF_INET6)
 		case AF_INET6:
 		{
 			struct sockaddr_in6* in;
@ -151,9 +139,9 @@ static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)
 			nwad->u.in6.port = in->sin6_port;
 			break;
 		}
-#endif
+	#endif

-#if defined(AF_UNIX)
+	#if defined(AF_UNIX)
 		case AF_UNIX:
 		{
 			struct sockaddr_un* un;
@ -167,14 +155,14 @@ static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)
 		#else
 			{
 				qse_size_t wcslen, mbslen;
-				mbslen = QSE_COUNTOF(nwad->u.local.path);
-				qse_wcstombs (un->sun_path, &wcslen, nwad->u.local.path, &mbslen);
+				wcslen = QSE_COUNTOF(nwad->u.local.path);
+				qse_mbstowcs (un->sun_path, &mbslen, nwad->u.local.path, &wcslen);
 				/* don't care about conversion errors */
 			}
 		#endif
 			break;
 		}
-#endif
+	#endif
 		default:
 			break;
 	}
@ -190,7 +178,7 @@ static QSE_INLINE int nwad_to_skad (const qse_nwad_t* nwad, sockaddr_t* skad)
 	{
 		case QSE_NWAD_IN4:
 		{
-#if defined(AF_INET)
+		#if defined(AF_INET)
 			struct sockaddr_in* in;

 			in = (struct sockaddr_in*)skad;
@ -200,13 +188,13 @@ static QSE_INLINE int nwad_to_skad (const qse_nwad_t* nwad, sockaddr_t* skad)
 			in->sin_family = AF_INET;
 			in->sin_addr.s_addr = nwad->u.in4.addr.value;
 			in->sin_port = nwad->u.in4.port;
-#endif
+		#endif
 			break;
 		}

 		case QSE_NWAD_IN6:
 		{
-#if defined(AF_INET6)
+		#if defined(AF_INET6)
 			struct sockaddr_in6* in;

 			in = (struct sockaddr_in6*)skad;
@ -219,14 +207,14 @@ static QSE_INLINE int nwad_to_skad (const qse_nwad_t* nwad, sockaddr_t* skad)
 			in->sin6_scope_id = nwad->u.in6.scope;
 		#endif
 			in->sin6_port = nwad->u.in6.port;
-#endif
+		#endif
 			break;
 		}


 		case QSE_NWAD_LOCAL:
 		{
-#if defined(AF_UNIX)
+		#if defined(AF_UNIX)
 			struct sockaddr_un* un;

 			un = (struct sockaddr_un*)skad;
@ -245,7 +233,7 @@ static QSE_INLINE int nwad_to_skad (const qse_nwad_t* nwad, sockaddr_t* skad)
 			}

 		#endif
-#endif
+		#endif
 			break;
 		}

@ -274,39 +262,27 @@ int qse_skadfamily (const qse_skad_t* skad)

 int qse_skadsize (const qse_skad_t* skad)
 {
+	sockaddr_t* sa = (sockaddr_t*)skad;
+	QSE_ASSERT (QSE_SIZEOF(*skad) >= QSE_SIZEOF(*sa));
+
 	switch (FAMILY(skad))
 	{
 	#if defined(AF_INET)
-		case AF_INET:
-		{
-			struct sockaddr_in in;
-			return QSE_SIZEOF(in);
-		}
+		case AF_INET: return QSE_SIZEOF(sa->in4);
 	#endif

 	#if defined(AF_INET6)
-		case AF_INET6:
-		{
-			struct sockaddr_in6 in6;
-			return QSE_SIZEOF(in6);
-		}
-	#endif
-
-	#if defined(AF_PACKET)
-		case AF_PACKET:
-		{
-			struct sockaddr_ll ll;
-			return QSE_SIZEOF(ll);
-		}
+		case AF_INET6: return QSE_SIZEOF(sa->in6);
 	#endif

 	#if defined(AF_UNIX)
-		case AF_UNIX:
-		{
-			struct sockaddr_un un;
-			return QSE_SIZEOF(un);
-		}
+		case AF_UNIX: return QSE_SIZEOF(sa->un);
 	#endif
+
+	#if defined(AF_PACKET)
+		case AF_PACKET: return QSE_SIZEOF(sa->ll);
+	#endif
+
 	}

 	return 0;
--- a/qse/lib/xli/Makefile.in
+++ b/qse/lib/xli/Makefile.in
@ -377,6 +377,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/libltdl/Makefile.in
+++ b/qse/libltdl/Makefile.in
@ -279,17 +279,12 @@ CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
-	$(top_srcdir)/../ac/compile \
-	$(top_srcdir)/../ac/config.guess \
-	$(top_srcdir)/../ac/config.sub \
-	$(top_srcdir)/../ac/depcomp \
-	$(top_srcdir)/../ac/install-sh \
-	$(top_srcdir)/../ac/ltmain.sh \
-	$(top_srcdir)/../ac/missing ../ac/compile \
-	../ac/config.guess ../ac/config.sub \
-	../ac/depcomp ../ac/install-sh \
-	../ac/ltmain.sh \
-	../ac/missing COPYING.LIB \
+	$(top_srcdir)/../ac/compile $(top_srcdir)/../ac/config.guess \
+	$(top_srcdir)/../ac/config.sub $(top_srcdir)/../ac/depcomp \
+	$(top_srcdir)/../ac/install-sh $(top_srcdir)/../ac/ltmain.sh \
+	$(top_srcdir)/../ac/missing ../ac/ar-lib ../ac/compile \
+	../ac/config.guess ../ac/config.sub ../ac/depcomp \
+	../ac/install-sh ../ac/ltmain.sh ../ac/missing COPYING.LIB \
 	README lt__argz.c lt__dirent.c lt__strl.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@ -425,6 +420,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@ -935,7 +931,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@ -961,7 +957,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@ -979,7 +975,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@ -989,7 +985,7 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
--- a/qse/libltdl/configure
+++ b/qse/libltdl/configure
@ -745,6 +745,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@ -827,6 +828,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1079,6 +1081,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1216,7 +1227,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@ -1369,6 +1380,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
--- a/qse/regress/Makefile.in
+++ b/qse/regress/Makefile.in
@ -356,6 +356,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/regress/awk/Makefile.in
+++ b/qse/regress/awk/Makefile.in
@ -298,6 +298,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/regress/sed/Makefile.in
+++ b/qse/regress/sed/Makefile.in
@ -300,6 +300,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/Makefile.in
+++ b/qse/samples/Makefile.in
@ -356,6 +356,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/awk/Makefile.in
+++ b/qse/samples/awk/Makefile.in
@ -480,6 +480,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/cmn/Makefile.in
+++ b/qse/samples/cmn/Makefile.in
@ -555,6 +555,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/cry/Makefile.in
+++ b/qse/samples/cry/Makefile.in
@ -351,6 +351,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/dhcp/Makefile.in
+++ b/qse/samples/dhcp/Makefile.in
@ -351,6 +351,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/http/Makefile.in
+++ b/qse/samples/http/Makefile.in
@ -352,6 +352,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/rad/Makefile.in
+++ b/qse/samples/rad/Makefile.in
@ -351,6 +351,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/sed/Makefile.in
+++ b/qse/samples/sed/Makefile.in
@ -391,6 +391,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/samples/si/Makefile.in
+++ b/qse/samples/si/Makefile.in
@ -483,6 +483,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/qse/tools/Makefile.in
+++ b/qse/tools/Makefile.in
@ -298,6 +298,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@