enhanced sio,pio,fio to support win9x

fixed minor bugs in sio,pio,fio
This commit is contained in:
2012-02-19 14:38:22 +00:00
parent b330d2c350
commit 5cc0e408b3
62 changed files with 715 additions and 270 deletions

View File

@ -41,6 +41,10 @@ bin_PROGRAMS = \
LDFLAGS = -L../../lib/cmn
LDADD = -lqsecmn
if WIN32
LDADD += $(UNICOWS_LIBS)
endif
chr01_SOURCES = chr01.c
env_SOURCES = env.c
dll_SOURCES = dll.c

View File

@ -42,6 +42,7 @@ bin_PROGRAMS = chr01$(EXEEXT) env$(EXEEXT) dll$(EXEEXT) fio01$(EXEEXT) \
rbt$(EXEEXT) sio01$(EXEEXT) sio02$(EXEEXT) sio03$(EXEEXT) \
sll$(EXEEXT) slmb01$(EXEEXT) str01$(EXEEXT) time$(EXEEXT) \
tre01$(EXEEXT) xma$(EXEEXT)
@WIN32_TRUE@am__append_1 = $(UNICOWS_LIBS)
subdir = samples/cmn
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -61,123 +62,125 @@ PROGRAMS = $(bin_PROGRAMS)
am_chr01_OBJECTS = chr01.$(OBJEXT)
chr01_OBJECTS = $(am_chr01_OBJECTS)
chr01_LDADD = $(LDADD)
chr01_DEPENDENCIES =
am__DEPENDENCIES_1 =
@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
chr01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_dll_OBJECTS = dll.$(OBJEXT)
dll_OBJECTS = $(am_dll_OBJECTS)
dll_LDADD = $(LDADD)
dll_DEPENDENCIES =
dll_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_env_OBJECTS = env.$(OBJEXT)
env_OBJECTS = $(am_env_OBJECTS)
env_LDADD = $(LDADD)
env_DEPENDENCIES =
env_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fio01_OBJECTS = fio01.$(OBJEXT)
fio01_OBJECTS = $(am_fio01_OBJECTS)
fio01_LDADD = $(LDADD)
fio01_DEPENDENCIES =
fio01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fio02_OBJECTS = fio02.$(OBJEXT)
fio02_OBJECTS = $(am_fio02_OBJECTS)
fio02_LDADD = $(LDADD)
fio02_DEPENDENCIES =
fio02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fma_OBJECTS = fma.$(OBJEXT)
fma_OBJECTS = $(am_fma_OBJECTS)
fma_LDADD = $(LDADD)
fma_DEPENDENCIES =
fma_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fmt01_OBJECTS = fmt01.$(OBJEXT)
fmt01_OBJECTS = $(am_fmt01_OBJECTS)
fmt01_LDADD = $(LDADD)
fmt01_DEPENDENCIES =
fmt01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fmt02_OBJECTS = fmt02.$(OBJEXT)
fmt02_OBJECTS = $(am_fmt02_OBJECTS)
fmt02_LDADD = $(LDADD)
fmt02_DEPENDENCIES =
fmt02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_fs01_OBJECTS = fs01.$(OBJEXT)
fs01_OBJECTS = $(am_fs01_OBJECTS)
fs01_LDADD = $(LDADD)
fs01_DEPENDENCIES =
fs01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_htb_OBJECTS = htb.$(OBJEXT)
htb_OBJECTS = $(am_htb_OBJECTS)
htb_LDADD = $(LDADD)
htb_DEPENDENCIES =
htb_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_lda_OBJECTS = lda.$(OBJEXT)
lda_OBJECTS = $(am_lda_OBJECTS)
lda_LDADD = $(LDADD)
lda_DEPENDENCIES =
lda_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_main01_OBJECTS = main01.$(OBJEXT)
main01_OBJECTS = $(am_main01_OBJECTS)
main01_LDADD = $(LDADD)
main01_DEPENDENCIES =
main01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_main02_OBJECTS = main02.$(OBJEXT)
main02_OBJECTS = $(am_main02_OBJECTS)
main02_LDADD = $(LDADD)
main02_DEPENDENCIES =
main02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_mbwc01_OBJECTS = mbwc01.$(OBJEXT)
mbwc01_OBJECTS = $(am_mbwc01_OBJECTS)
mbwc01_LDADD = $(LDADD)
mbwc01_DEPENDENCIES =
mbwc01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_mbwc02_OBJECTS = mbwc02.$(OBJEXT)
mbwc02_OBJECTS = $(am_mbwc02_OBJECTS)
mbwc02_LDADD = $(LDADD)
mbwc02_DEPENDENCIES =
mbwc02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_oht_OBJECTS = oht.$(OBJEXT)
oht_OBJECTS = $(am_oht_OBJECTS)
oht_LDADD = $(LDADD)
oht_DEPENDENCIES =
oht_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_path01_OBJECTS = path01.$(OBJEXT)
path01_OBJECTS = $(am_path01_OBJECTS)
path01_LDADD = $(LDADD)
path01_DEPENDENCIES =
path01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_pio_OBJECTS = pio.$(OBJEXT)
pio_OBJECTS = $(am_pio_OBJECTS)
pio_LDADD = $(LDADD)
pio_DEPENDENCIES =
pio_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_pma_OBJECTS = pma.$(OBJEXT)
pma_OBJECTS = $(am_pma_OBJECTS)
pma_LDADD = $(LDADD)
pma_DEPENDENCIES =
pma_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_rbt_OBJECTS = rbt.$(OBJEXT)
rbt_OBJECTS = $(am_rbt_OBJECTS)
rbt_LDADD = $(LDADD)
rbt_DEPENDENCIES =
rbt_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_rex01_OBJECTS = rex01.$(OBJEXT)
rex01_OBJECTS = $(am_rex01_OBJECTS)
rex01_LDADD = $(LDADD)
rex01_DEPENDENCIES =
rex01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_sio01_OBJECTS = sio01.$(OBJEXT)
sio01_OBJECTS = $(am_sio01_OBJECTS)
sio01_LDADD = $(LDADD)
sio01_DEPENDENCIES =
sio01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_sio02_OBJECTS = sio02.$(OBJEXT)
sio02_OBJECTS = $(am_sio02_OBJECTS)
sio02_LDADD = $(LDADD)
sio02_DEPENDENCIES =
sio02_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_sio03_OBJECTS = sio03.$(OBJEXT)
sio03_OBJECTS = $(am_sio03_OBJECTS)
sio03_LDADD = $(LDADD)
sio03_DEPENDENCIES =
sio03_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_sll_OBJECTS = sll.$(OBJEXT)
sll_OBJECTS = $(am_sll_OBJECTS)
sll_LDADD = $(LDADD)
sll_DEPENDENCIES =
sll_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_slmb01_OBJECTS = slmb01.$(OBJEXT)
slmb01_OBJECTS = $(am_slmb01_OBJECTS)
slmb01_LDADD = $(LDADD)
slmb01_DEPENDENCIES =
slmb01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_str01_OBJECTS = str01.$(OBJEXT)
str01_OBJECTS = $(am_str01_OBJECTS)
str01_LDADD = $(LDADD)
str01_DEPENDENCIES =
str01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_time_OBJECTS = time.$(OBJEXT)
time_OBJECTS = $(am_time_OBJECTS)
time_LDADD = $(LDADD)
time_DEPENDENCIES =
time_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_tre01_OBJECTS = tre01.$(OBJEXT)
tre01_OBJECTS = $(am_tre01_OBJECTS)
tre01_LDADD = $(LDADD)
tre01_DEPENDENCIES =
tre01_DEPENDENCIES = $(am__DEPENDENCIES_2)
am_xma_OBJECTS = xma.$(OBJEXT)
xma_OBJECTS = $(am_xma_OBJECTS)
xma_LDADD = $(LDADD)
xma_DEPENDENCIES =
xma_DEPENDENCIES = $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
am__depfiles_maybe = depfiles
@ -304,6 +307,7 @@ SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@
STRIP = @STRIP@
TRUE = @TRUE@
UNICOWS_LIBS = @UNICOWS_LIBS@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@ -365,7 +369,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(includedir)
LDADD = -lqsecmn
LDADD = -lqsecmn $(am__append_1)
chr01_SOURCES = chr01.c
env_SOURCES = env.c
dll_SOURCES = dll.c

View File

@ -8,7 +8,6 @@
# include <windows.h>
#endif
static int test_main (int argc, qse_char_t* argv[])
{
int i;
@ -33,8 +32,8 @@ int qse_main (int argc, qse_achar_t* argv[])
}
else
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgr (qse_slmbcmgr);
}
#else

View File

@ -25,19 +25,13 @@
static int pio1 (const qse_char_t* cmd, qse_env_t* env, int oflags, qse_pio_hid_t rhid)
{
qse_pio_t* pio;
qse_pio_t pio;
int x;
pio = qse_pio_open (
QSE_MMGR_GETDFL(),
0,
cmd,
env,
oflags
);
if (pio == QSE_NULL)
if (qse_pio_init (&pio, QSE_MMGR_GETDFL(), cmd, env, oflags) <= -1)
{
qse_printf (QSE_T("cannot open program through pipe\n"));
qse_printf (QSE_T("cannot open program through pipe - %d\n"),
(int)qse_pio_geterrnum(&pio));
return -1;
}
@ -46,14 +40,14 @@ static int pio1 (const qse_char_t* cmd, qse_env_t* env, int oflags, qse_pio_hid_
qse_byte_t buf[128];
qse_ssize_t i;
/*qse_pio_canread (pio, QSE_PIO_ERR, 1000)*/
qse_ssize_t n = qse_pio_read (pio, rhid, buf, QSE_SIZEOF(buf));
/*qse_pio_canread (&pio, QSE_PIO_ERR, 1000)*/
qse_ssize_t n = qse_pio_read (&pio, rhid, buf, QSE_SIZEOF(buf));
if (n == 0) break;
if (n <= -1)
{
qse_printf (
QSE_T("qse_pio_read() returned error - %d\n"),
(int)qse_pio_geterrnum(pio)
(int)qse_pio_geterrnum(&pio)
);
break;
}
@ -70,14 +64,14 @@ static int pio1 (const qse_char_t* cmd, qse_env_t* env, int oflags, qse_pio_hid_
qse_printf (QSE_T("]\n"));
}
x = qse_pio_wait (pio);
x = qse_pio_wait (&pio);
qse_printf (QSE_T("qse_pio_wait returns %d\n"), x);
if (x <= -1)
{
qse_printf (QSE_T("error code : %d\n"), (int)qse_pio_geterrnum(pio));
qse_printf (QSE_T("error code : %d\n"), (int)qse_pio_geterrnum(&pio));
}
qse_pio_close (pio);
qse_pio_fini (&pio);
return 0;
}