added nwio timeout handler for win32

added PROCINFO handler for win32
This commit is contained in:
2012-08-01 04:00:39 +00:00
parent c7cea1d985
commit a448d6c399
41 changed files with 667 additions and 729 deletions

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -485,15 +485,10 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -412,46 +412,46 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
awk01$(EXEEXT): $(awk01_OBJECTS) $(awk01_DEPENDENCIES) $(EXTRA_awk01_DEPENDENCIES)
awk01$(EXEEXT): $(awk01_OBJECTS) $(awk01_DEPENDENCIES)
@rm -f awk01$(EXEEXT)
$(LINK) $(awk01_OBJECTS) $(awk01_LDADD) $(LIBS)
awk02$(EXEEXT): $(awk02_OBJECTS) $(awk02_DEPENDENCIES) $(EXTRA_awk02_DEPENDENCIES)
awk02$(EXEEXT): $(awk02_OBJECTS) $(awk02_DEPENDENCIES)
@rm -f awk02$(EXEEXT)
$(LINK) $(awk02_OBJECTS) $(awk02_LDADD) $(LIBS)
awk03$(EXEEXT): $(awk03_OBJECTS) $(awk03_DEPENDENCIES) $(EXTRA_awk03_DEPENDENCIES)
awk03$(EXEEXT): $(awk03_OBJECTS) $(awk03_DEPENDENCIES)
@rm -f awk03$(EXEEXT)
$(LINK) $(awk03_OBJECTS) $(awk03_LDADD) $(LIBS)
awk04$(EXEEXT): $(awk04_OBJECTS) $(awk04_DEPENDENCIES) $(EXTRA_awk04_DEPENDENCIES)
awk04$(EXEEXT): $(awk04_OBJECTS) $(awk04_DEPENDENCIES)
@rm -f awk04$(EXEEXT)
$(LINK) $(awk04_OBJECTS) $(awk04_LDADD) $(LIBS)
awk05$(EXEEXT): $(awk05_OBJECTS) $(awk05_DEPENDENCIES) $(EXTRA_awk05_DEPENDENCIES)
awk05$(EXEEXT): $(awk05_OBJECTS) $(awk05_DEPENDENCIES)
@rm -f awk05$(EXEEXT)
$(CXXLINK) $(awk05_OBJECTS) $(awk05_LDADD) $(LIBS)
awk06$(EXEEXT): $(awk06_OBJECTS) $(awk06_DEPENDENCIES) $(EXTRA_awk06_DEPENDENCIES)
awk06$(EXEEXT): $(awk06_OBJECTS) $(awk06_DEPENDENCIES)
@rm -f awk06$(EXEEXT)
$(CXXLINK) $(awk06_OBJECTS) $(awk06_LDADD) $(LIBS)
awk07$(EXEEXT): $(awk07_OBJECTS) $(awk07_DEPENDENCIES) $(EXTRA_awk07_DEPENDENCIES)
awk07$(EXEEXT): $(awk07_OBJECTS) $(awk07_DEPENDENCIES)
@rm -f awk07$(EXEEXT)
$(CXXLINK) $(awk07_OBJECTS) $(awk07_LDADD) $(LIBS)
awk08$(EXEEXT): $(awk08_OBJECTS) $(awk08_DEPENDENCIES) $(EXTRA_awk08_DEPENDENCIES)
awk08$(EXEEXT): $(awk08_OBJECTS) $(awk08_DEPENDENCIES)
@rm -f awk08$(EXEEXT)
$(CXXLINK) $(awk08_OBJECTS) $(awk08_LDADD) $(LIBS)
awk09$(EXEEXT): $(awk09_OBJECTS) $(awk09_DEPENDENCIES) $(EXTRA_awk09_DEPENDENCIES)
awk09$(EXEEXT): $(awk09_OBJECTS) $(awk09_DEPENDENCIES)
@rm -f awk09$(EXEEXT)
$(LINK) $(awk09_OBJECTS) $(awk09_LDADD) $(LIBS)
awk10$(EXEEXT): $(awk10_OBJECTS) $(awk10_DEPENDENCIES) $(EXTRA_awk10_DEPENDENCIES)
awk10$(EXEEXT): $(awk10_OBJECTS) $(awk10_DEPENDENCIES)
@rm -f awk10$(EXEEXT)
$(LINK) $(awk10_OBJECTS) $(awk10_LDADD) $(LIBS)
awk11$(EXEEXT): $(awk11_OBJECTS) $(awk11_DEPENDENCIES) $(EXTRA_awk11_DEPENDENCIES)
awk11$(EXEEXT): $(awk11_OBJECTS) $(awk11_DEPENDENCIES)
@rm -f awk11$(EXEEXT)
$(LINK) $(awk11_OBJECTS) $(awk11_LDADD) $(LIBS)
awk12$(EXEEXT): $(awk12_OBJECTS) $(awk12_DEPENDENCIES) $(EXTRA_awk12_DEPENDENCIES)
awk12$(EXEEXT): $(awk12_OBJECTS) $(awk12_DEPENDENCIES)
@rm -f awk12$(EXEEXT)
$(CXXLINK) $(awk12_OBJECTS) $(awk12_LDADD) $(LIBS)
awk13$(EXEEXT): $(awk13_OBJECTS) $(awk13_DEPENDENCIES) $(EXTRA_awk13_DEPENDENCIES)
awk13$(EXEEXT): $(awk13_OBJECTS) $(awk13_DEPENDENCIES)
@rm -f awk13$(EXEEXT)
$(CXXLINK) $(awk13_OBJECTS) $(awk13_LDADD) $(LIBS)
awk14$(EXEEXT): $(awk14_OBJECTS) $(awk14_DEPENDENCIES) $(EXTRA_awk14_DEPENDENCIES)
awk14$(EXEEXT): $(awk14_OBJECTS) $(awk14_DEPENDENCIES)
@rm -f awk14$(EXEEXT)
$(CXXLINK) $(awk14_OBJECTS) $(awk14_LDADD) $(LIBS)
@ -623,15 +623,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -490,100 +490,100 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
chr01$(EXEEXT): $(chr01_OBJECTS) $(chr01_DEPENDENCIES) $(EXTRA_chr01_DEPENDENCIES)
chr01$(EXEEXT): $(chr01_OBJECTS) $(chr01_DEPENDENCIES)
@rm -f chr01$(EXEEXT)
$(LINK) $(chr01_OBJECTS) $(chr01_LDADD) $(LIBS)
dll$(EXEEXT): $(dll_OBJECTS) $(dll_DEPENDENCIES) $(EXTRA_dll_DEPENDENCIES)
dll$(EXEEXT): $(dll_OBJECTS) $(dll_DEPENDENCIES)
@rm -f dll$(EXEEXT)
$(LINK) $(dll_OBJECTS) $(dll_LDADD) $(LIBS)
env$(EXEEXT): $(env_OBJECTS) $(env_DEPENDENCIES) $(EXTRA_env_DEPENDENCIES)
env$(EXEEXT): $(env_OBJECTS) $(env_DEPENDENCIES)
@rm -f env$(EXEEXT)
$(LINK) $(env_OBJECTS) $(env_LDADD) $(LIBS)
fio01$(EXEEXT): $(fio01_OBJECTS) $(fio01_DEPENDENCIES) $(EXTRA_fio01_DEPENDENCIES)
fio01$(EXEEXT): $(fio01_OBJECTS) $(fio01_DEPENDENCIES)
@rm -f fio01$(EXEEXT)
$(LINK) $(fio01_OBJECTS) $(fio01_LDADD) $(LIBS)
fio02$(EXEEXT): $(fio02_OBJECTS) $(fio02_DEPENDENCIES) $(EXTRA_fio02_DEPENDENCIES)
fio02$(EXEEXT): $(fio02_OBJECTS) $(fio02_DEPENDENCIES)
@rm -f fio02$(EXEEXT)
$(LINK) $(fio02_OBJECTS) $(fio02_LDADD) $(LIBS)
fma$(EXEEXT): $(fma_OBJECTS) $(fma_DEPENDENCIES) $(EXTRA_fma_DEPENDENCIES)
fma$(EXEEXT): $(fma_OBJECTS) $(fma_DEPENDENCIES)
@rm -f fma$(EXEEXT)
$(LINK) $(fma_OBJECTS) $(fma_LDADD) $(LIBS)
fmt01$(EXEEXT): $(fmt01_OBJECTS) $(fmt01_DEPENDENCIES) $(EXTRA_fmt01_DEPENDENCIES)
fmt01$(EXEEXT): $(fmt01_OBJECTS) $(fmt01_DEPENDENCIES)
@rm -f fmt01$(EXEEXT)
$(LINK) $(fmt01_OBJECTS) $(fmt01_LDADD) $(LIBS)
fmt02$(EXEEXT): $(fmt02_OBJECTS) $(fmt02_DEPENDENCIES) $(EXTRA_fmt02_DEPENDENCIES)
fmt02$(EXEEXT): $(fmt02_OBJECTS) $(fmt02_DEPENDENCIES)
@rm -f fmt02$(EXEEXT)
$(LINK) $(fmt02_OBJECTS) $(fmt02_LDADD) $(LIBS)
fs01$(EXEEXT): $(fs01_OBJECTS) $(fs01_DEPENDENCIES) $(EXTRA_fs01_DEPENDENCIES)
fs01$(EXEEXT): $(fs01_OBJECTS) $(fs01_DEPENDENCIES)
@rm -f fs01$(EXEEXT)
$(LINK) $(fs01_OBJECTS) $(fs01_LDADD) $(LIBS)
htb$(EXEEXT): $(htb_OBJECTS) $(htb_DEPENDENCIES) $(EXTRA_htb_DEPENDENCIES)
htb$(EXEEXT): $(htb_OBJECTS) $(htb_DEPENDENCIES)
@rm -f htb$(EXEEXT)
$(LINK) $(htb_OBJECTS) $(htb_LDADD) $(LIBS)
ipad01$(EXEEXT): $(ipad01_OBJECTS) $(ipad01_DEPENDENCIES) $(EXTRA_ipad01_DEPENDENCIES)
ipad01$(EXEEXT): $(ipad01_OBJECTS) $(ipad01_DEPENDENCIES)
@rm -f ipad01$(EXEEXT)
$(LINK) $(ipad01_OBJECTS) $(ipad01_LDADD) $(LIBS)
lda$(EXEEXT): $(lda_OBJECTS) $(lda_DEPENDENCIES) $(EXTRA_lda_DEPENDENCIES)
lda$(EXEEXT): $(lda_OBJECTS) $(lda_DEPENDENCIES)
@rm -f lda$(EXEEXT)
$(LINK) $(lda_OBJECTS) $(lda_LDADD) $(LIBS)
main01$(EXEEXT): $(main01_OBJECTS) $(main01_DEPENDENCIES) $(EXTRA_main01_DEPENDENCIES)
main01$(EXEEXT): $(main01_OBJECTS) $(main01_DEPENDENCIES)
@rm -f main01$(EXEEXT)
$(LINK) $(main01_OBJECTS) $(main01_LDADD) $(LIBS)
main02$(EXEEXT): $(main02_OBJECTS) $(main02_DEPENDENCIES) $(EXTRA_main02_DEPENDENCIES)
main02$(EXEEXT): $(main02_OBJECTS) $(main02_DEPENDENCIES)
@rm -f main02$(EXEEXT)
$(LINK) $(main02_OBJECTS) $(main02_LDADD) $(LIBS)
mbwc01$(EXEEXT): $(mbwc01_OBJECTS) $(mbwc01_DEPENDENCIES) $(EXTRA_mbwc01_DEPENDENCIES)
mbwc01$(EXEEXT): $(mbwc01_OBJECTS) $(mbwc01_DEPENDENCIES)
@rm -f mbwc01$(EXEEXT)
$(LINK) $(mbwc01_OBJECTS) $(mbwc01_LDADD) $(LIBS)
mbwc02$(EXEEXT): $(mbwc02_OBJECTS) $(mbwc02_DEPENDENCIES) $(EXTRA_mbwc02_DEPENDENCIES)
mbwc02$(EXEEXT): $(mbwc02_OBJECTS) $(mbwc02_DEPENDENCIES)
@rm -f mbwc02$(EXEEXT)
$(LINK) $(mbwc02_OBJECTS) $(mbwc02_LDADD) $(LIBS)
nwad01$(EXEEXT): $(nwad01_OBJECTS) $(nwad01_DEPENDENCIES) $(EXTRA_nwad01_DEPENDENCIES)
nwad01$(EXEEXT): $(nwad01_OBJECTS) $(nwad01_DEPENDENCIES)
@rm -f nwad01$(EXEEXT)
$(LINK) $(nwad01_OBJECTS) $(nwad01_LDADD) $(LIBS)
oht$(EXEEXT): $(oht_OBJECTS) $(oht_DEPENDENCIES) $(EXTRA_oht_DEPENDENCIES)
oht$(EXEEXT): $(oht_OBJECTS) $(oht_DEPENDENCIES)
@rm -f oht$(EXEEXT)
$(LINK) $(oht_OBJECTS) $(oht_LDADD) $(LIBS)
path01$(EXEEXT): $(path01_OBJECTS) $(path01_DEPENDENCIES) $(EXTRA_path01_DEPENDENCIES)
path01$(EXEEXT): $(path01_OBJECTS) $(path01_DEPENDENCIES)
@rm -f path01$(EXEEXT)
$(LINK) $(path01_OBJECTS) $(path01_LDADD) $(LIBS)
pio$(EXEEXT): $(pio_OBJECTS) $(pio_DEPENDENCIES) $(EXTRA_pio_DEPENDENCIES)
pio$(EXEEXT): $(pio_OBJECTS) $(pio_DEPENDENCIES)
@rm -f pio$(EXEEXT)
$(LINK) $(pio_OBJECTS) $(pio_LDADD) $(LIBS)
pma$(EXEEXT): $(pma_OBJECTS) $(pma_DEPENDENCIES) $(EXTRA_pma_DEPENDENCIES)
pma$(EXEEXT): $(pma_OBJECTS) $(pma_DEPENDENCIES)
@rm -f pma$(EXEEXT)
$(LINK) $(pma_OBJECTS) $(pma_LDADD) $(LIBS)
rbt$(EXEEXT): $(rbt_OBJECTS) $(rbt_DEPENDENCIES) $(EXTRA_rbt_DEPENDENCIES)
rbt$(EXEEXT): $(rbt_OBJECTS) $(rbt_DEPENDENCIES)
@rm -f rbt$(EXEEXT)
$(LINK) $(rbt_OBJECTS) $(rbt_LDADD) $(LIBS)
rex01$(EXEEXT): $(rex01_OBJECTS) $(rex01_DEPENDENCIES) $(EXTRA_rex01_DEPENDENCIES)
rex01$(EXEEXT): $(rex01_OBJECTS) $(rex01_DEPENDENCIES)
@rm -f rex01$(EXEEXT)
$(LINK) $(rex01_OBJECTS) $(rex01_LDADD) $(LIBS)
sio01$(EXEEXT): $(sio01_OBJECTS) $(sio01_DEPENDENCIES) $(EXTRA_sio01_DEPENDENCIES)
sio01$(EXEEXT): $(sio01_OBJECTS) $(sio01_DEPENDENCIES)
@rm -f sio01$(EXEEXT)
$(LINK) $(sio01_OBJECTS) $(sio01_LDADD) $(LIBS)
sio02$(EXEEXT): $(sio02_OBJECTS) $(sio02_DEPENDENCIES) $(EXTRA_sio02_DEPENDENCIES)
sio02$(EXEEXT): $(sio02_OBJECTS) $(sio02_DEPENDENCIES)
@rm -f sio02$(EXEEXT)
$(LINK) $(sio02_OBJECTS) $(sio02_LDADD) $(LIBS)
sio03$(EXEEXT): $(sio03_OBJECTS) $(sio03_DEPENDENCIES) $(EXTRA_sio03_DEPENDENCIES)
sio03$(EXEEXT): $(sio03_OBJECTS) $(sio03_DEPENDENCIES)
@rm -f sio03$(EXEEXT)
$(LINK) $(sio03_OBJECTS) $(sio03_LDADD) $(LIBS)
sll$(EXEEXT): $(sll_OBJECTS) $(sll_DEPENDENCIES) $(EXTRA_sll_DEPENDENCIES)
sll$(EXEEXT): $(sll_OBJECTS) $(sll_DEPENDENCIES)
@rm -f sll$(EXEEXT)
$(LINK) $(sll_OBJECTS) $(sll_LDADD) $(LIBS)
slmb01$(EXEEXT): $(slmb01_OBJECTS) $(slmb01_DEPENDENCIES) $(EXTRA_slmb01_DEPENDENCIES)
slmb01$(EXEEXT): $(slmb01_OBJECTS) $(slmb01_DEPENDENCIES)
@rm -f slmb01$(EXEEXT)
$(LINK) $(slmb01_OBJECTS) $(slmb01_LDADD) $(LIBS)
str01$(EXEEXT): $(str01_OBJECTS) $(str01_DEPENDENCIES) $(EXTRA_str01_DEPENDENCIES)
str01$(EXEEXT): $(str01_OBJECTS) $(str01_DEPENDENCIES)
@rm -f str01$(EXEEXT)
$(LINK) $(str01_OBJECTS) $(str01_LDADD) $(LIBS)
time$(EXEEXT): $(time_OBJECTS) $(time_DEPENDENCIES) $(EXTRA_time_DEPENDENCIES)
time$(EXEEXT): $(time_OBJECTS) $(time_DEPENDENCIES)
@rm -f time$(EXEEXT)
$(LINK) $(time_OBJECTS) $(time_LDADD) $(LIBS)
tre01$(EXEEXT): $(tre01_OBJECTS) $(tre01_DEPENDENCIES) $(EXTRA_tre01_DEPENDENCIES)
tre01$(EXEEXT): $(tre01_OBJECTS) $(tre01_DEPENDENCIES)
@rm -f tre01$(EXEEXT)
$(LINK) $(tre01_OBJECTS) $(tre01_LDADD) $(LIBS)
xma$(EXEEXT): $(xma_OBJECTS) $(xma_DEPENDENCIES) $(EXTRA_xma_DEPENDENCIES)
xma$(EXEEXT): $(xma_OBJECTS) $(xma_DEPENDENCIES)
@rm -f xma$(EXEEXT)
$(LINK) $(xma_OBJECTS) $(xma_LDADD) $(LIBS)
@ -752,15 +752,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -308,7 +308,7 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
cut01$(EXEEXT): $(cut01_OBJECTS) $(cut01_DEPENDENCIES) $(EXTRA_cut01_DEPENDENCIES)
cut01$(EXEEXT): $(cut01_OBJECTS) $(cut01_DEPENDENCIES)
@rm -f cut01$(EXEEXT)
$(LINK) $(cut01_OBJECTS) $(cut01_LDADD) $(LIBS)
@ -446,15 +446,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -315,10 +315,10 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
http01$(EXEEXT): $(http01_OBJECTS) $(http01_DEPENDENCIES) $(EXTRA_http01_DEPENDENCIES)
http01$(EXEEXT): $(http01_OBJECTS) $(http01_DEPENDENCIES)
@rm -f http01$(EXEEXT)
$(LINK) $(http01_OBJECTS) $(http01_LDADD) $(LIBS)
upxd01$(EXEEXT): $(upxd01_OBJECTS) $(upxd01_DEPENDENCIES) $(EXTRA_upxd01_DEPENDENCIES)
upxd01$(EXEEXT): $(upxd01_OBJECTS) $(upxd01_DEPENDENCIES)
@rm -f upxd01$(EXEEXT)
$(LINK) $(upxd01_OBJECTS) $(upxd01_LDADD) $(LIBS)
@ -457,15 +457,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:

View File

@ -509,11 +509,15 @@ static qse_upxd_cbs_t upxd_cbs =
/* ------------------------------------------------------------------- */
typedef struct tr_t tr_t;
struct tr_t
{
unsigned int line;
qse_sio_t* sio;
qse_str_t* t;
unsigned int tl;
qse_char_t last;
};
tr_t* tr_open (const qse_char_t* name)
@ -523,6 +527,9 @@ tr_t* tr_open (const qse_char_t* name)
tr = malloc (QSE_SIZEOF(*tr));
if (tr == QSE_NULL) return QSE_NULL;
memset (tr, 0, sizeof(*tr));
tr->line = 1;
tr->sio = qse_sio_open (QSE_MMGR_GETDFL(), 0, name, QSE_SIO_READ);
if (tr->sio == QSE_NULL)
{
@ -554,32 +561,56 @@ qse_char_t* tr_getnext (tr_t* tr)
qse_str_clear (tr->t);
while (1)
if (tr->last)
{
if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL;
if (c == QSE_CHAR_EOF) return QSE_NULL;
if (!QSE_ISSPACE(c))
tr->tl = tr->line;
if (qse_str_ccat (tr->t, tr->last) == (qse_ssize_t)-1) return QSE_NULL;
tr->last = 0;
}
else
{
/* skip spaces */
while (1)
{
if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL;
if (c == QSE_CHAR_EOF) return QSE_NULL;
if (c == QSE_T('\n')) tr->line++;
if (!QSE_ISSPACE(c)) break;
}
tr->tl = tr->line;
if (c == QSE_T(';') || c == QSE_T('{') || c == QSE_T('}'))
{
if (qse_str_ccat (tr->t, c) == (qse_ssize_t)-1) return QSE_NULL;
break;
}
}
while (1)
{
if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL;
if (c == QSE_CHAR_EOF || QSE_ISSPACE(c)) break;
if (qse_str_ccat (tr->t, c) == (qse_ssize_t)-1) return QSE_NULL;
else
{
do
{
if (qse_str_ccat (tr->t, c) == (qse_ssize_t)-1) return QSE_NULL;
if (qse_sio_getc (tr->sio, &c) <= -1) return QSE_NULL;
if (c == QSE_CHAR_EOF) break;
if (c == QSE_T('\n')) tr->line++;
if (QSE_ISSPACE(c)) break;
else if (c == QSE_T(';') || c == QSE_T('{') || c == QSE_T('}'))
{
tr->last = c;
break;
}
}
while (1);
}
}
return QSE_STR_PTR(tr->t);
}
/* ------------------------------------------------------------------- */
#if 0
struct svc_rule_t
struct cfg_rule_t
{
struct
{
@ -597,48 +628,131 @@ struct svc_rule_t
} fwd;
};
struct svc_t
typedef struct cfg_listen_t cfg_listen_t;
struct cfg_listen_t
{
qse_nwad_t nwad;
qse_char_t* dev;
qse_char_t dev[64];
cfg_rule_t* rule;
};
#endif
typedef struct cfg_t cfg_t;
struct cfg_t
{
qse_nwad_t nwad;
cfg_listen_t* list;
};
cfg_t* cfg_open (void)
{
cfg_t* cfg;
cfg = malloc (QSE_SIZEOF(*cfg));
if (cfg == QSE_NULL) return QSE_NULL;
return cfg;
}
void cfg_close (cfg_t*)
{
free (cfg);
}
cfg_listen_t* cfg_addlisten (cfg_t* cfg, qse_nwad_t nwad, const qse_char_t* dev)
{
cfg_listen_t* ptr;
ptr = malloc (QSE_SIZEOF(*ptr));
if (ptr == QSE_NULL) return QSE_NULL;
ptr->nwad = nwad;
qse_strxcpy (ptr->dev, QSE_COUNTOF(ptr->dev), dev);
ptr->rule = QSE_NULL;
return ptr;
}
static cfg_t* load_cfg (const qse_char_t* name)
{
tr_t* tr;
const qse_char_t* t;
cfg_t* cfg;
cfg_listen_t cfglis;
qse_nwad_t nwad;
cfg = malloc (QSE_SIZEOF(*cfg));
if (cfg == QSE_NULL) return QSE_NULL;
tr = tr_open (name);
if (tr == QSE_NULL) return QSE_NULL;
if (tr == QSE_NULL) goto oops;
do
{
t = tr_getnext(tr);
if (t == QSE_NULL) break;
if (qse_strcmp (t, QSE_T("listen")) == 0)
{
nwad = tr_getnext (tr);
dev = tr_getnext (tr);
tmp = tr_getnext (tr);
if (qse_strcmp (tmp, QSE_T("{")) != 0)
tmp = tr_getnext(tr);
if (tmp == QSE_NULL || qse_strtonwad (tmp, &nwad) <= -1)
{
qse_printf (QSE_T("line %u: ipaddr:port expected after 'listen'\n"), (unsigned int)tr->tl);
goto oops;
}
tmp = tr_getnext (tr);
if (tmp == QSE_NULL)
{
qse_printf (QSE_T("line %u: 'dev' or { expected\n"), (unsigned int)tr->tl);
goto oops;
}
if (qse_strcmp (tmp, QSE_T("dev")) == 0)
{
tmp = tr_getnext (tr);
if (tmp == QSE_NULL)
{
qse_printf (QSE_T("line %u: device name expected\n"), (unsigned int)tr->tl);
goto oops;
}
if (cfg_addlisten (cfg, &nwad, tmp) <= -1)
{
qse_printf (QSE_T("line %u: failed to add a new service\n"), (unsigned int)tr->tl);
goto oops;
}
tmp = tr_getnext (tr);
if (tmp == QSE_NULL)
{
qse_printf (QSE_T("line %u: { expected\n"), (unsigned int)tr->tl);
goto oops;
}
}
if (qse_strcmp (tmp, QSE_T('{')) != 0)
{
qse_printf (QSE_T("line %u: { expected\n"), (unsigned int)tr->tl);
goto oops;
}
while (1)
{
from = tr_getnext (tr);
if (qse_strcmp (tmp, QSE_T("from")) != 0)
tmp = tr_getnext (tr);
if (tmp == QSE_NULL)
{
qse_printf (QSE_T("line %u: } expected\n"), (unsigned int)tr->tl);
goto oops;
}
src.nwad = tr_getnext (tr);
action = tr_getnext(tr);
if (qse_strcmp (tmp, QSE_T("}")) == 0) break;
if (qse_strcmp (tmp, QSE_T("from")) != 0)
{
qse_printf (QSE_T("line %u: 'from' expected\n"), (unsigned int)tr->tl);
}
tmp = tr_getnext (tr);
if (qse_strcmp (action, QSE_T("drop")) == 0)
@ -662,11 +776,19 @@ static cfg_t* load_cfg (const qse_char_t* name)
{
}
}
else break;
else
{
qse_printf (QSE_T("line %u: 'listen' expected\n"), (unsigned int)tr->tl);
goto oops;
}
}
while (1);
tr_close (tr);
return cfg;
oops:
if (tr) tr_close (tr);
return QSE_NULL;
}
static void free_cfg (cfg_t* cfg)

View File

@ -1,9 +1,9 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -335,13 +335,13 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
sed01$(EXEEXT): $(sed01_OBJECTS) $(sed01_DEPENDENCIES) $(EXTRA_sed01_DEPENDENCIES)
sed01$(EXEEXT): $(sed01_OBJECTS) $(sed01_DEPENDENCIES)
@rm -f sed01$(EXEEXT)
$(LINK) $(sed01_OBJECTS) $(sed01_LDADD) $(LIBS)
sed02$(EXEEXT): $(sed02_OBJECTS) $(sed02_DEPENDENCIES) $(EXTRA_sed02_DEPENDENCIES)
sed02$(EXEEXT): $(sed02_OBJECTS) $(sed02_DEPENDENCIES)
@rm -f sed02$(EXEEXT)
$(CXXLINK) $(sed02_OBJECTS) $(sed02_LDADD) $(LIBS)
sed03$(EXEEXT): $(sed03_OBJECTS) $(sed03_DEPENDENCIES) $(EXTRA_sed03_DEPENDENCIES)
sed03$(EXEEXT): $(sed03_OBJECTS) $(sed03_DEPENDENCIES)
@rm -f sed03$(EXEEXT)
$(CXXLINK) $(sed03_OBJECTS) $(sed03_LDADD) $(LIBS)
@ -502,15 +502,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic: