diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl index ae740f63..6dfd8ce7 100644 --- a/qse/bld/qse.bkl +++ b/qse/bld/qse.bkl @@ -186,8 +186,6 @@ mbwc.c mbwc-str.c mem.c - nwad.c - nwad-skad.c oht.c opt.c path-base.c @@ -197,7 +195,6 @@ pma.c rbt.c rex.c - sck.c sll.c slmb.c str-beg.c @@ -252,11 +249,14 @@ intr.c mtx.c mux.c + nwad.c + nwad-skad.c nwif.c nwif-cfg.c nwio.c pio.c rwl.c + sck.c sio.c task.c thr.c diff --git a/qse/cmd/awk/Makefile.am b/qse/cmd/awk/Makefile.am index 28625a3d..3c66cad6 100644 --- a/qse/cmd/awk/Makefile.am +++ b/qse/cmd/awk/Makefile.am @@ -19,8 +19,8 @@ bin_PROGRAMS = qseawk qseawk_SOURCES = awk.c qseawk_CFLAGS = $(PTHREAD_CFLAGS) -qseawk_LDFLAGS = -L../../lib/awk -L../../lib/sys -L../../lib/cmn -qseawk_LDADD = -lqseawk -lqsesys -lqsecmn $(LIBM) $(LIBLTDL) $(PTHREAD_LIBS) +qseawk_LDFLAGS = -L../../lib/awk -L../../lib/si -L../../lib/cmn +qseawk_LDADD = -lqseawk -lqsesi -lqsecmn $(LIBM) $(LIBLTDL) $(PTHREAD_LIBS) if WIN32 if WCHAR diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index f01b1bd4..1f707a91 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -362,9 +362,9 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(LTDLINCL) $(am__append_1) $(am__append_2) qseawk_SOURCES = awk.c qseawk_CFLAGS = $(PTHREAD_CFLAGS) -qseawk_LDFLAGS = -L../../lib/awk -L../../lib/sys -L../../lib/cmn \ +qseawk_LDFLAGS = -L../../lib/awk -L../../lib/si -L../../lib/cmn \ $(am__append_4) -qseawk_LDADD = -lqseawk -lqsesys -lqsecmn $(LIBM) $(LIBLTDL) \ +qseawk_LDADD = -lqseawk -lqsesi -lqsecmn $(LIBM) $(LIBLTDL) \ $(PTHREAD_LIBS) $(am__append_3) $(am__append_5) all: all-am diff --git a/qse/cmd/http/Makefile.am b/qse/cmd/http/Makefile.am index b045ae9b..9c5f0522 100644 --- a/qse/cmd/http/Makefile.am +++ b/qse/cmd/http/Makefile.am @@ -11,8 +11,8 @@ qsecfg_DATA = httpd.conf httpd-mime.conf bin_PROGRAMS = qsehttpd qseursd qsehttpd_SOURCES = httpd.c -qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/sys -L../../lib/io -L../../lib/cmn -qsehttpd_LDADD = -lqsexli -lqsehttp -lqseio -lqsesys -lqsecmn +qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/io -L../../lib/cmn +qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn if WIN32 if WCHAR @@ -21,7 +21,7 @@ endif endif qseursd_SOURCES = ursd.c -qseursd_LDFLAGS = -L../../lib/sys -L../../lib/io -L../../lib/cmn -qseursd_LDADD = -lqseio -lqsesys -lqsecmn +qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn +qseursd_LDADD = -lqsesi -lqsecmn EXTRA_DIST = $(qsecfg_DATA) diff --git a/qse/cmd/http/Makefile.in b/qse/cmd/http/Makefile.in index f1fea29a..b6e7689d 100644 --- a/qse/cmd/http/Makefile.in +++ b/qse/cmd/http/Makefile.in @@ -391,12 +391,11 @@ AM_CPPFLAGS = \ qsecfgdir = $(sysconfdir)/qse qsecfg_DATA = httpd.conf httpd-mime.conf qsehttpd_SOURCES = httpd.c -qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/sys -L../../lib/io -L../../lib/cmn -qsehttpd_LDADD = -lqsexli -lqsehttp -lqseio -lqsesys -lqsecmn \ - $(am__append_1) +qsehttpd_LDFLAGS = -L../../lib/xli -L../../lib/http -L../../lib/si -L../../lib/io -L../../lib/cmn +qsehttpd_LDADD = -lqsexli -lqsehttp -lqsesi -lqsecmn $(am__append_1) qseursd_SOURCES = ursd.c -qseursd_LDFLAGS = -L../../lib/sys -L../../lib/io -L../../lib/cmn -qseursd_LDADD = -lqseio -lqsesys -lqsecmn +qseursd_LDFLAGS = -L../../lib/si -L../../lib/io -L../../lib/cmn +qseursd_LDADD = -lqsesi -lqsecmn EXTRA_DIST = $(qsecfg_DATA) all: all-am diff --git a/qse/cmd/http/ursd.c b/qse/cmd/http/ursd.c index ea44b314..cee01d7e 100644 --- a/qse/cmd/http/ursd.c +++ b/qse/cmd/http/ursd.c @@ -9,12 +9,12 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/qse/cmd/sed/Makefile.am b/qse/cmd/sed/Makefile.am index 5e84c0ac..5dba3181 100644 --- a/qse/cmd/sed/Makefile.am +++ b/qse/cmd/sed/Makefile.am @@ -8,8 +8,8 @@ bin_PROGRAMS = qsesed qsesed_SOURCES = sed.c qsesed_CFLAGS = $(PTHREAD_CFLAGS) -qsesed_LDFLAGS = -L../../lib/sed -L../../lib/sys -L../../lib/cmn -qsesed_LDADD = -lqsesed -lqsesys -lqsecmn $(PTHREAD_LIBS) +qsesed_LDFLAGS = -L../../lib/sed -L../../lib/si -L../../lib/cmn +qsesed_LDADD = -lqsesed -lqsesi -lqsecmn $(PTHREAD_LIBS) if WIN32 if WCHAR diff --git a/qse/cmd/sed/Makefile.in b/qse/cmd/sed/Makefile.in index 250c9cf1..a52cf2bc 100644 --- a/qse/cmd/sed/Makefile.in +++ b/qse/cmd/sed/Makefile.in @@ -355,8 +355,8 @@ AM_CPPFLAGS = \ qsesed_SOURCES = sed.c qsesed_CFLAGS = $(PTHREAD_CFLAGS) -qsesed_LDFLAGS = -L../../lib/sed -L../../lib/sys -L../../lib/cmn -qsesed_LDADD = -lqsesed -lqsesys -lqsecmn $(PTHREAD_LIBS) \ +qsesed_LDFLAGS = -L../../lib/sed -L../../lib/si -L../../lib/cmn +qsesed_LDADD = -lqsesed -lqsesi -lqsecmn $(PTHREAD_LIBS) \ $(am__append_1) all: all-am diff --git a/qse/cmd/xli/Makefile.am b/qse/cmd/xli/Makefile.am index c477c597..bc9be0ef 100644 --- a/qse/cmd/xli/Makefile.am +++ b/qse/cmd/xli/Makefile.am @@ -7,8 +7,8 @@ AM_CPPFLAGS = \ bin_PROGRAMS = qsexli qsexli_SOURCES = xli.c -qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn -qsexli_LDADD = -lqsexli -lqsecmn +qsexli_LDFLAGS = -L../../lib/xli -L../../lib/si -L../../lib/cmn +qsexli_LDADD = -lqsexli -lqsesi -lqsecmn if WIN32 if WCHAR diff --git a/qse/cmd/xli/Makefile.in b/qse/cmd/xli/Makefile.in index bba58959..391d6d69 100644 --- a/qse/cmd/xli/Makefile.in +++ b/qse/cmd/xli/Makefile.in @@ -354,8 +354,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include qsexli_SOURCES = xli.c -qsexli_LDFLAGS = -L../../lib/xli -L../../lib/cmn -qsexli_LDADD = -lqsexli -lqsecmn $(am__append_1) +qsexli_LDFLAGS = -L../../lib/xli -L../../lib/si -L../../lib/cmn +qsexli_LDADD = -lqsexli -lqsesi -lqsecmn $(am__append_1) all: all-am .SUFFIXES: diff --git a/qse/include/qse/http/httpd.h b/qse/include/qse/http/httpd.h index bece6938..5dfae268 100644 --- a/qse/include/qse/http/httpd.h +++ b/qse/include/qse/http/httpd.h @@ -31,10 +31,10 @@ #include #include #include -#include #include #include #include +#include typedef struct qse_httpd_t qse_httpd_t; typedef struct qse_httpd_mate_t qse_httpd_mate_t; diff --git a/qse/include/qse/http/upxd.h b/qse/include/qse/http/upxd.h index c6111f43..6ea00ec4 100644 --- a/qse/include/qse/http/upxd.h +++ b/qse/include/qse/http/upxd.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include typedef struct qse_upxd_t qse_upxd_t; diff --git a/qse/include/qse/si/Socket.hpp b/qse/include/qse/si/Socket.hpp index 9e63c14a..6f824ec3 100644 --- a/qse/include/qse/si/Socket.hpp +++ b/qse/include/qse/si/Socket.hpp @@ -24,11 +24,11 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_SYS_SOCKET_HPP_ -#define _QSE_SYS_SOCKET_HPP_ +#ifndef _QSE_SI_SOCKET_HPP_ +#define _QSE_SI_SOCKET_HPP_ #include -#include +#include ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/include/qse/si/SocketAddress.hpp b/qse/include/qse/si/SocketAddress.hpp index 25ae561a..a7231a0e 100644 --- a/qse/include/qse/si/SocketAddress.hpp +++ b/qse/include/qse/si/SocketAddress.hpp @@ -24,10 +24,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_SYS_SOCKETADDRESS_HPP_ -#define _QSE_SYS_SOCKETADDRESS_HPP_ +#ifndef _QSE_SI_SOCKETADDRESS_HPP_ +#define _QSE_SI_SOCKETADDRESS_HPP_ -#include +#include ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/include/qse/si/fio.h b/qse/include/qse/si/fio.h index 08456ed2..07b08246 100644 --- a/qse/include/qse/si/fio.h +++ b/qse/include/qse/si/fio.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_FIO_H_ -#define _QSE_CMN_FIO_H_ +#ifndef _QSE_SI_FIO_H_ +#define _QSE_SI_FIO_H_ /** @file * This file defines a simple file I/O interface. diff --git a/qse/include/qse/si/nwad.h b/qse/include/qse/si/nwad.h index 39298d57..f2412897 100644 --- a/qse/include/qse/si/nwad.h +++ b/qse/include/qse/si/nwad.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_NWAD_H_ -#define _QSE_CMN_NWAD_H_ +#ifndef _QSE_SI_NWAD_H_ +#define _QSE_SI_NWAD_H_ /** \file * This file defines functions and data types for handling diff --git a/qse/include/qse/si/nwif.h b/qse/include/qse/si/nwif.h index 8cef4dc2..3934588d 100644 --- a/qse/include/qse/si/nwif.h +++ b/qse/include/qse/si/nwif.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_NWIF_H_ -#define _QSE_CMN_NWIF_H_ +#ifndef _QSE_SI_NWIF_H_ +#define _QSE_SI_NWIF_H_ #include #include diff --git a/qse/include/qse/si/nwio.h b/qse/include/qse/si/nwio.h index 7b87d2b7..b43a14cc 100644 --- a/qse/include/qse/si/nwio.h +++ b/qse/include/qse/si/nwio.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_NWIO_H_ -#define _QSE_CMN_NWIO_H_ +#ifndef _QSE_SI_NWIO_H_ +#define _QSE_SI_NWIO_H_ /** @file * This file defines a network-based text I/O interface. diff --git a/qse/include/qse/si/pio.h b/qse/include/qse/si/pio.h index 8d095bd2..481bbeff 100644 --- a/qse/include/qse/si/pio.h +++ b/qse/include/qse/si/pio.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_PIO_H_ -#define _QSE_CMN_PIO_H_ +#ifndef _QSE_SI_PIO_H_ +#define _QSE_SI_PIO_H_ #include #include diff --git a/qse/include/qse/si/sio.h b/qse/include/qse/si/sio.h index f1b317d1..d0cf6378 100644 --- a/qse/include/qse/si/sio.h +++ b/qse/include/qse/si/sio.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_SIO_H_ -#define _QSE_CMN_SIO_H_ +#ifndef _QSE_SI_SIO_H_ +#define _QSE_SI_SIO_H_ /** @file * This file defines a simple stream I/O interface. diff --git a/qse/include/qse/si/task.h b/qse/include/qse/si/task.h index 4d46ce00..8322f942 100644 --- a/qse/include/qse/si/task.h +++ b/qse/include/qse/si/task.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_TASK_H_ -#define _QSE_CMN_TASK_H_ +#ifndef _QSE_SI_TASK_H_ +#define _QSE_SI_TASK_H_ #include #include diff --git a/qse/include/qse/si/thr.h b/qse/include/qse/si/thr.h index 4fc5a625..2c6372a9 100644 --- a/qse/include/qse/si/thr.h +++ b/qse/include/qse/si/thr.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_THR_H_ -#define _QSE_CMN_THR_H_ +#ifndef _QSE_SI_THR_H_ +#define _QSE_SI_THR_H_ #include #include diff --git a/qse/include/qse/si/tio.h b/qse/include/qse/si/tio.h index f9d413b3..64da57d0 100644 --- a/qse/include/qse/si/tio.h +++ b/qse/include/qse/si/tio.h @@ -24,8 +24,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _QSE_CMN_TIO_H_ -#define _QSE_CMN_TIO_H_ +#ifndef _QSE_SI_TIO_H_ +#define _QSE_SI_TIO_H_ /** @file * This file provides an interface to a text stream processor. diff --git a/qse/lib/awk/Makefile.am b/qse/lib/awk/Makefile.am index 1a0254ff..915b6733 100644 --- a/qse/lib/awk/Makefile.am +++ b/qse/lib/awk/Makefile.am @@ -4,7 +4,7 @@ CPPFLAGS_ALL_COMMON = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include -LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined +LDFLAGS_ALL_COMMON = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined ################################################## # MAIN LIBRARY @@ -12,7 +12,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -LIBADD_LIB_COMMON = -lqsecmn -lqseio $(LIBM) $(LIBLTDL) +LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(LIBLTDL) if WIN32 # you must adjust the value of DEFAULT_MODPOSTFIX according diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index a3ce4f48..968d3c75 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -544,7 +544,7 @@ CPPFLAGS_ALL_COMMON = \ -I$(top_builddir)/include \ -I$(top_srcdir)/include -LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined +LDFLAGS_ALL_COMMON = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined ################################################## # MAIN LIBRARY @@ -552,7 +552,7 @@ LDFLAGS_ALL_COMMON = -L. -L../cmn -L../io -version-info 1:0:0 -no-undefined CPPFLAGS_LIB_COMMON = $(CPPFLAGS_ALL_COMMON) $(LTDLINCL) \ $(am__append_1) $(am__append_2) LDFLAGS_LIB_COMMON = $(LDFLAGS_ALL_COMMON) -LIBADD_LIB_COMMON = -lqsecmn -lqseio $(LIBM) $(LIBLTDL) +LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(LIBLTDL) lib_LTLIBRARIES = libqseawk.la $(am__append_3) libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c \ fnc.c misc.c rio.c std.c awk.h err.h rio.h val.h fnc.h misc.h \ diff --git a/qse/lib/awk/mod-sys.c b/qse/lib/awk/mod-sys.c index 3afb7653..056f56d8 100644 --- a/qse/lib/awk/mod-sys.c +++ b/qse/lib/awk/mod-sys.c @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include #include #include "../cmn/mem.h" diff --git a/qse/lib/http/httpd-std.c b/qse/lib/http/httpd-std.c index abb2f864..b5d4bcef 100644 --- a/qse/lib/http/httpd-std.c +++ b/qse/lib/http/httpd-std.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #define STAT_REG 1 #define STAT_DIR 2 diff --git a/qse/lib/si/Makefile.am b/qse/lib/si/Makefile.am index d0d5f6df..68db9a28 100644 --- a/qse/lib/si/Makefile.am +++ b/qse/lib/si/Makefile.am @@ -32,7 +32,7 @@ libqsesi_la_SOURCES = \ libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS) libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined -libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) +libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS) if ENABLE_CXX lib_LTLIBRARIES += libqsesixx.la diff --git a/qse/lib/si/Makefile.in b/qse/lib/si/Makefile.in index 6fbf1af0..3437de52 100644 --- a/qse/lib/si/Makefile.in +++ b/qse/lib/si/Makefile.in @@ -127,7 +127,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libqsesi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libqsesi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libqsesi_la_OBJECTS = libqsesi_la-aio.lo libqsesi_la-aio-pro.lo \ libqsesi_la-aio-sck.lo libqsesi_la-aio-tmr.lo \ libqsesi_la-cnd.lo libqsesi_la-fio.lo libqsesi_la-intr.lo \ @@ -441,7 +441,7 @@ libqsesi_la_SOURCES = \ libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS) libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined -libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) +libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS) @ENABLE_CXX_TRUE@libqsesixx_la_SOURCES = \ @ENABLE_CXX_TRUE@ SocketAddress.cpp \ @ENABLE_CXX_TRUE@ Socket.cpp diff --git a/qse/lib/si/nwif-cfg.c b/qse/lib/si/nwif-cfg.c index 88a45ce4..e2bc3d5d 100644 --- a/qse/lib/si/nwif-cfg.c +++ b/qse/lib/si/nwif-cfg.c @@ -52,7 +52,7 @@ #elif defined(__DOS__) /* TODO: */ #else -# include "syscall.h" +# include "../cmn/syscall.h" # include # include # if defined(HAVE_SYS_IOCTL_H) diff --git a/qse/lib/si/nwif.c b/qse/lib/si/nwif.c index 7680369c..0c696893 100644 --- a/qse/lib/si/nwif.c +++ b/qse/lib/si/nwif.c @@ -36,7 +36,7 @@ #elif defined(__DOS__) /* TODO: */ #else -# include "syscall.h" +# include "../cmn/syscall.h" # include # if defined(HAVE_SYS_IOCTL_H) # include diff --git a/qse/lib/si/sck.c b/qse/lib/si/sck.c index 066a1a41..0a4ba729 100644 --- a/qse/lib/si/sck.c +++ b/qse/lib/si/sck.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #if defined(_WIN32) # include @@ -50,12 +50,12 @@ #elif defined(HAVE_T_CONNECT) && !defined(HAVE_CONNECT) && defined(HAVE_TIUSER_H) -# include "syscall.h" +# include "../cmn/syscall.h" # include # define USE_TLI #else -# include "syscall.h" +# include "../cmn/syscall.h" # include # include # if defined(HAVE_NETINET_SCTP_H)