diff --git a/qse/Makefile.in b/qse/Makefile.in index d89143e7..46448d5f 100644 --- a/qse/Makefile.in +++ b/qse/Makefile.in @@ -76,15 +76,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -110,10 +105,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/cmd/Makefile.in b/qse/cmd/Makefile.in index 749187ae..9838e9de 100644 --- a/qse/cmd/Makefile.in +++ b/qse/cmd/Makefile.in @@ -61,15 +61,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -95,10 +90,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in index cca2c44b..1717318e 100644 --- a/qse/cmd/awk/Makefile.in +++ b/qse/cmd/awk/Makefile.in @@ -94,15 +94,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -128,10 +123,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 21abe571..a3b9c169 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -430,6 +430,8 @@ static int handle_args (int argc, qse_char_t* argv[], struct argout_t* ao) /* the source code is the string, not from the file */ ao->ist = QSE_AWK_PARSE_STRING; ao->isp = argv[opt.ind++]; + + free (isf); } else { @@ -582,7 +584,7 @@ static int awk_main (int argc, qse_char_t* argv[]) qse_awk_close (awk); if (ao.ist == QSE_AWK_PARSE_FILES && ao.isp != QSE_NULL) free (ao.isp); - if (ao.osf != QSE_NULL) free (ao.osf); + /*if (ao.osf != QSE_NULL) free (ao.osf);*/ if (ao.icf != QSE_NULL) free (ao.icf); if (ao.vm != QSE_NULL) qse_map_close (ao.vm); diff --git a/qse/cmd/lsp/Makefile.in b/qse/cmd/lsp/Makefile.in index b513b148..4a878436 100644 --- a/qse/cmd/lsp/Makefile.in +++ b/qse/cmd/lsp/Makefile.in @@ -76,15 +76,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -110,10 +105,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/cmd/tgp/Makefile.in b/qse/cmd/tgp/Makefile.in index 7b1c2d7d..ac708600 100644 --- a/qse/cmd/tgp/Makefile.in +++ b/qse/cmd/tgp/Makefile.in @@ -75,15 +75,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -109,10 +104,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/configure b/qse/configure index 2e6359f4..e4b225b1 100755 --- a/qse/configure +++ b/qse/configure @@ -858,7 +858,6 @@ LD GREP RM SED -CJ build build_cpu build_vendor @@ -885,14 +884,6 @@ LIBM BUILD_MODE ENABLE_CXX_TRUE ENABLE_CXX_FALSE -JAVAC_PATH -JAR_PATH -CFLAGS_JNI -JAVAC -JAR -BUILD_JNI -CJFLAGS -BUILD_CJ LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -4632,7 +4623,6 @@ else LD="$ac_cv_prog_LD" fi - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}grep", so it can be a program name with args. set dummy ${ac_tool_prefix}grep; ac_word=$2 @@ -4921,102 +4911,6 @@ else SED="$ac_cv_prog_SED" fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcj; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CJ"; then - ac_cv_prog_CJ="$CJ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CJ="${ac_tool_prefix}gcj" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CJ=$ac_cv_prog_CJ -if test -n "$CJ"; then - { echo "$as_me:$LINENO: result: $CJ" >&5 -echo "${ECHO_T}$CJ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CJ"; then - ac_ct_CJ=$CJ - # Extract the first word of "gcj", so it can be a program name with args. -set dummy gcj; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CJ"; then - ac_cv_prog_ac_ct_CJ="$ac_ct_CJ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CJ="gcj" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CJ=$ac_cv_prog_ac_ct_CJ -if test -n "$ac_ct_CJ"; then - { echo "$as_me:$LINENO: result: $ac_ct_CJ" >&5 -echo "${ECHO_T}$ac_ct_CJ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CJ" = x; then - CJ="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CJ=$ac_ct_CJ - fi -else - CJ="$ac_cv_prog_CJ" -fi - # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then @@ -5826,7 +5720,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5829 "configure"' > conftest.$ac_ext + echo '#line 5723 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8411,11 +8305,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8414: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8308: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8418: \$? = $ac_status" >&5 + echo "$as_me:8312: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8701,11 +8595,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8704: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8598: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8708: \$? = $ac_status" >&5 + echo "$as_me:8602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8805,11 +8699,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8808: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8702: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8812: \$? = $ac_status" >&5 + echo "$as_me:8706: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11182,7 +11076,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13580: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13690: \$? = $ac_status" >&5 + echo "$as_me:13584: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13787,11 +13681,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13790: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13684: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13794: \$? = $ac_status" >&5 + echo "$as_me:13688: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15385,11 +15279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15388: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15282: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15392: \$? = $ac_status" >&5 + echo "$as_me:15286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15489,11 +15383,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15492: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15386: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15496: \$? = $ac_status" >&5 + echo "$as_me:15390: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17709,11 +17603,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17712: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17606: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17716: \$? = $ac_status" >&5 + echo "$as_me:17610: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17999,11 +17893,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18002: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17896: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18006: \$? = $ac_status" >&5 + echo "$as_me:17900: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18103,11 +17997,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18106: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18000: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18110: \$? = $ac_status" >&5 + echo "$as_me:18004: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20795,6 +20689,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' +#dnl overrides the default CFLAGS setting #if test "$ac_test_CFLAGS" = "set" #then # CFLAGS=$ac_save_CFLAGS @@ -20818,18 +20713,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' # CXXFLAGS= # fi #fi -# -#if test "$ac_test_CJFLAGS" = "set" -#then -# CJFLAGS=$ac_save_CJFLAGS -#else -# if test "$CJ" = "gcj" -# then -# CJFLAGS="-O2" -# else -# CJFLAGS= -# fi -#fi CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" @@ -28730,7 +28613,7 @@ else fi -# Configure Makefiles +# configure makefiles # Check whether --enable-reentrant was given. if test "${enable_reentrant+set}" = set; then enableval=$enable_reentrant; enable_reentrant_is=$enableval @@ -28744,206 +28627,6 @@ then CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE" fi -# Java & JNI Configuration -# Extract the first word of "javac", so it can be a program name with args. -set dummy javac; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_JAVAC_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JAVAC_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAC_PATH="$JAVAC_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_JAVAC_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_JAVAC_PATH" && ac_cv_path_JAVAC_PATH=":" - ;; -esac -fi -JAVAC_PATH=$ac_cv_path_JAVAC_PATH -if test -n "$JAVAC_PATH"; then - { echo "$as_me:$LINENO: result: $JAVAC_PATH" >&5 -echo "${ECHO_T}$JAVAC_PATH" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "jar", so it can be a program name with args. -set dummy jar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_JAR_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JAR_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAR_PATH="$JAR_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_JAR_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_JAR_PATH" && ac_cv_path_JAR_PATH=":" - ;; -esac -fi -JAR_PATH=$ac_cv_path_JAR_PATH -if test -n "$JAR_PATH"; then - { echo "$as_me:$LINENO: result: $JAR_PATH" >&5 -echo "${ECHO_T}$JAR_PATH" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - -if test "$JAVAC_PATH" != ":" -then - CUR_JAVAC_PATH="$JAVAC_PATH" - - while ls -ld "$CUR_JAVAC_PATH" 2>/dev/null | grep " -> " >/dev/null - do - { echo "$as_me:$LINENO: checking symlink for $CUR_JAVAC_PATH" >&5 -echo $ECHO_N "checking symlink for $CUR_JAVAC_PATH... $ECHO_C" >&6; } - REAL_JAVAC_PATH=`ls -ld "$CUR_JAVAC_PATH" | sed 's/.* -> //'` - - case "$REAL_JAVAC_PATH" in - /*) CUR_JAVAC_PATH="$REAL_JAVAC_PATH";; - *) CUR_JAVAC_PATH=`echo "X$CUR_JAVAC_PATH" | sed -e 's/^X//' -e 's:[^/]*$::'`"$REAL_JAVAC_PATH";; - esac - - { echo "$as_me:$LINENO: result: $CUR_JAVAC_PATH" >&5 -echo "${ECHO_T}$CUR_JAVAC_PATH" >&6; } - done - - # check if the javavm wrapper is in use - case "$REAL_JAVAC_PATH" in - */javavm) - JAVA_DIR="$REAL_JAVAC_PATH" - while true - do - JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` - if test "$JAVA_DIR" = "" - then - break - fi - - { echo "$as_me:$LINENO: checking $JAVA_DIR/etc/javavms" >&5 -echo $ECHO_N "checking $JAVA_DIR/etc/javavms... $ECHO_C" >&6; } - if test -f "$JAVA_DIR/etc/javavms" - then - # takes the first jvm configured - CUR_JAVAC_PATH=`cat $JAVA_DIR/etc/javavms | head -1` - { echo "$as_me:$LINENO: result: $CUR_JAVAC_PATH" >&5 -echo "${ECHO_T}$CUR_JAVAC_PATH" >&6; } - break; - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - done - ;; - esac - - JAVA_DIR="$CUR_JAVAC_PATH" - - while true - do - JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` - if test "$JAVA_DIR" = "" - then - break - fi - - { echo "$as_me:$LINENO: checking $JAVA_DIR/include/jni.h" >&5 -echo $ECHO_N "checking $JAVA_DIR/include/jni.h... $ECHO_C" >&6; } - if test -f "$JAVA_DIR/include/jni.h" - then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $JAVA_DIR/include" - break; - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - done - - for i in $JNI_INCLUDE_DIRS - do - JNI_MD_H=`find "$i" -name jni_md.h -print` - if test "$JNI_MD_H" != "" - then - tmp=`echo "$JNI_MD_H" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` - JNI_MD_INCLUDE_DIRS="$JNI_MD_INCLUDE_DIRS $tmp" - fi - done - - JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $JNI_MD_INCLUDE_DIRS" - - for i in $JNI_INCLUDE_DIRS - do - CFLAGS_JNI="$CFLAGS_JNI -I$i" - done - - BUILD_JNI="jni" -else - JAVAC_PATH="" - CFLAGS_JNI="" - BUILD_JNI="" -fi - -if test "$CJ" != "" -then - BUILD_CJ="cj" -else - BUILD_CJ= -fi - -CFLAGS_JNI=$CFLAGS_JNI - -JAVAC=$JAVAC_PATH - -JAR=$JAR_PATH - -BUILD_JNI=$BUILD_JNI - -CJFLAGS=$CJFLAGS - -BUILD_CJ=$BUILD_CJ - - ac_config_files="$ac_config_files Makefile include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/awk/Makefile include/qse/lsp/Makefile include/qse/tgp/Makefile include/qse/utl/Makefile lib/Makefile lib/cmn/Makefile lib/awk/Makefile lib/lsp/Makefile lib/tgp/Makefile lib/utl/Makefile cmd/Makefile cmd/awk/Makefile cmd/lsp/Makefile cmd/tgp/Makefile test/Makefile test/cmn/Makefile" cat >confcache <<\_ACEOF @@ -29718,13 +29401,13 @@ LD!$LD$ac_delim GREP!$GREP$ac_delim RM!$RM$ac_delim SED!$SED$ac_delim -CJ!$CJ$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim host!$host$ac_delim host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -29766,7 +29449,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim @@ -29786,19 +29468,11 @@ LIBM!$LIBM$ac_delim BUILD_MODE!$BUILD_MODE$ac_delim ENABLE_CXX_TRUE!$ENABLE_CXX_TRUE$ac_delim ENABLE_CXX_FALSE!$ENABLE_CXX_FALSE$ac_delim -JAVAC_PATH!$JAVAC_PATH$ac_delim -JAR_PATH!$JAR_PATH$ac_delim -CFLAGS_JNI!$CFLAGS_JNI$ac_delim -JAVAC!$JAVAC$ac_delim -JAR!$JAR$ac_delim -BUILD_JNI!$BUILD_JNI$ac_delim -CJFLAGS!$CJFLAGS$ac_delim -BUILD_CJ!$BUILD_CJ$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/qse/configure.ac b/qse/configure.ac index 14602f8a..7a8aedf7 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -3,37 +3,37 @@ AC_INIT([qse],[0.5.0],[bacon@abiyo.net]) AC_CONFIG_HEADER([include/qse/config.h]) AC_CONFIG_AUX_DIR(autoconf) -dnl uses CC and CPP for compilation tests with .c test programs. +dnl use CC and CPP for compilation tests with .c test programs. AC_LANG(C) -dnl initializes automake +dnl initialize automake AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -dnl determines a C compiler to use +dnl determine a C compiler to use AC_PROG_CC -dnl determines a C++ compiler to use +dnl determine a C++ compiler to use AC_PROG_CXX -dnl checks if the C++ compiler exists in PATH. +dnl check if the C++ compiler exists in PATH. AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no) +dnl check other tools AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(RANLIB, ranlib) AC_CHECK_TOOL(STRIP, strip) AC_CHECK_TOOL(OBJDUMP, objdump) AC_CHECK_TOOL(NM, nm) AC_CHECK_TOOL(LD, ld) - AC_CHECK_TOOL(GREP, grep) AC_CHECK_TOOL(RM, rm) AC_CHECK_TOOL(SED, sed) -AC_CHECK_TOOL(CJ, gcj) +dnl initialize libtool AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) -dnl overrides the default CFLAGS setting +#dnl overrides the default CFLAGS setting #if test "$ac_test_CFLAGS" = "set" #then # CFLAGS=$ac_save_CFLAGS @@ -57,23 +57,12 @@ dnl overrides the default CFLAGS setting # CXXFLAGS= # fi #fi -# -#if test "$ac_test_CJFLAGS" = "set" -#then -# CJFLAGS=$ac_save_CJFLAGS -#else -# if test "$CJ" = "gcj" -# then -# CJFLAGS="-O2" -# else -# CJFLAGS= -# fi -#fi -dnl make visible the 64bit interface to the file system +dnl make visible the 64-bit interface to the file system CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -D_LARGEFILE64_SOURCE -DQSE_HAVE_CONFIG_H" +dnl define the WIN32 conditional if necessary case "$host" in *-*-mingw*|*-*-cygwin*) #CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0400" @@ -81,15 +70,15 @@ case "$host" in esac AM_CONDITIONAL(WIN32, test "${platform_win32}" = "yes" ) -dnl Checks for the math library (is -lm needed?) +dnl check the math library (check if -lm is needed) AC_CHECK_LIBM AC_SUBST(LIBM, $LIBM) -dnl Checks for header files. +dnl check header files. AC_HEADER_STDC AC_CHECK_HEADERS([stddef.h wchar.h wctype.h sys/syscall.h]) -dnl Checks data types +dnl check data types AC_CHECK_TYPE([wchar_t], [AC_DEFINE([HAVE_WCHAR_T_IN_STDDEF_H], [],[wchar_t is available in stddef.h])], @@ -110,7 +99,7 @@ AC_CHECK_FUNCS([pow sin cos tan atan atan2 log exp sqrt]) AC_CHECK_FUNCS([powf sinf cosf tanf atanf atan2f logf expf sqrtf]) LIBS="$OLDLIBS" -dnl Checks the size of primitive data types +dnl check the size of primitive data types AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) @@ -197,7 +186,7 @@ AC_ARG_ENABLE([cxx], [AC_HELP_STRING([--enable-cxx], [test "${HAVE_CXX}" = "yes" || enable_cxx_is="no"] AM_CONDITIONAL(ENABLE_CXX, test "${enable_cxx_is}" = "yes" ) -# Configure Makefiles +# configure makefiles AC_ARG_ENABLE([reentrant], [AC_HELP_STRING([--enable-reentrant], [define _REENTRANT (default. yes)])], enable_reentrant_is=$enableval,enable_reentrant_is=yes) @@ -207,112 +196,6 @@ then [CXXFLAGS="$CXXFLAGS -D_REENTRANT -D_THREAD_SAFE"] fi -# Java & JNI Configuration -AC_PATH_PROG(JAVAC_PATH, javac, :) -AC_PATH_PROG(JAR_PATH, jar, :) - -if test "$JAVAC_PATH" != ":" -then - CUR_JAVAC_PATH="$JAVAC_PATH" - - while ls -ld "$CUR_JAVAC_PATH" 2>/dev/null | grep " -> " >/dev/null - do - AC_MSG_CHECKING(symlink for $CUR_JAVAC_PATH) - REAL_JAVAC_PATH=`ls -ld "$CUR_JAVAC_PATH" | sed 's/.* -> //'` - - case "$REAL_JAVAC_PATH" in - /*) CUR_JAVAC_PATH="$REAL_JAVAC_PATH";; - *) CUR_JAVAC_PATH=`echo "X$CUR_JAVAC_PATH" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$REAL_JAVAC_PATH";; - esac - - AC_MSG_RESULT($CUR_JAVAC_PATH) - done - - # check if the javavm wrapper is in use - case "$REAL_JAVAC_PATH" in - */javavm) - JAVA_DIR="$REAL_JAVAC_PATH" - while true - do - JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` - if test "$JAVA_DIR" = "" - then - break - fi - - AC_MSG_CHECKING($JAVA_DIR/etc/javavms) - if test -f "$JAVA_DIR/etc/javavms" - then - # takes the first jvm configured - CUR_JAVAC_PATH=`cat $JAVA_DIR/etc/javavms | head -1` - AC_MSG_RESULT($CUR_JAVAC_PATH) - break; - else - AC_MSG_RESULT(no) - fi - done - ;; - esac - - JAVA_DIR="$CUR_JAVAC_PATH" - - while true - do - JAVA_DIR=`echo "$JAVA_DIR" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` - if test "$JAVA_DIR" = "" - then - break - fi - - AC_MSG_CHECKING($JAVA_DIR/include/jni.h) - if test -f "$JAVA_DIR/include/jni.h" - then - AC_MSG_RESULT(yes) - JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $JAVA_DIR/include" - break; - else - AC_MSG_RESULT(no) - fi - done - - for i in $JNI_INCLUDE_DIRS - do - JNI_MD_H=`find "$i" -name jni_md.h -print` - if test "$JNI_MD_H" != "" - then - tmp=`echo "$JNI_MD_H" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` - JNI_MD_INCLUDE_DIRS="$JNI_MD_INCLUDE_DIRS $tmp" - fi - done - - JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $JNI_MD_INCLUDE_DIRS" - - for i in $JNI_INCLUDE_DIRS - do - CFLAGS_JNI="$CFLAGS_JNI -I$i" - done - - BUILD_JNI="jni" -else - JAVAC_PATH="" - CFLAGS_JNI="" - BUILD_JNI="" -fi - -if test "$CJ" != "" -then - BUILD_CJ="cj" -else - BUILD_CJ= -fi - -AC_SUBST(CFLAGS_JNI, $CFLAGS_JNI) -AC_SUBST(JAVAC, $JAVAC_PATH) -AC_SUBST(JAR, $JAR_PATH) -AC_SUBST(BUILD_JNI, $BUILD_JNI) -AC_SUBST(CJFLAGS, $CJFLAGS) -AC_SUBST(BUILD_CJ, $BUILD_CJ) - AC_CONFIG_FILES([ Makefile include/Makefile diff --git a/qse/include/Makefile.in b/qse/include/Makefile.in index bb08619f..4a345373 100644 --- a/qse/include/Makefile.in +++ b/qse/include/Makefile.in @@ -64,15 +64,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -98,10 +93,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/Makefile.in b/qse/include/qse/Makefile.in index 17dfa6b1..bf117810 100644 --- a/qse/include/qse/Makefile.in +++ b/qse/include/qse/Makefile.in @@ -73,15 +73,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -107,10 +102,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/awk/Makefile.in b/qse/include/qse/awk/Makefile.in index 40dc02e9..e0719d0f 100644 --- a/qse/include/qse/awk/Makefile.in +++ b/qse/include/qse/awk/Makefile.in @@ -65,15 +65,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -99,10 +94,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/cmn/Makefile.am b/qse/include/qse/cmn/Makefile.am index 1f932c1d..a523ad2b 100644 --- a/qse/include/qse/cmn/Makefile.am +++ b/qse/include/qse/cmn/Makefile.am @@ -1,5 +1,5 @@ -pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h fio.h tio.h sio.h time.h +pkginclude_HEADERS = mem.h chr.h str.h lda.h map.h rex.h sll.h dll.h opt.h fio.h pio.h tio.h sio.h time.h pkgincludedir= $(includedir)/qse/cmn diff --git a/qse/include/qse/cmn/Makefile.in b/qse/include/qse/cmn/Makefile.in index d48282c1..1ecf740b 100644 --- a/qse/include/qse/cmn/Makefile.in +++ b/qse/include/qse/cmn/Makefile.in @@ -63,15 +63,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -97,10 +92,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/cmn/pio.h b/qse/include/qse/cmn/pio.h new file mode 100644 index 00000000..a00b372b --- /dev/null +++ b/qse/include/qse/cmn/pio.h @@ -0,0 +1,120 @@ +/* + * $Id$ + */ + +#ifndef _QSE_CMN_PIO_H_ +#define _QSE_CMN_PIO_H_ + +#include +#include + +enum qse_pio_open_flag_t +{ + QSE_PIO_READ = (1 << 1), + QSE_PIO_WRITE = (1 << 2), +}; + +#ifdef _WIN32 +/* => typedef PVOID HANDLE; */ +typedef void* qse_pio_hnd_t; +#else +typedef int qse_pio_hnd_t; +#endif + +/* pipe offset */ +typedef qse_int64_t qse_pio_off_t; +typedef enum qse_pio_seek_origin_t qse_pio_ori_t; + +typedef struct qse_pio_t qse_pio_t; + +struct qse_pio_t +{ + qse_mmgr_t* mmgr; + qse_pio_hnd_t handle; +}; + +#define QSE_PIO_MMGR(pio) ((pio)->mmgr) +#define QSE_PIO_HANDLE(pio) ((pio)->handle) + +#ifdef __cplusplus +extern "C" { +#endif + +/****f* qse.pio/qse_pio_open + * NAME + * qse_pio_open - open a pipe to a child process + * + * DESCRIPTION + * To open a pipe, you should set the flags with at least one of + * QSE_PIO_READ, QSE_PIO_WRITE, QSE_PIO_APPEND. + * + * SYNOPSIS + */ +qse_pio_t* qse_pio_open ( + qse_mmgr_t* mmgr, + qse_size_t ext, + const qse_char_t* path, + int flags, + int mode +); +/******/ + +/****f* qse.pio/qse_pio_close + * NAME + * qse_pio_close - close a pipe + * + * SYNOPSIS + */ +void qse_pio_close ( + qse_pio_t* pio +); +/******/ + +qse_pio_t* qse_pio_init ( + qse_pio_t* pio, + qse_mmgr_t* mmgr, + const qse_char_t* path, + int flags, + int mode +); + +void qse_pio_fini ( + qse_pio_t* pio +); + +qse_pio_hnd_t qse_pio_gethandle ( + qse_pio_t* pio +); + +/****f* qse.cmn.pio/qse_pio_sethandle + * NAME + * qse_pio_sethandle - set the pipe handle + * WARNING + * Avoid using this function if you don't know what you are doing. + * You may have to retrieve the previous handle using qse_pio_gethandle() + * to take relevant actions before resetting it with qse_pio_sethandle(). + * SYNOPSIS + */ +void qse_pio_sethandle ( + qse_pio_t* pio, + qse_pio_hnd_t handle +); +/******/ + +qse_ssize_t qse_pio_read ( + qse_pio_t* pio, + void* buf, + qse_size_t size +); + +qse_ssize_t qse_pio_write ( + qse_pio_t* pio, + const void* buf, + qse_size_t size +); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/qse/include/qse/lsp/Makefile.in b/qse/include/qse/lsp/Makefile.in index 0b6695e7..1dd7ff53 100644 --- a/qse/include/qse/lsp/Makefile.in +++ b/qse/include/qse/lsp/Makefile.in @@ -63,15 +63,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -97,10 +92,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/tgp/Makefile.in b/qse/include/qse/tgp/Makefile.in index c0035c44..4124fa92 100644 --- a/qse/include/qse/tgp/Makefile.in +++ b/qse/include/qse/tgp/Makefile.in @@ -63,15 +63,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -97,10 +92,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/include/qse/utl/Makefile.in b/qse/include/qse/utl/Makefile.in index 93826868..80127163 100644 --- a/qse/include/qse/utl/Makefile.in +++ b/qse/include/qse/utl/Makefile.in @@ -63,15 +63,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -97,10 +92,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in index 52c92420..fd346ef1 100644 --- a/qse/lib/Makefile.in +++ b/qse/lib/Makefile.in @@ -61,15 +61,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -95,10 +90,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/lib/awk/Makefile.in b/qse/lib/awk/Makefile.in index 915be10f..dd0d6629 100644 --- a/qse/lib/awk/Makefile.in +++ b/qse/lib/awk/Makefile.in @@ -100,15 +100,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -134,10 +129,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/lib/awk/std.c b/qse/lib/awk/std.c index 0d4fbea5..334545bd 100644 --- a/qse/lib/awk/std.c +++ b/qse/lib/awk/std.c @@ -360,9 +360,9 @@ static qse_ssize_t awk_extio_pipe ( } else return -1; /* TODO: any way to set the error number? */ - //dprint (QSE_T("opening %s of type %d (pipe)\n"), epa->name, epa->type); + /*dprint (QSE_T("opening %s of type %d (pipe)\n"), epa->name, epa->type);*/ - // TOOD: pipe open.... + /* TOOD: popen.... */ handle = qse_sio_open (qse_awk_getrunmmgr(epa->run), 0, epa->name, mode); if (handle == QSE_NULL) return -1; epa->handle = (void*)handle; @@ -371,7 +371,7 @@ static qse_ssize_t awk_extio_pipe ( case QSE_AWK_IO_CLOSE: { - //dprint (QSE_T("closing %s of type (pipe) %d\n"), epa->name, epa->type); + /*dprint (QSE_T("closing %s of type (pipe) %d\n"), epa->name, epa->type);*/ qse_sio_close ((qse_sio_t*)epa->handle); epa->handle = QSE_NULL; return 0; @@ -439,7 +439,7 @@ static qse_ssize_t awk_extio_file ( } else return -1; /* TODO: any way to set the error number? */ - //dprint (QSE_T("opening %s of type %d (file)\n"), epa->name, epa->type); + /*dprint (QSE_T("opening %s of type %d (file)\n"), epa->name, epa->type);*/ handle = qse_sio_open ( qse_awk_getrunmmgr(epa->run), 0, @@ -463,7 +463,7 @@ static qse_ssize_t awk_extio_file ( case QSE_AWK_IO_CLOSE: { - //dprint (QSE_T("closing %s of type %d (file)\n"), epa->name, epa->type); + /*dprint (QSE_T("closing %s of type %d (file)\n"), epa->name, epa->type);*/ qse_sio_close ((qse_sio_t*)epa->handle); epa->handle = QSE_NULL; return 0; @@ -506,20 +506,20 @@ static int open_extio_console (qse_awk_extio_t* epa) { runio_data_t* rd = (runio_data_t*)epa->data; - //dprint (QSE_T("opening console[%s] of type %x\n"), epa->name, epa->type); + /*dprint (QSE_T("opening console[%s] of type %x\n"), epa->name, epa->type);*/ if (epa->mode == QSE_AWK_EXTIO_CONSOLE_READ) { if (rd->ic.files[rd->ic.index] == QSE_NULL) { /* no more input file */ - //dprint (QSE_T("console - no more file\n"));; + /*dprint (QSE_T("console - no more file\n"));*/ return 0; } if (rd->ic.files[rd->ic.index][0] == QSE_T('\0')) { - //dprint (QSE_T(" console(r) - \n")); + /*dprint (QSE_T(" console(r) - \n"));*/ epa->handle = qse_sio_in; } else @@ -545,7 +545,7 @@ static int open_extio_console (qse_awk_extio_t* epa) return -1; } - //dprint (QSE_T(" console(r) - %s\n"), rd->ic.files[rd->ic.index]); + /*dprint (QSE_T(" console(r) - %s\n"), rd->ic.files[rd->ic.index]);*/ if (qse_awk_setfilename ( epa->run, rd->ic.files[rd->ic.index], qse_strlen(rd->ic.files[rd->ic.index])) == -1) @@ -562,7 +562,7 @@ static int open_extio_console (qse_awk_extio_t* epa) } else if (epa->mode == QSE_AWK_EXTIO_CONSOLE_WRITE) { - //dprint (QSE_T(" console(w) - \n")); + /*dprint (QSE_T(" console(w) - \n"));*/ if (qse_awk_setofilename (epa->run, QSE_T(""), 0) == -1) { @@ -588,7 +588,7 @@ static qse_ssize_t awk_extio_console ( } else if (cmd == QSE_AWK_IO_CLOSE) { - //dprint (QSE_T("closing console of type %x\n"), epa->type); + /*dprint (QSE_T("closing console of type %x\n"), epa->type);*/ if (epa->handle != QSE_NULL && epa->handle != qse_sio_in && @@ -672,7 +672,7 @@ static qse_ssize_t awk_extio_console ( qse_sio_close ((qse_sio_t*)epa->handle); } - //dprint (QSE_T("open the next console [%s]\n"), rd->ic.files[rd->ic.index]); + /*dprint (QSE_T("open the next console [%s]\n"), rd->ic.files[rd->ic.index]);*/ epa->handle = fp; } @@ -698,7 +698,7 @@ static qse_ssize_t awk_extio_console ( int n; qse_sio_t* fp = (qse_sio_t*)epa->handle; - //dprint (QSE_T("switching console[%s] of type %x\n"), epa->name, epa->type); + /*dprint (QSE_T("switching console[%s] of type %x\n"), epa->name, epa->type);*/ n = open_extio_console(epa); if (n == -1) return -1; @@ -1168,6 +1168,7 @@ skip_system: qse_awk_setretval (run, v); return 0; } + #define ADD_FUNC(awk,name,min,max,bfn) \ if (qse_awk_addfunc (\ (awk), (name), qse_strlen(name), \ @@ -1187,6 +1188,5 @@ static int add_functions (qse_awk_t* awk) ADD_FUNC (awk, QSE_T("rand"), 0, 0, bfn_rand); ADD_FUNC (awk, QSE_T("srand"), 0, 1, bfn_srand); ADD_FUNC (awk, QSE_T("system"), 1, 1, bfn_system); - return 0; } diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am index 5a429052..b560dcd5 100644 --- a/qse/lib/cmn/Makefile.am +++ b/qse/lib/cmn/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libqsecmn.la libqsecmn_la_SOURCES = mem.h chr.h \ mem.c chr.c chr_cnv.c rex.c str_bas.c str_cnv.c str_dyn.c \ lda.c map.c sll.c dll.c opt.c \ - fio.c sio.c tio.c tio_get.c tio_put.c \ + fio.c pio.c sio.c tio.c tio_get.c tio_put.c \ time.c \ misc.c libqsecmn_la_LDFLAGS = -version-info 1:0:0 -no-undefined diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in index 518611c5..2b6f1fc3 100644 --- a/qse/lib/cmn/Makefile.in +++ b/qse/lib/cmn/Makefile.in @@ -53,7 +53,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libqsecmn_la_DEPENDENCIES = am_libqsecmn_la_OBJECTS = mem.lo chr.lo chr_cnv.lo rex.lo str_bas.lo \ str_cnv.lo str_dyn.lo lda.lo map.lo sll.lo dll.lo opt.lo \ - fio.lo sio.lo tio.lo tio_get.lo tio_put.lo time.lo misc.lo + fio.lo pio.lo sio.lo tio.lo tio_get.lo tio_put.lo time.lo \ + misc.lo libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS) libqsecmn_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -82,15 +83,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -116,10 +112,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ @@ -206,7 +198,7 @@ lib_LTLIBRARIES = libqsecmn.la libqsecmn_la_SOURCES = mem.h chr.h \ mem.c chr.c chr_cnv.c rex.c str_bas.c str_cnv.c str_dyn.c \ lda.c map.c sll.c dll.c opt.c \ - fio.c sio.c tio.c tio_get.c tio_put.c \ + fio.c pio.c sio.c tio.c tio_get.c tio_put.c \ time.c \ misc.c @@ -290,6 +282,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sll.Plo@am__quote@ diff --git a/qse/lib/cmn/fio.c b/qse/lib/cmn/fio.c index e30f7d07..2bc5b3fa 100644 --- a/qse/lib/cmn/fio.c +++ b/qse/lib/cmn/fio.c @@ -10,16 +10,12 @@ #include #include #else +#include "syscall.h" #include -#include #include #include #endif -#if defined(QSE_USE_SYSCALL) && defined(HAVE_SYS_SYSCALL_H) -#include -#endif - qse_fio_t* qse_fio_open ( qse_mmgr_t* mmgr, qse_size_t ext, const qse_char_t* path, int flags, int mode) @@ -179,11 +175,7 @@ qse_fio_t* qse_fio_init ( desired_access |= O_LARGEFILE; #endif - #ifdef SYS_open - handle = syscall (SYS_open, path_mb, desired_access, mode); - #else - handle = open (path_mb, desired_access, mode); - #endif + handle = QSE_OPEN (path_mb, desired_access, mode); } if (handle == -1) return QSE_NULL; @@ -199,11 +191,7 @@ void qse_fio_fini (qse_fio_t* fio) #ifdef _WIN32 CloseHandle (fio->handle); #else - #if defined(SYS_close) - syscall (SYS_close, fio->handle); - #else - close (fio->handle); - #endif + QSE_CLOSE (fio->handle); #endif } @@ -295,15 +283,7 @@ int qse_fio_truncate (qse_fio_t* fio, qse_fio_off_t size) return 0; #else - #if !defined(_LP64) && defined(SYS_ftruncate64) - return syscall (SYS_ftruncate64, fio->handle, size); - #elif defined(SYS_ftruncate) - return syscall (SYS_ftruncate, fio->handle, size); - #elif !defined(_LP64) && defined(HAVE_FTRUNCATE64) - return ftruncate64 (fio->handle, size); - #else - return ftruncate (fio->handle, size); - #endif + return QSE_TRUNCATE (fio->handle, size); #endif } @@ -316,11 +296,7 @@ qse_ssize_t qse_fio_read (qse_fio_t* fio, void* buf, qse_size_t size) return (qse_ssize_t)count; #else if (size > QSE_TYPE_MAX(size_t)) size = QSE_TYPE_MAX(size_t); - #ifdef SYS_read - return syscall (SYS_read, fio->handle, buf, size); - #else - return read (fio->handle, buf, size); - #endif + return QSE_READ (fio->handle, buf, size); #endif } @@ -333,11 +309,7 @@ qse_ssize_t qse_fio_write (qse_fio_t* fio, const void* data, qse_size_t size) return (qse_ssize_t)count; #else if (size > QSE_TYPE_MAX(size_t)) size = QSE_TYPE_MAX(size_t); - #ifdef SYS_write - return syscall (SYS_write, fio->handle, data, size); - #else - return write (fio->handle, data, size); - #endif + return QSE_WRITE (fio->handle, data, size); #endif } diff --git a/qse/lib/cmn/pio.c b/qse/lib/cmn/pio.c new file mode 100644 index 00000000..6914ad8d --- /dev/null +++ b/qse/lib/cmn/pio.c @@ -0,0 +1,117 @@ +/* + * $Id: pio.c,v 1.23 2006/06/30 04:18:47 bacon Exp $ + */ + +#include +#include "mem.h" + +#ifdef _WIN32 +#include +#include +#include +#else +#include "syscall.h" +#include +#include +#include +#include +#endif + +qse_pio_t* qse_pio_open ( + qse_mmgr_t* mmgr, qse_size_t ext, + const qse_char_t* path, int flags, int mode) +{ + qse_pio_t* pio; + + if (mmgr == QSE_NULL) + { + mmgr = QSE_MMGR_GETDFL(); + + QSE_ASSERTX (mmgr != QSE_NULL, + "Set the memory manager with QSE_MMGR_SETDFL()"); + + if (mmgr == QSE_NULL) return QSE_NULL; + } + + pio = QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_pio_t) + ext); + if (pio == QSE_NULL) return QSE_NULL; + + if (qse_pio_init (pio, mmgr, path, flags, mode) == QSE_NULL) + { + QSE_MMGR_FREE (mmgr, pio); + return QSE_NULL; + } + + return pio; +} + +void qse_pio_close (qse_pio_t* pio) +{ + qse_pio_fini (pio); + QSE_MMGR_FREE (pio->mmgr, pio); +} + +qse_pio_t* qse_pio_init ( + qse_pio_t* pio, qse_mmgr_t* mmgr, + const qse_char_t* path, int flags, int mode) +{ + qse_pio_hnd_t handle; + + QSE_MEMSET (pio, 0, QSE_SIZEOF(*pio)); + pio->mmgr = mmgr; + +#ifdef _WIN32 + handle = -1; +#else + handle = -1; +#endif + + pio->handle = handle; + return pio; +} + +void qse_pio_fini (qse_pio_t* pio) +{ +#ifdef _WIN32 + CloseHandle (pio->handle); +#else + QSE_CLOSE (pio->handle); +#endif +} + +qse_pio_hnd_t qse_pio_gethandle (qse_pio_t* pio) +{ + return pio->handle; +} + +void qse_pio_sethandle (qse_pio_t* pio, qse_pio_hnd_t handle) +{ + pio->handle = handle; +} + +qse_ssize_t qse_pio_read (qse_pio_t* pio, void* buf, qse_size_t size) +{ +#ifdef _WIN32 + DWORD count; + if (size > QSE_TYPE_MAX(DWORD)) size = QSE_TYPE_MAX(DWORD); + if (ReadFile(pio->handle, buf, size, &count, QSE_NULL) == FALSE) return -1; + return (qse_ssize_t)count; +#else + if (size > QSE_TYPE_MAX(size_t)) size = QSE_TYPE_MAX(size_t); + return QSE_READ (pio->handle, buf, size); +#endif +} + +qse_ssize_t qse_pio_write (qse_pio_t* pio, const void* data, qse_size_t size) +{ +#ifdef _WIN32 + DWORD count; + if (size > QSE_TYPE_MAX(DWORD)) size = QSE_TYPE_MAX(DWORD); + if (WriteFile(pio->handle, data, size, &count, QSE_NULL) == FALSE) return -1; + return (qse_ssize_t)count; +#else + if (size > QSE_TYPE_MAX(size_t)) size = QSE_TYPE_MAX(size_t); + return QSE_WRITE (pio->handle, data, size); +#endif +} + diff --git a/qse/lib/cmn/syscall.h b/qse/lib/cmn/syscall.h new file mode 100644 index 00000000..af6ea713 --- /dev/null +++ b/qse/lib/cmn/syscall.h @@ -0,0 +1,52 @@ +#ifndef _QSE_LIB_CMN_SYSCALL_H_ +#define _QSE_LIB_CMN_SYSCALL_H_ + +#if defined(HAVE_UNISTD_H) +#include +#endif + +#if defined(QSE_USE_SYSCALL) && defined(HAVE_SYS_SYSCALL_H) +#include +#endif + +#ifdef SYS_open + #define QSE_OPEN(path,flags,mode) syscall(SYS_open,path,flags,mode) +#else + #define QSE_OPEN(path,flags,mode) open(path,flags,mode) +#endif + +#ifdef SYS_close + #define QSE_CLOSE(handle) syscall(SYS_close,handle) +#else + #define QSE_CLOSE(handle) close(handle) +#endif + +#ifdef SYS_read + #define QSE_READ(handle,buf,size) syscall(SYS_read,handle,buf,size) +#else + #define QSE_READ(handle,buf,size) read(handle,buf,size) +#endif + +#ifdef SYS_write + #define QSE_WRITE(handle,buf,size) syscall(SYS_write,handle,buf,size) +#else + #define QSE_WRITE(handle,buf,size) write(handle,buf,size) +#endif + +#if !defined(_LP64) && defined(SYS_ftruncate64) + #define QSE_FTRUNCATE(handle,size) syscall(SYS_ftruncate64,handle,size) +#elif defined(SYS_ftruncate) + #define QSE_FTRUNCATE(handle,size) syscall(SYS_ftruncate,handle,size) +#elif !defined(_LP64) && defined(HAVE_FTRUNCATE64) + #define QSE_FTRUNCATE(handle,size) ftruncate64(handle,size) +#else + #define QSE_FTRUNCATE(handle,size) ftruncate(handle,size) +#endif + +#ifdef SYS_fork + #define QSE_FORK() syscall(SYS_fork) +#else + #define QSE_FORK() fork() +#endif + +#endif diff --git a/qse/lib/lsp/Makefile.in b/qse/lib/lsp/Makefile.in index 21cae6db..a22a3d96 100644 --- a/qse/lib/lsp/Makefile.in +++ b/qse/lib/lsp/Makefile.in @@ -82,15 +82,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -116,10 +111,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/lib/tgp/Makefile.in b/qse/lib/tgp/Makefile.in index 73363b16..c761de05 100644 --- a/qse/lib/tgp/Makefile.in +++ b/qse/lib/tgp/Makefile.in @@ -80,15 +80,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -114,10 +109,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/lib/utl/Makefile.in b/qse/lib/utl/Makefile.in index 47da86cd..1150cdac 100644 --- a/qse/lib/utl/Makefile.in +++ b/qse/lib/utl/Makefile.in @@ -80,15 +80,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -114,10 +109,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/test/Makefile.in b/qse/test/Makefile.in index c3923bb7..fd9063d6 100644 --- a/qse/test/Makefile.in +++ b/qse/test/Makefile.in @@ -62,15 +62,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -96,10 +91,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBM = @LIBM@ diff --git a/qse/test/cmn/Makefile.in b/qse/test/cmn/Makefile.in index a59bc00f..c2a24488 100644 --- a/qse/test/cmn/Makefile.in +++ b/qse/test/cmn/Makefile.in @@ -105,15 +105,10 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CJ = @BUILD_CJ@ -BUILD_JNI = @BUILD_JNI@ BUILD_MODE = @BUILD_MODE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CFLAGS_JNI = @CFLAGS_JNI@ -CJ = @CJ@ -CJFLAGS = @CJFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -139,10 +134,6 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -JAR = @JAR@ -JAR_PATH = @JAR_PATH@ -JAVAC = @JAVAC@ -JAVAC_PATH = @JAVAC_PATH@ LD = @LD@ LDFLAGS = -L../../lib/cmn -L../../lib/utl LIBM = @LIBM@