From 870ee3e362c67419ed4d0322a101d8cc7c066338 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 5 Sep 2012 10:40:58 +0000 Subject: [PATCH] reorganized some error codes. added ssl library check to configure.ac corrected wrong function definitions in chr.h added MPI_NODE --- qse/Makefile.in | 1 + qse/cmd/Makefile.in | 1 + qse/cmd/awk/Makefile.in | 1 + qse/cmd/sed/Makefile.in | 1 + qse/cmd/stx/Makefile.in | 1 + qse/configure | 44 +++++++++++++++++++ qse/configure.ac | 5 +++ qse/doc/Makefile.in | 1 + qse/doc/image/Makefile.in | 1 + qse/doc/page/Makefile.in | 1 + qse/include/Makefile.in | 1 + qse/include/qse/Makefile.in | 1 + qse/include/qse/awk/Makefile.in | 1 + qse/include/qse/awk/awk.h | 5 ++- qse/include/qse/cmn/Makefile.in | 1 + qse/include/qse/cmn/chr.h | 26 +++++------ qse/include/qse/cmn/fio.h | 10 ++--- qse/include/qse/cmn/fs.h | 11 +++-- qse/include/qse/cmn/nwio.h | 10 ++--- qse/include/qse/cmn/pio.h | 10 ++--- qse/include/qse/cmn/rex.h | 5 +++ qse/include/qse/cmn/sio.h | 10 ++--- qse/include/qse/cmn/tio.h | 24 ++++++----- qse/include/qse/cmn/tre.h | 5 +++ qse/include/qse/net/Makefile.in | 1 + qse/include/qse/net/htrd.h | 5 +++ qse/include/qse/net/httpd.h | 12 +++--- qse/include/qse/net/upxd.h | 12 +++--- qse/include/qse/sed/Makefile.in | 1 + qse/include/qse/sed/sed.h | 5 ++- qse/include/qse/stx/Makefile.in | 1 + qse/lib/Makefile.in | 1 + qse/lib/awk/Makefile.in | 1 + qse/lib/awk/err.c | 5 ++- qse/lib/awk/mpi.c | 73 +++++++++++++++++++++++-------- qse/lib/cmn/Makefile.in | 1 + qse/lib/cmn/glob.c | 1 - qse/lib/net/Makefile.in | 1 + qse/lib/sed/Makefile.in | 1 + qse/lib/sed/err.c | 4 +- qse/lib/stx/Makefile.in | 1 + qse/regress/Makefile.in | 1 + qse/regress/awk/Makefile.in | 1 + qse/regress/awk/lang-033.awk | 2 +- qse/regress/awk/regress.out | 76 ++++++++++++++++----------------- qse/regress/awk/regress.out.xma | 76 ++++++++++++++++----------------- qse/regress/awk/regress.sh.in | 2 +- qse/regress/sed/Makefile.in | 1 + qse/samples/Makefile.in | 1 + qse/samples/awk/Makefile.in | 1 + qse/samples/cmn/Makefile.in | 1 + qse/samples/net/Makefile.am | 3 +- qse/samples/net/Makefile.in | 8 ++-- qse/samples/sed/Makefile.in | 1 + qse/tools/Makefile.in | 1 + 55 files changed, 307 insertions(+), 171 deletions(-) diff --git a/qse/Makefile.in b/qse/Makefile.in index d6fff36f..bfdb643a 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -202,6 +202,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index c830e8d0..00a7f1f0 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -183,6 +183,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index b4b2775b..ae663b51 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -186,6 +186,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/cmd/sed/Makefile.in b/qse/cmd/sed/Makefile.in index 1f16d927..dde3dbec 100644 --- a/qse/cmd/sed/Makefile.in +++ b/qse/cmd/sed/Makefile.in @@ -172,6 +172,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/cmd/stx/Makefile.in b/qse/cmd/stx/Makefile.in index 7de27287..1505e14e 100644 --- a/qse/cmd/stx/Makefile.in +++ b/qse/cmd/stx/Makefile.in @@ -172,6 +172,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/configure b/qse/configure index f760f86f..46930664 100755 --- a/qse/configure +++ b/qse/configure @@ -645,6 +645,7 @@ HAVE_C_MPI_TRUE MPI_CLDFLAGS MPI_CFLAGS MPICC +SSL_LIBS UNICOWS_LIBS SENDFILE_LIBS SOCKET_LIBS @@ -16679,6 +16680,48 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SSL_library_init (); +int +main () +{ +return SSL_library_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ssl_SSL_library_init=yes +else + ac_cv_lib_ssl_SSL_library_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : + SSL_LIBS="-lssl" +fi + + + @@ -21701,5 +21744,6 @@ echo " Math library: ${LIBM}" echo " Pthread library: ${PTHREAD_LIBS}" echo " Socket library: ${SOCKET_LIBS}" echo " Sendfile library: ${SENDFILE_LIBS}" +echo " SSL library: ${SSL_LIBS}" echo "-------------------------------------------------------------------------" diff --git a/qse/configure.ac b/qse/configure.ac index 2f64d0a7..01f1fee6 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -192,6 +192,10 @@ dnl the existence of the libaray. AC_CHECK_LIB([unicows], [main], [UNICOWS_LIBS="-lunicows"]) AC_SUBST(UNICOWS_LIBS) +dnl check for an SSL library +AC_CHECK_LIB([ssl], [SSL_library_init], [SSL_LIBS="-lssl"]) +AC_SUBST(SSL_LIBS) + dnl MPI LX_FIND_MPI(C) AM_CONDITIONAL(HAVE_C_MPI, test "${have_C_mpi}" = "yes" ) @@ -411,5 +415,6 @@ echo " Math library: ${LIBM}" echo " Pthread library: ${PTHREAD_LIBS}" echo " Socket library: ${SOCKET_LIBS}" echo " Sendfile library: ${SENDFILE_LIBS}" +echo " SSL library: ${SSL_LIBS}" echo "-------------------------------------------------------------------------" ] diff --git a/qse/doc/Makefile.in b/qse/doc/Makefile.in index 65925986..e7c89fb3 100644 --- a/qse/doc/Makefile.in +++ b/qse/doc/Makefile.in @@ -187,6 +187,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/doc/image/Makefile.in b/qse/doc/image/Makefile.in index 5e7ccc86..32eb754e 100644 --- a/qse/doc/image/Makefile.in +++ b/qse/doc/image/Makefile.in @@ -146,6 +146,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/doc/page/Makefile.in b/qse/doc/page/Makefile.in index ee8cb9e8..db216421 100644 --- a/qse/doc/page/Makefile.in +++ b/qse/doc/page/Makefile.in @@ -146,6 +146,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index 9399e3b3..5152e09a 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -184,6 +184,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index 8c9314fb..c562beb4 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -219,6 +219,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index 7a83690d..66085944 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -179,6 +179,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/awk/awk.h b/qse/include/qse/awk/awk.h index 92a45e66..e0e0c19a 100644 --- a/qse/include/qse/awk/awk.h +++ b/qse/include/qse/awk/awk.h @@ -867,8 +867,10 @@ typedef enum qse_awk_option_t qse_awk_option_t; enum qse_awk_errnum_t { QSE_AWK_ENOERR, /**< no error */ - QSE_AWK_EINTERN, /**< internal error */ + QSE_AWK_EOTHER, /**< other error */ QSE_AWK_ENOIMPL, /**< not implemented */ + QSE_AWK_ESYSERR, /**< subsystem error */ + QSE_AWK_EINTERN, /**< internal error */ /* common errors */ QSE_AWK_ENOMEM, /**< insufficient memory */ @@ -885,7 +887,6 @@ enum qse_awk_errnum_t QSE_AWK_EWRITE, /**< cannot write '${0}' */ QSE_AWK_ECLOSE, /**< cannot close '${0}' */ - QSE_AWK_ERUNTIME,/**< general run-time error */ QSE_AWK_EBLKNST, /**< block nested too deeply */ QSE_AWK_EEXPRNST,/**< expression nested too deeply */ diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index 995d17ff..d7efbf93 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -183,6 +183,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/cmn/chr.h b/qse/include/qse/cmn/chr.h index 588ab8e7..e4aa2ba8 100644 --- a/qse/include/qse/cmn/chr.h +++ b/qse/include/qse/cmn/chr.h @@ -186,28 +186,28 @@ qse_wcint_t qse_towctype ( qse_wctype_t type ); -int qse_getwctypebyname ( - const qse_wchar_t* name, - qse_wctype_t* id -); - -int qse_getwctypebyxname ( - const qse_wchar_t* name, - qse_size_t len, - qse_wctype_t* id -); - -int qse_getmctypebyname ( +int qse_mbstoctype ( const qse_mchar_t* name, qse_mctype_t* id ); -int qse_getmctypebyxname ( +int qse_mbsntoctype ( const qse_mchar_t* name, qse_size_t len, qse_mctype_t* id ); +int qse_wcstoctype ( + const qse_wchar_t* name, + qse_wctype_t* id +); + +int qse_wcsntoctype ( + const qse_wchar_t* name, + qse_size_t len, + qse_wctype_t* id +); + #if defined(QSE_CHAR_IS_MCHAR) # define qse_isctype(c,type) qse_ismctype(c,type) # define qse_toctype(c,type) qse_ismctype(c,type) diff --git a/qse/include/qse/cmn/fio.h b/qse/include/qse/cmn/fio.h index e31ffdb8..ac6946b1 100644 --- a/qse/include/qse/cmn/fio.h +++ b/qse/include/qse/cmn/fio.h @@ -70,17 +70,17 @@ enum qse_fio_flag_t enum qse_fio_errnum_t { QSE_FIO_ENOERR = 0, /**< no error */ + QSE_FIO_EOTHER, /**< other error */ + QSE_FIO_ENOIMPL, /**< not implemented */ + QSE_FIO_ESYSERR, /**< subsystem(system call) error */ + QSE_FIO_EINTERN, /**< internal error */ QSE_FIO_ENOMEM, /**< out of memory */ QSE_FIO_EINVAL, /**< invalid parameter */ QSE_FIO_EACCES, /**< access denied */ QSE_FIO_ENOENT, /**< no such file */ QSE_FIO_EEXIST, /**< already exist */ - QSE_FIO_EINTR, /**< interrupted */ - QSE_FIO_ESYSERR, /**< subsystem(system call) error */ - QSE_FIO_ENOIMPL, /**< not implemented */ - - QSE_FIO_EOTHER /**< other error */ + QSE_FIO_EINTR /**< interrupted */ }; typedef enum qse_fio_errnum_t qse_fio_errnum_t; diff --git a/qse/include/qse/cmn/fs.h b/qse/include/qse/cmn/fs.h index 2fd8e517..1fbda96f 100644 --- a/qse/include/qse/cmn/fs.h +++ b/qse/include/qse/cmn/fs.h @@ -28,6 +28,10 @@ enum qse_fs_errnum_t { QSE_FS_ENOERR = 0, + QSE_FS_EOTHER, + QSE_FS_ENOIMPL, /**< not implemented */ + QSE_FS_ESYSERR, /**< subsystem error */ + QSE_FS_EINTERN, /**< internal error */ QSE_FS_ENOMEM, /**< out of memory */ QSE_FS_EINVAL, /**< invalid parameter */ @@ -37,12 +41,7 @@ enum qse_fs_errnum_t QSE_FS_EINTR, /**< interrupted */ QSE_FS_ENODIR, QSE_FS_EISDIR, - QSE_FS_EXDEV, - - QSE_FS_ESYSERR, /**< subsystem error */ - QSE_FS_ENOIMPL, /**< not implemented */ - - QSE_FS_EOTHER + QSE_FS_EXDEV }; typedef enum qse_fs_errnum_t qse_fs_errnum_t; diff --git a/qse/include/qse/cmn/nwio.h b/qse/include/qse/cmn/nwio.h index f7f78f13..61c17b78 100644 --- a/qse/include/qse/cmn/nwio.h +++ b/qse/include/qse/cmn/nwio.h @@ -52,6 +52,10 @@ enum qse_nwio_flag_t enum qse_nwio_errnum_t { QSE_NWIO_ENOERR = 0, /**< no error */ + QSE_NWIO_EOTHER, /**< other error */ + QSE_NWIO_ENOIMPL, /**< not implemented */ + QSE_NWIO_ESYSERR, /**< subsystem(system call) error */ + QSE_NWIO_EINTERN, /**< internal error */ QSE_NWIO_ENOMEM, /**< out of memory */ QSE_NWIO_EINVAL, /**< invalid parameter */ @@ -64,11 +68,7 @@ enum qse_nwio_errnum_t QSE_NWIO_ECONN, /**< connection refused */ QSE_NWIO_EILSEQ, /**< illegal sequence */ QSE_NWIO_EICSEQ, /**< incomplete sequence */ - QSE_NWIO_EILCHR, /**< illegal character */ - QSE_NWIO_ESYSERR, /**< subsystem(system call) error */ - QSE_NWIO_ENOIMPL, /**< not implemented */ - - QSE_NWIO_EOTHER /**< other error */ + QSE_NWIO_EILCHR /**< illegal character */ }; typedef enum qse_nwio_errnum_t qse_nwio_errnum_t; diff --git a/qse/include/qse/cmn/pio.h b/qse/include/qse/cmn/pio.h index 9243809c..a4d28e32 100644 --- a/qse/include/qse/cmn/pio.h +++ b/qse/include/qse/cmn/pio.h @@ -112,6 +112,10 @@ typedef enum qse_pio_hid_t qse_pio_hid_t; enum qse_pio_errnum_t { QSE_PIO_ENOERR = 0, /**< no error */ + QSE_PIO_EOTHER, /**< unknown error */ + QSE_PIO_ENOIMPL, /**< not implemented */ + QSE_PIO_ESYSERR, /**< subsystem error */ + QSE_PIO_EINTERN, /**< internal error */ QSE_PIO_ENOMEM, /**< out of memory */ QSE_PIO_EINVAL, /**< invalid parameter */ @@ -124,11 +128,7 @@ enum qse_pio_errnum_t QSE_PIO_EPIPE, /**< broken pipe */ QSE_PIO_EILSEQ, /**< illegal sequence */ QSE_PIO_EICSEQ, /**< incomplete sequence */ - QSE_PIO_EILCHR, /**< illegal character */ - QSE_PIO_ESYSERR, /**< subsystem error */ - QSE_PIO_ENOIMPL, /**< not implemented */ - - QSE_PIO_EOTHER /**< unknown error */ + QSE_PIO_EILCHR /**< illegal character */ }; typedef enum qse_pio_errnum_t qse_pio_errnum_t; diff --git a/qse/include/qse/cmn/rex.h b/qse/include/qse/cmn/rex.h index b67aea1b..55df5cf3 100644 --- a/qse/include/qse/cmn/rex.h +++ b/qse/include/qse/cmn/rex.h @@ -84,6 +84,11 @@ enum qse_rex_option_t enum qse_rex_errnum_t { QSE_REX_ENOERR = 0, + QSE_REX_EOTHER, + QSE_REX_ENOIMPL, + QSE_REX_ESYSERR, + QSE_REX_EINTERN, + QSE_REX_ENOMEM, /**< no sufficient memory available */ QSE_REX_ENOCOMP, /**< no expression compiled */ QSE_REX_ERECUR, /**< recursion too deep */ diff --git a/qse/include/qse/cmn/sio.h b/qse/include/qse/cmn/sio.h index e1c5636c..a3b01ba2 100644 --- a/qse/include/qse/cmn/sio.h +++ b/qse/include/qse/cmn/sio.h @@ -62,6 +62,10 @@ enum qse_sio_flag_t enum qse_sio_errnum_t { QSE_SIO_ENOERR = 0, /**< no error */ + QSE_SIO_EOTHER, /**< other error */ + QSE_SIO_ENOIMPL, /**< not implemented */ + QSE_SIO_ESYSERR, /**< subsystem(system call) error */ + QSE_SIO_EINTERN, /**< internal error */ QSE_SIO_ENOMEM, /**< out of memory */ QSE_SIO_EINVAL, /**< invalid parameter */ @@ -71,11 +75,7 @@ enum qse_sio_errnum_t QSE_SIO_EINTR, /**< interrupted */ QSE_SIO_EILSEQ, /**< illegal sequence */ QSE_SIO_EICSEQ, /**< incomplete sequence */ - QSE_SIO_EILCHR, /**< illegal character */ - QSE_SIO_ESYSERR, /**< subsystem(system call) error */ - QSE_SIO_ENOIMPL, /**< not implemented */ - - QSE_SIO_EOTHER /**< other error */ + QSE_SIO_EILCHR /**< illegal character */ }; typedef enum qse_sio_errnum_t qse_sio_errnum_t; diff --git a/qse/include/qse/cmn/tio.h b/qse/include/qse/cmn/tio.h index 759e0d91..39dc3213 100644 --- a/qse/include/qse/cmn/tio.h +++ b/qse/include/qse/cmn/tio.h @@ -32,20 +32,22 @@ enum qse_tio_errnum_t { - QSE_TIO_ENOERR = 0, + QSE_TIO_ENOERR = 0, /**< no error */ + QSE_TIO_EOTHER, /**< other error */ + QSE_TIO_ENOIMPL, /**< not implmeneted */ + QSE_TIO_ESYSERR, /**< subsystem error */ + QSE_TIO_EINTERN, /**< internal error */ - QSE_TIO_ENOMEM, /* out of memory */ - QSE_TIO_EINVAL, /* invalid parameter */ + QSE_TIO_ENOMEM, /**< out of memory */ + QSE_TIO_EINVAL, /**< invalid parameter */ QSE_TIO_EACCES, /**< access denied */ QSE_TIO_ENOENT, /**< no such file */ - QSE_TIO_ENOSPC, /* no more space */ - QSE_TIO_EILSEQ, /* illegal sequence */ - QSE_TIO_EICSEQ, /* incomplete sequence */ - QSE_TIO_EILCHR, /* illegal character */ - QSE_TIO_ENINPF, /* no input function attached */ - QSE_TIO_ENOUTF, /* no output function attached */ - - QSE_TIO_EOTHER /* other error */ + QSE_TIO_ENOSPC, /**< no more space */ + QSE_TIO_EILSEQ, /**< illegal sequence */ + QSE_TIO_EICSEQ, /**< incomplete sequence */ + QSE_TIO_EILCHR, /**< illegal character */ + QSE_TIO_ENINPF, /**< no input function attached */ + QSE_TIO_ENOUTF /**< no output function attached */ }; typedef enum qse_tio_errnum_t qse_tio_errnum_t; diff --git a/qse/include/qse/cmn/tre.h b/qse/include/qse/cmn/tre.h index 4630bff3..16570633 100644 --- a/qse/include/qse/cmn/tre.h +++ b/qse/include/qse/cmn/tre.h @@ -27,6 +27,11 @@ enum qse_tre_errnum_t { QSE_TRE_ENOERR, + QSE_TRE_EOTHER, + QSE_TRE_ENOIMPL, + QSE_TRE_ESYSERR, + QSE_TRE_EINTERN, + QSE_TRE_ENOMEM, /* Out of memory */ QSE_TRE_ENOMATCH, /* No match */ QSE_TRE_EBADPAT, /* Invalid regular expression */ diff --git a/qse/include/qse/net/Makefile.in b/qse/include/qse/net/Makefile.in index 28951260..b08d2fd1 100644 --- a/qse/include/qse/net/Makefile.in +++ b/qse/include/qse/net/Makefile.in @@ -177,6 +177,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/net/htrd.h b/qse/include/qse/net/htrd.h index 74e6128f..8a15a47d 100644 --- a/qse/include/qse/net/htrd.h +++ b/qse/include/qse/net/htrd.h @@ -29,6 +29,11 @@ typedef struct qse_htrd_t qse_htrd_t; enum qse_htrd_errnum_t { QSE_HTRD_ENOERR, + QSE_HTRD_EOTHER, + QSE_HTRD_ENOIMPL, + QSE_HTRD_ESYSERR, + QSE_HTRD_EINTERN, + QSE_HTRD_ENOMEM, QSE_HTRD_EBADRE, QSE_HTRD_EBADHDR, diff --git a/qse/include/qse/net/httpd.h b/qse/include/qse/net/httpd.h index c332ae04..741e6953 100644 --- a/qse/include/qse/net/httpd.h +++ b/qse/include/qse/net/httpd.h @@ -34,6 +34,10 @@ typedef struct qse_httpd_client_t qse_httpd_client_t; enum qse_httpd_errnum_t { QSE_HTTPD_ENOERR, + QSE_HTTPD_EOTHER, + QSE_HTTPD_ENOIMPL, + QSE_HTTPD_ESYSERR, + QSE_HTTPD_EINTERN, QSE_HTTPD_ENOMEM, QSE_HTTPD_EINVAL, @@ -46,13 +50,7 @@ enum qse_httpd_errnum_t QSE_HTTPD_EIOMUX, QSE_HTTPD_EDISCON, /* client disconnnected */ QSE_HTTPD_EBADREQ, /* bad request */ - QSE_HTTPD_ETASK, - - QSE_HTTPD_EINTERN, - QSE_HTTPD_ESYSERR, - QSE_HTTPD_ENOIMPL, - - QSE_HTTPD_EOTHER + QSE_HTTPD_ETASK }; typedef enum qse_httpd_errnum_t qse_httpd_errnum_t; diff --git a/qse/include/qse/net/upxd.h b/qse/include/qse/net/upxd.h index e690b276..6e6279cb 100644 --- a/qse/include/qse/net/upxd.h +++ b/qse/include/qse/net/upxd.h @@ -31,18 +31,18 @@ typedef struct qse_upxd_t qse_upxd_t; enum qse_upxd_errnum_t { QSE_UPXD_ENOERR, + QSE_UPXD_EOTHER, + QSE_UPXD_ENOIMPL, + QSE_UPXD_ESYSERR, + QSE_UPXD_EINTERN, + QSE_UPXD_ENOMEM, QSE_UPXD_EINVAL, QSE_UPXD_EACCES, QSE_UPXD_ENOENT, QSE_UPXD_EEXIST, QSE_UPXD_EINTR, - QSE_UPXD_EAGAIN, - - QSE_UPXD_EINTERN, - QSE_UPXD_ESYSERR, - QSE_UPXD_ENOIMPL, - QSE_UPXD_EOTHER + QSE_UPXD_EAGAIN }; typedef enum qse_upxd_errnum_t qse_upxd_errnum_t; diff --git a/qse/include/qse/sed/Makefile.in b/qse/include/qse/sed/Makefile.in index ce64ed99..5cf3c8d9 100644 --- a/qse/include/qse/sed/Makefile.in +++ b/qse/include/qse/sed/Makefile.in @@ -179,6 +179,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/include/qse/sed/sed.h b/qse/include/qse/sed/sed.h index c518ba28..0ca1f959 100644 --- a/qse/include/qse/sed/sed.h +++ b/qse/include/qse/sed/sed.h @@ -228,8 +228,11 @@ struct qse_sed_cmd_t enum qse_sed_errnum_t { QSE_SED_ENOERR, /**< no error */ - QSE_SED_EINTERN, /**< internal error */ + QSE_SED_EOTHER, /**< not implemented */ QSE_SED_ENOIMPL, /**< not implemented */ + QSE_SED_ESYSERR, /**< not implemented */ + QSE_SED_EINTERN, /**< internal error */ + QSE_SED_ENOMEM, /**< insufficient memory */ QSE_SED_EINVAL, /**< invalid parameter or data */ QSE_SED_ECMDNR, /**< command '${0}' not recognized */ diff --git a/qse/include/qse/stx/Makefile.in b/qse/include/qse/stx/Makefile.in index 23e1612e..f06c443e 100644 --- a/qse/include/qse/stx/Makefile.in +++ b/qse/include/qse/stx/Makefile.in @@ -177,6 +177,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index e5f898b4..4b4f7404 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -183,6 +183,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index 8bf1a910..25e0f145 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -227,6 +227,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/awk/err.c b/qse/lib/awk/err.c index 4b2d0829..1a0f9129 100644 --- a/qse/lib/awk/err.c +++ b/qse/lib/awk/err.c @@ -25,8 +25,10 @@ const qse_char_t* qse_awk_dflerrstr (qse_awk_t* awk, qse_awk_errnum_t errnum) static const qse_char_t* errstr[] = { QSE_T("no error"), - QSE_T("internal error that should never have happened"), + QSE_T("other error"), QSE_T("not implemented"), + QSE_T("subsystem error"), + QSE_T("internal error that should never have happened"), QSE_T("insufficient memory"), QSE_T("invalid parameter or data"), @@ -41,7 +43,6 @@ const qse_char_t* qse_awk_dflerrstr (qse_awk_t* awk, qse_awk_errnum_t errnum) QSE_T("cannot write '${0}'"), QSE_T("cannot close '${0}'"), - QSE_T("general runtime error"), QSE_T("block nested too deeply"), QSE_T("expression nested too deeply"), diff --git a/qse/lib/awk/mpi.c b/qse/lib/awk/mpi.c index 15ae81c4..276dfbf0 100644 --- a/qse/lib/awk/mpi.c +++ b/qse/lib/awk/mpi.c @@ -20,13 +20,14 @@ #include #include "../cmn/mem.h" + #include typedef struct xtn_t xtn_t; struct xtn_t { - int gbl_mpi[8]; + int gbl_mpi[9]; }; typedef struct rxtn_t rxtn_t; @@ -57,15 +58,17 @@ qse_awk_t* qse_awk_openmpiwithmmgr (qse_mmgr_t* mmgr, qse_size_t xtnsize) xtn = (xtn_t*) qse_awk_getxtnstd (awk); QSE_MEMSET (xtn, 0, QSE_SIZEOF(*xtn)); - xtn->gbl_mpi[0] = qse_awk_addgbl (awk, QSE_T("MPI_RANK"), 8); - xtn->gbl_mpi[1] = qse_awk_addgbl (awk, QSE_T("MPI_SIZE"), 8); + xtn->gbl_mpi[0] = qse_awk_addgbl (awk, QSE_T("MPI_NODE"), 8); - xtn->gbl_mpi[2] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_MIN"), 14); - xtn->gbl_mpi[3] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_MAX"), 14); - xtn->gbl_mpi[4] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_SUM"), 14); - xtn->gbl_mpi[5] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_PROD"), 15); - xtn->gbl_mpi[6] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_LAND"), 15); - xtn->gbl_mpi[7] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_LOR"), 14); + xtn->gbl_mpi[1] = qse_awk_addgbl (awk, QSE_T("MPI_RANK"), 8); + xtn->gbl_mpi[2] = qse_awk_addgbl (awk, QSE_T("MPI_SIZE"), 8); + + xtn->gbl_mpi[3] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_MIN"), 14); + xtn->gbl_mpi[4] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_MAX"), 14); + xtn->gbl_mpi[5] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_SUM"), 14); + xtn->gbl_mpi[6] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_PROD"), 15); + xtn->gbl_mpi[7] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_LAND"), 15); + xtn->gbl_mpi[8] = qse_awk_addgbl (awk, QSE_T("MPI_REDUCE_LOR"), 14); for (i = 0; i < QSE_COUNTOF(xtn->gbl_mpi); i++) { @@ -124,35 +127,71 @@ qse_awk_rtx_t* qse_awk_rtx_openmpi ( for (i = 0; i < QSE_COUNTOF(xtn->gbl_mpi); i++) { int iv; - qse_long_t lv; qse_awk_val_t* v_tmp; switch (i) { - case 0: /* MPI_RANK */ + case 0: /* MPI_NODE */ + { + char buf[MPI_MAX_PROCESSOR_NAME]; + int len; +#if defined(QSE_CHAR_IS_MCHAR) + /* nothing */ +#else + qse_mmgr_t* mmgr; + qse_char_t* tmp; +#endif + + if (MPI_Get_processor_name(buf, &len) != MPI_SUCCESS) + { + qse_awk_rtx_close (rtx); + qse_awk_seterrnum (awk, QSE_AWK_ESYSERR, QSE_NULL); + return QSE_NULL; + } +#if defined(QSE_CHAR_IS_MCHAR) + v_tmp = qse_awk_rtx_makestrval (rtx, buf, len); +#else + + mmgr = qse_awk_getmmgr(awk); + tmp = qse_mbstowcsdup (buf, mmgr); + if (tmp == QSE_NULL) + { + qse_awk_rtx_close (rtx); + qse_awk_seterrnum (awk, QSE_AWK_ENOMEM, QSE_NULL); + return QSE_NULL; + } + + v_tmp = qse_awk_rtx_makestrval0 (rtx, tmp); + QSE_MMGR_FREE (mmgr, tmp); +#endif + break; + } + + case 1: /* MPI_RANK */ if (MPI_Comm_rank (MPI_COMM_WORLD, &iv) != MPI_SUCCESS) { qse_awk_rtx_close (rtx); + qse_awk_seterrnum (awk, QSE_AWK_ESYSERR, QSE_NULL); return QSE_NULL; } - lv = iv; + v_tmp = qse_awk_rtx_makeintval (rtx, iv); break; - case 1: /* MPI_SIZE */ + case 2: /* MPI_SIZE */ if (MPI_Comm_size (MPI_COMM_WORLD, &iv) != MPI_SUCCESS) { qse_awk_rtx_close (rtx); + qse_awk_seterrnum (awk, QSE_AWK_ESYSERR, QSE_NULL); return QSE_NULL; } - lv = iv; + v_tmp = qse_awk_rtx_makeintval (rtx, iv); break; default: /* MPI_REDUCE_XXXX */ - lv = i - 2; + v_tmp = qse_awk_rtx_makeintval (rtx, i - 3); break; } - v_tmp = qse_awk_rtx_makeintval (rtx, lv); if (v_tmp == QSE_NULL) { qse_awk_rtx_close (rtx); @@ -185,7 +224,7 @@ static int fnc_reduce (qse_awk_rtx_t* rtx, const qse_cstr_t* fnm) qse_awk_val_t* tmp, * a0, * a1; qse_long_t opidx, lv; qse_flt_t rv; - int ret = 0, n; + int n; static MPI_Op optab[] = { diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 3a4ee591..9e26e008 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -231,6 +231,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/cmn/glob.c b/qse/lib/cmn/glob.c index aea2fa42..c1e63e6f 100644 --- a/qse/lib/cmn/glob.c +++ b/qse/lib/cmn/glob.c @@ -718,7 +718,6 @@ static int handle_non_wild_segments (glob_t* g, segment_t* seg) } #if defined(NO_RECURSION) -typedef struct stack_node_t stack_node_t; struct stack_node_t { qse_size_t tmp; diff --git a/qse/lib/net/Makefile.in b/qse/lib/net/Makefile.in index 5abe7d49..1755e151 100644 --- a/qse/lib/net/Makefile.in +++ b/qse/lib/net/Makefile.in @@ -197,6 +197,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/sed/Makefile.in b/qse/lib/sed/Makefile.in index 2f1665e4..da5cc1bb 100644 --- a/qse/lib/sed/Makefile.in +++ b/qse/lib/sed/Makefile.in @@ -214,6 +214,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/lib/sed/err.c b/qse/lib/sed/err.c index b01a76c8..b43b902b 100644 --- a/qse/lib/sed/err.c +++ b/qse/lib/sed/err.c @@ -27,8 +27,10 @@ const qse_char_t* qse_sed_dflerrstr ( static const qse_char_t* errstr[] = { QSE_T("no error"), - QSE_T("internal error that should never have happened"), + QSE_T("other error"), QSE_T("not implemented"), + QSE_T("subsystem error"), + QSE_T("internal error that should never have happened"), QSE_T("insufficient memory"), QSE_T("invalid parameter or data"), diff --git a/qse/lib/stx/Makefile.in b/qse/lib/stx/Makefile.in index fb396d9a..f0b33230 100644 --- a/qse/lib/stx/Makefile.in +++ b/qse/lib/stx/Makefile.in @@ -196,6 +196,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/regress/Makefile.in b/qse/regress/Makefile.in index 290a8966..60a3789a 100644 --- a/qse/regress/Makefile.in +++ b/qse/regress/Makefile.in @@ -184,6 +184,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/regress/awk/Makefile.in b/qse/regress/awk/Makefile.in index fb803f72..2c492747 100644 --- a/qse/regress/awk/Makefile.in +++ b/qse/regress/awk/Makefile.in @@ -147,6 +147,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/regress/awk/lang-033.awk b/qse/regress/awk/lang-033.awk index a78e3a6b..8e58498f 100644 --- a/qse/regress/awk/lang-033.awk +++ b/qse/regress/awk/lang-033.awk @@ -1,4 +1,4 @@ BEGIN { - while ("cat /etc/passwd" | getline x > 0) + while (("cat " datadir "/" datafile) | getline x > 0) print x } diff --git a/qse/regress/awk/regress.out b/qse/regress/awk/regress.out index ce8e7e89..d4f750f2 100644 --- a/qse/regress/awk/regress.out +++ b/qse/regress/awk/regress.out @@ -937,7 +937,7 @@ my hello my hello my hello my hello -ERROR: CODE 15 LINE 6 COLUMN 1 - block nested too deeply +ERROR: CODE 16 LINE 6 COLUMN 1 - block nested too deeply -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-003.awk &1 -------------------------------------------------------------------------------- @@ -956,7 +956,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-004.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 42 LINE 3 COLUMN 9 - function 'a' redefined +ERROR: CODE 43 LINE 3 COLUMN 9 - function 'a' redefined -------------------------------------------------------------------------------- [CMD] qseawk --implicit=off --explicit=on --newline=on -d- -f lang-005.awk &1 -------------------------------------------------------------------------------- @@ -984,7 +984,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk --implicit=off --explicit=on --newline=on -d- -f lang-006.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 43 LINE 5 COLUMN 10 - global variable 'a' redefined +ERROR: CODE 44 LINE 5 COLUMN 10 - global variable 'a' redefined -------------------------------------------------------------------------------- [CMD] qseawk --implicit=on --explicit=on --newline=on -d- -f lang-007.awk &1 -------------------------------------------------------------------------------- @@ -1352,7 +1352,7 @@ BEGIN { printf ("%s\n",10.34); } -ERROR: CODE 103 LINE 3 COLUMN 2 - recursion detected in format conversion +ERROR: CODE 104 LINE 3 COLUMN 2 - recursion detected in format conversion -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-014.awk &1 -------------------------------------------------------------------------------- @@ -1367,7 +1367,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-015.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 15 LINE 3 COLUMN 50 - block nested too deeply +ERROR: CODE 16 LINE 3 COLUMN 50 - block nested too deeply -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-016.awk &1 -------------------------------------------------------------------------------- @@ -1481,27 +1481,27 @@ END { -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-018.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 47 LINE 1 COLUMN 8 - duplicate global variable 'ARGV' +ERROR: CODE 48 LINE 1 COLUMN 8 - duplicate global variable 'ARGV' -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-019.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 49 LINE 1 COLUMN 15 - '+' not a valid parameter name +ERROR: CODE 50 LINE 1 COLUMN 15 - '+' not a valid parameter name -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-020.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 50 LINE 1 COLUMN 8 - '+' not a valid variable name +ERROR: CODE 51 LINE 1 COLUMN 8 - '+' not a valid variable name -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-021.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 50 LINE 3 COLUMN 8 - '+' not a valid variable name +ERROR: CODE 51 LINE 3 COLUMN 8 - '+' not a valid variable name -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-022.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 23 LINE 2 COLUMN 9 - left parenthesis expected in place of '=' +ERROR: CODE 24 LINE 2 COLUMN 9 - left parenthesis expected in place of '=' -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-023.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 28 LINE 5 COLUMN 20 - colon expected in place of ';' +ERROR: CODE 29 LINE 5 COLUMN 20 - colon expected in place of ';' -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-024.awk &1 -------------------------------------------------------------------------------- @@ -1533,7 +1533,7 @@ BEGIN { delete iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix; } -ERROR: CODE 78 LINE 3 COLUMN 9 - variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix' not deletable +ERROR: CODE 79 LINE 3 COLUMN 9 - variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix' not deletable -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-026.awk &1 -------------------------------------------------------------------------------- @@ -1545,19 +1545,19 @@ BEGIN { } abc -ERROR: CODE 86 LINE 4 COLUMN 2 - map 'abc' not assignable with a scalar +ERROR: CODE 87 LINE 4 COLUMN 2 - map 'abc' not assignable with a scalar -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-027.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 17 LINE 2 COLUMN 1 - invalid character '' +ERROR: CODE 18 LINE 2 COLUMN 1 - invalid character '' -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-028.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 41 LINE 2 COLUMN 10 - intrinsic function 'substr' redefined +ERROR: CODE 42 LINE 2 COLUMN 10 - intrinsic function 'substr' redefined -------------------------------------------------------------------------------- [CMD] qseawk --explicit=on --newline=on -d- -f lang-029.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 42 LINE 9 COLUMN 9 - function 'abc' redefined +ERROR: CODE 43 LINE 9 COLUMN 9 - function 'abc' redefined -------------------------------------------------------------------------------- [CMD] qseawk --newline=on -d- -f lang-030.awk &1 -------------------------------------------------------------------------------- @@ -1667,10 +1667,10 @@ BEGIN { --------------------- 9210 -------------------------------------------------------------------------------- -[CMD] qseawk --newline=on -d- -f lang-033.awk &1 +[CMD] qseawk --newline=on -d- -vdatadir=/home/hyung-hwan/nfs.exports/workspace/qse/x86_64/linux-wchar-debug/../../src/regress/awk -vdatafile=passwd.dat -f lang-033.awk &1 -------------------------------------------------------------------------------- BEGIN { - while ((("cat /etc/passwd" | getline x) > 0)) + while (((((("cat " datadir) "/") datafile) | getline x) > 0)) print x; } @@ -1693,27 +1693,25 @@ irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh libuuid:x:100:101::/var/lib/libuuid:/bin/sh -syslog:x:101:103::/home/syslog:/bin/false -messagebus:x:102:105::/var/run/dbus:/bin/false -avahi-autoipd:x:103:108:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false -avahi:x:104:109:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false -couchdb:x:105:113:CouchDB Administrator,,,:/var/lib/couchdb:/bin/bash -usbmux:x:106:46:usbmux daemon,,,:/home/usbmux:/bin/false -speech-dispatcher:x:107:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh -kernoops:x:108:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false -pulse:x:109:114:PulseAudio daemon,,,:/var/run/pulse:/bin/false -rtkit:x:110:117:RealtimeKit,,,:/proc:/bin/false -saned:x:111:118::/home/saned:/bin/false -hplip:x:112:7:HPLIP system user,,,:/var/run/hplip:/bin/false -gdm:x:113:120:Gnome Display Manager:/var/lib/gdm:/bin/false -hyung-hwan:x:1000:1000:Hyung-Hwan Chung,,,:/home/hyung-hwan:/bin/bash -sshd:x:114:65534::/var/run/sshd:/usr/sbin/nologin -haldaemon:x:115:123:Hardware abstraction layer,,,:/var/run/hald:/bin/false -statd:x:116:65534::/var/lib/nfs:/bin/false -freerad:x:117:124::/etc/freeradius:/bin/false -lightdm:x:118:128:Light Display Manager:/var/lib/lightdm:/bin/false -colord:x:119:129:colord colour management daemon,,,:/var/lib/colord:/bin/false -uml-net:x:120:132::/home/uml-net:/bin/false +syslog:x:101:102::/home/syslog:/bin/false +klog:x:102:103::/home/klog:/bin/false +hplip:x:103:7:HPLIP system user,,,:/var/run/hplip:/bin/false +avahi-autoipd:x:104:110:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false +gdm:x:105:111:Gnome Display Manager:/var/lib/gdm:/bin/false +saned:x:106:113::/home/saned:/bin/false +pulse:x:107:114:PulseAudio daemon,,,:/var/run/pulse:/bin/false +messagebus:x:108:117::/var/run/dbus:/bin/false +polkituser:x:109:118:PolicyKit,,,:/var/run/PolicyKit:/bin/false +avahi:x:110:119:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false +haldaemon:x:111:120:Hardware abstraction layer,,,:/var/run/hald:/bin/false +statd:x:112:65534::/var/lib/nfs:/bin/false +sshd:x:113:65534::/var/run/sshd:/usr/sbin/nologin +speech-dispatcher:x:114:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh +couchdb:x:115:116:CouchDB Administrator,,,:/var/lib/couchdb:/bin/bash +kernoops:x:116:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false +mysql:x:117:124:MySQL Server,,,:/var/lib/mysql:/bin/false +openldap:x:118:125:OpenLDAP Server Account,,,:/nonexistent:/bin/false +postfix:x:119:126::/var/spool/postfix:/bin/false -------------------------------------------------------------------------------- [CMD] qseawk --newline=on --rwpipe=on -d- -f lang-034.awk &1 -------------------------------------------------------------------------------- diff --git a/qse/regress/awk/regress.out.xma b/qse/regress/awk/regress.out.xma index ea2fce1c..530e58f2 100644 --- a/qse/regress/awk/regress.out.xma +++ b/qse/regress/awk/regress.out.xma @@ -937,7 +937,7 @@ my hello my hello my hello my hello -ERROR: CODE 15 LINE 6 COLUMN 1 - block nested too deeply +ERROR: CODE 16 LINE 6 COLUMN 1 - block nested too deeply -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-003.awk &1 -------------------------------------------------------------------------------- @@ -956,7 +956,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-004.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 42 LINE 3 COLUMN 9 - function 'a' redefined +ERROR: CODE 43 LINE 3 COLUMN 9 - function 'a' redefined -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --implicit=off --explicit=on --newline=on -d- -f lang-005.awk &1 -------------------------------------------------------------------------------- @@ -984,7 +984,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --implicit=off --explicit=on --newline=on -d- -f lang-006.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 43 LINE 5 COLUMN 10 - global variable 'a' redefined +ERROR: CODE 44 LINE 5 COLUMN 10 - global variable 'a' redefined -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --implicit=on --explicit=on --newline=on -d- -f lang-007.awk &1 -------------------------------------------------------------------------------- @@ -1352,7 +1352,7 @@ BEGIN { printf ("%s\n",10.34); } -ERROR: CODE 103 LINE 3 COLUMN 2 - recursion detected in format conversion +ERROR: CODE 104 LINE 3 COLUMN 2 - recursion detected in format conversion -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-014.awk &1 -------------------------------------------------------------------------------- @@ -1367,7 +1367,7 @@ BEGIN { -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-015.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 15 LINE 3 COLUMN 50 - block nested too deeply +ERROR: CODE 16 LINE 3 COLUMN 50 - block nested too deeply -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-016.awk &1 -------------------------------------------------------------------------------- @@ -1481,27 +1481,27 @@ END { -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-018.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 47 LINE 1 COLUMN 8 - duplicate global variable 'ARGV' +ERROR: CODE 48 LINE 1 COLUMN 8 - duplicate global variable 'ARGV' -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-019.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 49 LINE 1 COLUMN 15 - '+' not a valid parameter name +ERROR: CODE 50 LINE 1 COLUMN 15 - '+' not a valid parameter name -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-020.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 50 LINE 1 COLUMN 8 - '+' not a valid variable name +ERROR: CODE 51 LINE 1 COLUMN 8 - '+' not a valid variable name -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-021.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 50 LINE 3 COLUMN 8 - '+' not a valid variable name +ERROR: CODE 51 LINE 3 COLUMN 8 - '+' not a valid variable name -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-022.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 23 LINE 2 COLUMN 9 - left parenthesis expected in place of '=' +ERROR: CODE 24 LINE 2 COLUMN 9 - left parenthesis expected in place of '=' -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-023.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 28 LINE 5 COLUMN 20 - colon expected in place of ';' +ERROR: CODE 29 LINE 5 COLUMN 20 - colon expected in place of ';' -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-024.awk &1 -------------------------------------------------------------------------------- @@ -1533,7 +1533,7 @@ BEGIN { delete iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix; } -ERROR: CODE 78 LINE 3 COLUMN 9 - variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix' not deletable +ERROR: CODE 79 LINE 3 COLUMN 9 - variable 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix' not deletable -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-026.awk &1 -------------------------------------------------------------------------------- @@ -1545,19 +1545,19 @@ BEGIN { } abc -ERROR: CODE 86 LINE 4 COLUMN 2 - map 'abc' not assignable with a scalar +ERROR: CODE 87 LINE 4 COLUMN 2 - map 'abc' not assignable with a scalar -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-027.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 17 LINE 2 COLUMN 1 - invalid character '' +ERROR: CODE 18 LINE 2 COLUMN 1 - invalid character '' -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-028.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 41 LINE 2 COLUMN 10 - intrinsic function 'substr' redefined +ERROR: CODE 42 LINE 2 COLUMN 10 - intrinsic function 'substr' redefined -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --explicit=on --newline=on -d- -f lang-029.awk &1 -------------------------------------------------------------------------------- -ERROR: CODE 42 LINE 9 COLUMN 9 - function 'abc' redefined +ERROR: CODE 43 LINE 9 COLUMN 9 - function 'abc' redefined -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on -d- -f lang-030.awk &1 -------------------------------------------------------------------------------- @@ -1667,10 +1667,10 @@ BEGIN { --------------------- 9210 -------------------------------------------------------------------------------- -[CMD] qseawk -m 500000 --newline=on -d- -f lang-033.awk &1 +[CMD] qseawk -m 500000 --newline=on -d- -vdatadir=/home/hyung-hwan/nfs.exports/workspace/qse/x86_64/linux-wchar-debug/../../src/regress/awk -vdatafile=passwd.dat -f lang-033.awk &1 -------------------------------------------------------------------------------- BEGIN { - while ((("cat /etc/passwd" | getline x) > 0)) + while (((((("cat " datadir) "/") datafile) | getline x) > 0)) print x; } @@ -1693,27 +1693,25 @@ irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh libuuid:x:100:101::/var/lib/libuuid:/bin/sh -syslog:x:101:103::/home/syslog:/bin/false -messagebus:x:102:105::/var/run/dbus:/bin/false -avahi-autoipd:x:103:108:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false -avahi:x:104:109:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false -couchdb:x:105:113:CouchDB Administrator,,,:/var/lib/couchdb:/bin/bash -usbmux:x:106:46:usbmux daemon,,,:/home/usbmux:/bin/false -speech-dispatcher:x:107:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh -kernoops:x:108:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false -pulse:x:109:114:PulseAudio daemon,,,:/var/run/pulse:/bin/false -rtkit:x:110:117:RealtimeKit,,,:/proc:/bin/false -saned:x:111:118::/home/saned:/bin/false -hplip:x:112:7:HPLIP system user,,,:/var/run/hplip:/bin/false -gdm:x:113:120:Gnome Display Manager:/var/lib/gdm:/bin/false -hyung-hwan:x:1000:1000:Hyung-Hwan Chung,,,:/home/hyung-hwan:/bin/bash -sshd:x:114:65534::/var/run/sshd:/usr/sbin/nologin -haldaemon:x:115:123:Hardware abstraction layer,,,:/var/run/hald:/bin/false -statd:x:116:65534::/var/lib/nfs:/bin/false -freerad:x:117:124::/etc/freeradius:/bin/false -lightdm:x:118:128:Light Display Manager:/var/lib/lightdm:/bin/false -colord:x:119:129:colord colour management daemon,,,:/var/lib/colord:/bin/false -uml-net:x:120:132::/home/uml-net:/bin/false +syslog:x:101:102::/home/syslog:/bin/false +klog:x:102:103::/home/klog:/bin/false +hplip:x:103:7:HPLIP system user,,,:/var/run/hplip:/bin/false +avahi-autoipd:x:104:110:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false +gdm:x:105:111:Gnome Display Manager:/var/lib/gdm:/bin/false +saned:x:106:113::/home/saned:/bin/false +pulse:x:107:114:PulseAudio daemon,,,:/var/run/pulse:/bin/false +messagebus:x:108:117::/var/run/dbus:/bin/false +polkituser:x:109:118:PolicyKit,,,:/var/run/PolicyKit:/bin/false +avahi:x:110:119:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false +haldaemon:x:111:120:Hardware abstraction layer,,,:/var/run/hald:/bin/false +statd:x:112:65534::/var/lib/nfs:/bin/false +sshd:x:113:65534::/var/run/sshd:/usr/sbin/nologin +speech-dispatcher:x:114:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh +couchdb:x:115:116:CouchDB Administrator,,,:/var/lib/couchdb:/bin/bash +kernoops:x:116:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false +mysql:x:117:124:MySQL Server,,,:/var/lib/mysql:/bin/false +openldap:x:118:125:OpenLDAP Server Account,,,:/nonexistent:/bin/false +postfix:x:119:126::/var/spool/postfix:/bin/false -------------------------------------------------------------------------------- [CMD] qseawk -m 500000 --newline=on --rwpipe=on -d- -f lang-034.awk &1 -------------------------------------------------------------------------------- diff --git a/qse/regress/awk/regress.sh.in b/qse/regress/awk/regress.sh.in index dd3eb118..f88eba70 100755 --- a/qse/regress/awk/regress.sh.in +++ b/qse/regress/awk/regress.sh.in @@ -159,7 +159,7 @@ PROGS=" lang-030.awk!!!--newline=on -d- lang-031.awk!!!--newline=on -d- lang-032.awk!!!--newline=on -d- - lang-033.awk!!!--newline=on -d- + lang-033.awk!!!--newline=on -d- -vdatadir=@abs_srcdir@ -vdatafile=passwd.dat lang-034.awk!!!--newline=on --rwpipe=on -d- lang-035.awk!lang-035.dat2!!--newline=on -d- -vdatadir=@abs_srcdir@ -vdatafile=lang-035.dat1 -vgroupname=lang-035 lang-036.awk!lang-036.dat!!--newline=on -d- diff --git a/qse/regress/sed/Makefile.in b/qse/regress/sed/Makefile.in index cb9427e4..f4fc2971 100644 --- a/qse/regress/sed/Makefile.in +++ b/qse/regress/sed/Makefile.in @@ -149,6 +149,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/samples/Makefile.in b/qse/samples/Makefile.in index 708da305..ebb4cc8e 100644 --- a/qse/samples/Makefile.in +++ b/qse/samples/Makefile.in @@ -184,6 +184,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/samples/awk/Makefile.in b/qse/samples/awk/Makefile.in index a7474b81..bad434bb 100644 --- a/qse/samples/awk/Makefile.in +++ b/qse/samples/awk/Makefile.in @@ -254,6 +254,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/samples/cmn/Makefile.in b/qse/samples/cmn/Makefile.in index d2bcac96..fbca9ae7 100644 --- a/qse/samples/cmn/Makefile.in +++ b/qse/samples/cmn/Makefile.in @@ -326,6 +326,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/samples/net/Makefile.am b/qse/samples/net/Makefile.am index 1d52a81a..5ff795e4 100644 --- a/qse/samples/net/Makefile.am +++ b/qse/samples/net/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ bin_PROGRAMS = http01 upxd01 LDFLAGS += -L../../lib/cmn -L../../lib/net -LDADD = -lqsenet -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS) $(SENDFILE_LIBS) -lssl +LDADD = -lqsenet -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS) $(SENDFILE_LIBS) if WIN32 if WCHAR @@ -19,3 +19,4 @@ endif http01_SOURCES = http01.c upxd01_SOURCES = upxd01.c +http01_LDADD = $(LDADD) $(SSL_LIBS) diff --git a/qse/samples/net/Makefile.in b/qse/samples/net/Makefile.in index 549d8660..5354e97e 100644 --- a/qse/samples/net/Makefile.in +++ b/qse/samples/net/Makefile.in @@ -54,11 +54,11 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_http01_OBJECTS = http01.$(OBJEXT) http01_OBJECTS = $(am_http01_OBJECTS) -http01_LDADD = $(LDADD) am__DEPENDENCIES_1 = @WCHAR_TRUE@@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -http01_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +http01_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) am_upxd01_OBJECTS = upxd01.$(OBJEXT) upxd01_OBJECTS = $(am_upxd01_OBJECTS) upxd01_LDADD = $(LDADD) @@ -176,6 +176,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ @@ -241,9 +242,10 @@ AM_CPPFLAGS = \ -I$(includedir) LDADD = -lqsenet -lqsecmn $(PTHREAD_LIBS) $(SOCKET_LIBS) \ - $(SENDFILE_LIBS) -lssl $(am__append_1) + $(SENDFILE_LIBS) $(am__append_1) http01_SOURCES = http01.c upxd01_SOURCES = upxd01.c +http01_LDADD = $(LDADD) $(SSL_LIBS) all: all-am .SUFFIXES: diff --git a/qse/samples/sed/Makefile.in b/qse/samples/sed/Makefile.in index 8459dead..1c2abb3f 100644 --- a/qse/samples/sed/Makefile.in +++ b/qse/samples/sed/Makefile.in @@ -192,6 +192,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@ diff --git a/qse/tools/Makefile.in b/qse/tools/Makefile.in index ae2927ed..4e64861b 100644 --- a/qse/tools/Makefile.in +++ b/qse/tools/Makefile.in @@ -146,6 +146,7 @@ SENDFILE_LIBS = @SENDFILE_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ TRUE = @TRUE@ UNICOWS_LIBS = @UNICOWS_LIBS@