diff --git a/qse/cmd/scm/scm.c b/qse/cmd/scm/scm.c
index b98dd650..3a99568a 100644
--- a/qse/cmd/scm/scm.c
+++ b/qse/cmd/scm/scm.c
@@ -274,6 +274,19 @@ pio1 (QSE_T("ls -laF"), QSE_PIO_READOUT|QSE_PIO_WRITEIN|/*QSE_PIO_SHELL|*/QSE_PI
qse_printf (QSE_T("sizeof(wchar_t) = %d\n"), (int)sizeof(wchar_t));
}
+{
+ const qse_char_t* x = QSE_T("rate:num,burst:num,mode:abc,name:xxx,size:num,max:num,expire:num,gcinterval:num");
+
+ const qse_char_t* p = x;
+ qse_cstr_t tok;
+
+ while (p)
+ {
+ p = qse_strtok (p, QSE_T(","), &tok);
+ qse_printf (QSE_T("[%.*s]\n"), (int)tok.len, tok.ptr);
+ }
+}
+
{
qse_scm_ent_t* x1, * x2;
diff --git a/qse/include/qse/cmn/str.h b/qse/include/qse/cmn/str.h
index bbd366a0..35e08c34 100644
--- a/qse/include/qse/cmn/str.h
+++ b/qse/include/qse/cmn/str.h
@@ -1,5 +1,5 @@
/*
- * $Id: str.h 429 2011-04-11 14:15:30Z hyunghwan.chung $
+ * $Id: str.h 430 2011-04-12 15:36:18Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@@ -1516,6 +1516,59 @@ int qse_wcsspltrn (
# define qse_strspltrn(str,delim,lquote,rquote,escape,trset) qse_wcsspltrn(str,delim,lquote,rquote,escape,trset)
#endif
+
+qse_mchar_t* qse_mbstok (
+ const qse_mchar_t* s,
+ const qse_mchar_t* delim,
+ qse_mcstr_t* tok
+);
+
+qse_mchar_t* qse_mbsxtok (
+ const qse_mchar_t* s,
+ qse_size_t len,
+ const qse_mchar_t* delim,
+ qse_mcstr_t* tok
+);
+
+qse_mchar_t* qse_mbsxntok (
+ const qse_mchar_t* s,
+ qse_size_t len,
+ const qse_mchar_t* delim,
+ qse_size_t delim_len,
+ qse_mcstr_t* tok
+);
+
+qse_wchar_t* qse_wcstok (
+ const qse_wchar_t* s,
+ const qse_wchar_t* delim,
+ qse_wcstr_t* tok
+);
+
+qse_wchar_t* qse_wcsxtok (
+ const qse_wchar_t* s,
+ qse_size_t len,
+ const qse_wchar_t* delim,
+ qse_wcstr_t* tok
+);
+
+qse_wchar_t* qse_wcsxntok (
+ const qse_wchar_t* s,
+ qse_size_t len,
+ const qse_wchar_t* delim,
+ qse_size_t delim_len,
+ qse_wcstr_t* tok
+);
+
+#ifdef QSE_CHAR_IS_MCHAR
+# define qse_strtok(s,d,t) qse_mbstok(s,d,t)
+# define qse_strxtok(s,len,d,t) qse_mbsxtok(s,len,d,t)
+# define qse_strxntok(s,len,d,dl,t) qse_mbsxntok(s,len,d,dl,t)
+#else
+# define qse_strtok(s,d,t) qse_wcstok(s,d,t)
+# define qse_strxtok(s,len,d,t) qse_wcsxtok(s,len,d,t)
+# define qse_strxntok(s,len,d,dl,t) qse_wcsxntok(s,len,d,dl,t)
+#endif
+
/**
* The qse_mbstrmx() function strips leading spaces and/or trailing
* spaces off a string depending on the opt parameter. You can form
diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am
index f178e500..f1ee1668 100644
--- a/qse/lib/cmn/Makefile.am
+++ b/qse/lib/cmn/Makefile.am
@@ -12,7 +12,7 @@ libqsecmn_la_SOURCES = \
str_beg.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c \
str_dup.c str_dyn.c str_end.c str_fcpy.c str_len.c str_pac.c \
str_pbrk.c str_put.c str_spl.c str_spn.c str_str.c str_subst.c \
- str_trm.c str_word.c \
+ str_tok.c str_trm.c str_word.c \
lda.c oht.c htb.c rbt.c sll.c gdl.c dll.c opt.c \
tio.c tio_get.c tio_put.c \
fio.c pio.c sio.c \
diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in
index 0db1a238..ae1deb7f 100644
--- a/qse/lib/cmn/Makefile.in
+++ b/qse/lib/cmn/Makefile.in
@@ -76,8 +76,8 @@ am_libqsecmn_la_OBJECTS = mem.lo xma.lo fma.lo chr.lo chr_cnv.lo \
rex.lo str_beg.lo str_cat.lo str_chr.lo str_cnv.lo str_cmp.lo \
str_cpy.lo str_dup.lo str_dyn.lo str_end.lo str_fcpy.lo str_len.lo \
str_pac.lo str_pbrk.lo str_put.lo str_spl.lo str_spn.lo str_str.lo \
- str_subst.lo str_trm.lo str_word.lo lda.lo oht.lo htb.lo rbt.lo sll.lo \
- gdl.lo dll.lo opt.lo tio.lo tio_get.lo tio_put.lo fio.lo \
+ str_subst.lo str_tok.lo str_trm.lo str_word.lo lda.lo oht.lo htb.lo \
+ rbt.lo sll.lo gdl.lo dll.lo opt.lo tio.lo tio_get.lo tio_put.lo fio.lo \
pio.lo sio.lo alg_search.lo alg_sort.lo time.lo misc.lo \
assert.lo main.lo stdio.lo
libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
@@ -270,7 +270,7 @@ libqsecmn_la_SOURCES = \
str_beg.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c \
str_dup.c str_dyn.c str_end.c str_fcpy.c str_len.c str_pac.c \
str_pbrk.c str_put.c str_spl.c str_spn.c str_str.c str_subst.c \
- str_trm.c str_word.c \
+ str_tok.c str_trm.c str_word.c \
lda.c oht.c htb.c rbt.c sll.c gdl.c dll.c opt.c \
tio.c tio_get.c tio_put.c \
fio.c pio.c sio.c \
@@ -406,6 +406,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_spn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_str.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_subst.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_tok.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_trm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_word.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@
diff --git a/qse/lib/cmn/str_tok.c b/qse/lib/cmn/str_tok.c
new file mode 100644
index 00000000..e231b8aa
--- /dev/null
+++ b/qse/lib/cmn/str_tok.c
@@ -0,0 +1,501 @@
+/*
+ * $Id$
+ *
+ Copyright 2006-2009 Chung, Hyung-Hwan.
+ This file is part of QSE.
+
+ QSE is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of
+ the License, or (at your option) any later version.
+
+ QSE is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with QSE. If not, see .
+ */
+
+#include
+#include
+
+qse_mchar_t* qse_mbstok (
+ const qse_mchar_t* s, const qse_mchar_t* delim, qse_mcstr_t* tok)
+{
+ const qse_mchar_t* p = s, *d;
+ const qse_mchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ qse_mchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_mchar_tacters */
+ while (/* *p != QSE_MT('\0') && */ QSE_ISMSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; *d != QSE_MT('\0'); d++)
+ if (!QSE_ISMSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0) {
+
+ /* when QSE_NULL is given as "delim", it has an effect of cutting
+ preceding and trailing space characters off "s". */
+ while ((c = *p) != QSE_MT('\0'))
+ {
+ if (!QSE_ISMSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while ((c = *p) != QSE_MT('\0'))
+ {
+ if (QSE_ISMSPACE(c)) break;
+
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else
+ { /* if (delim_mode == 2) { */
+ while ((c = *p) != QSE_MT('\0'))
+ {
+ if (QSE_ISMSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; *d; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_mchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+ return (c == QSE_MT('\0'))? QSE_NULL: ((qse_mchar_t*)++p);
+}
+
+qse_mchar_t* qse_mbsxtok (
+ const qse_mchar_t* s, qse_size_t len,
+ const qse_mchar_t* delim, qse_mcstr_t* tok)
+{
+ const qse_mchar_t* p = s, *d;
+ const qse_mchar_t* end = s + len;
+ const qse_mchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ qse_mchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_mchar_tacters */
+ while (p < end && QSE_ISMSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; *d != QSE_MT('\0'); d++)
+ if (!QSE_ISMSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0)
+ {
+ /* when QSE_NULL is given as "delim", it has an effect of
+ * cutting preceding and trailing space qse_mchar_tacters
+ * off "s". */
+ while (p < end)
+ {
+ c = *p;
+ if (!QSE_ISMSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISMSPACE(c)) break;
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else
+ { /* if (delim_mode == 2) { */
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISMSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; *d; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_mchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+
+ return (p >= end)? QSE_NULL: ((qse_mchar_t*)++p);
+}
+
+qse_mchar_t* qse_mbsxntok (
+ const qse_mchar_t* s, qse_size_t len,
+ const qse_mchar_t* delim, qse_size_t delim_len, qse_mcstr_t* tok)
+{
+ const qse_mchar_t* p = s, *d;
+ const qse_mchar_t* end = s + len;
+ const qse_mchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ const qse_mchar_t* delim_end = delim + delim_len;
+ qse_mchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_mchar_tacters */
+ while (p < end && QSE_ISMSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; d < delim_end; d++)
+ if (!QSE_ISMSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0)
+ {
+ /* when QSE_NULL is given as "delim", it has an effect of cutting
+ preceding and trailing space qse_mchar_tacters off "s". */
+ while (p < end)
+ {
+ c = *p;
+
+ if (!QSE_ISMSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISMSPACE(c)) break;
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else /* if (delim_mode == 2) */
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISMSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; d < delim_end; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_mchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+
+ return (p >= end)? QSE_NULL: ((qse_mchar_t*)++p);
+}
+
+
+qse_wchar_t* qse_wcstok (
+ const qse_wchar_t* s, const qse_wchar_t* delim, qse_wcstr_t* tok)
+{
+ const qse_wchar_t* p = s, *d;
+ const qse_wchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ qse_wchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_wchar_tacters */
+ while (/* *p != QSE_WT('\0') && */ QSE_ISWSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; *d != QSE_WT('\0'); d++)
+ if (!QSE_ISWSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0)
+ {
+ /* when QSE_NULL is given as "delim", it has an effect of
+ * cutting preceding and trailing space characters off "s". */
+ while ((c = *p) != QSE_WT('\0'))
+ {
+ if (!QSE_ISWSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while ((c = *p) != QSE_WT('\0'))
+ {
+ if (QSE_ISWSPACE(c)) break;
+
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else
+ { /* if (delim_mode == 2) { */
+ while ((c = *p) != QSE_WT('\0'))
+ {
+ if (QSE_ISWSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; *d; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_wchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+ return (c == QSE_WT('\0'))? QSE_NULL: ((qse_wchar_t*)++p);
+}
+
+qse_wchar_t* qse_wcsxtok (
+ const qse_wchar_t* s, qse_size_t len,
+ const qse_wchar_t* delim, qse_wcstr_t* tok)
+{
+ const qse_wchar_t* p = s, *d;
+ const qse_wchar_t* end = s + len;
+ const qse_wchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ qse_wchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_wchar_tacters */
+ while (p < end && QSE_ISWSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; *d != QSE_WT('\0'); d++)
+ if (!QSE_ISWSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0)
+ {
+ /* when QSE_NULL is given as "delim", it has an effect of
+ * cutting preceding and trailing space qse_wchar_tacters
+ * off "s". */
+ while (p < end)
+ {
+ c = *p;
+ if (!QSE_ISWSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISWSPACE(c)) break;
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else
+ { /* if (delim_mode == 2) { */
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISWSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; *d; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_wchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+
+ return (p >= end)? QSE_NULL: ((qse_wchar_t*)++p);
+}
+
+qse_wchar_t* qse_wcsxntok (
+ const qse_wchar_t* s, qse_size_t len,
+ const qse_wchar_t* delim, qse_size_t delim_len, qse_wcstr_t* tok)
+{
+ const qse_wchar_t* p = s, *d;
+ const qse_wchar_t* end = s + len;
+ const qse_wchar_t* sp = QSE_NULL, * ep = QSE_NULL;
+ const qse_wchar_t* delim_end = delim + delim_len;
+ qse_wchar_t c;
+ int delim_mode;
+
+ /* skip preceding space qse_wchar_tacters */
+ while (p < end && QSE_ISWSPACE(*p)) p++;
+
+ if (delim == QSE_NULL) delim_mode = 0;
+ else
+ {
+ delim_mode = 1;
+ for (d = delim; d < delim_end; d++)
+ if (!QSE_ISWSPACE(*d)) delim_mode = 2;
+ }
+
+ if (delim_mode == 0)
+ {
+ /* when QSE_NULL is given as "delim", it has an effect of
+ * cutting preceding and trailing space qse_wchar_tacters
+ * off "s". */
+ while (p < end)
+ {
+ c = *p;
+
+ if (!QSE_ISWSPACE(c))
+ {
+ if (sp == QSE_NULL) sp = p;
+ ep = p;
+ }
+ p++;
+ }
+ }
+ else if (delim_mode == 1)
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISWSPACE(c)) break;
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+ else /* if (delim_mode == 2) */
+ {
+ while (p < end)
+ {
+ c = *p;
+ if (QSE_ISWSPACE(c))
+ {
+ p++;
+ continue;
+ }
+ for (d = delim; d < delim_end; d++)
+ {
+ if (c == *d) goto exit_loop;
+ }
+ if (sp == QSE_NULL) sp = p;
+ ep = p++;
+ }
+ }
+
+exit_loop:
+ if (sp == QSE_NULL)
+ {
+ tok->ptr = QSE_NULL;
+ tok->len = (qse_size_t)0;
+ }
+ else
+ {
+ tok->ptr = (qse_wchar_t*)sp;
+ tok->len = ep - sp + 1;
+ }
+
+ return (p >= end)? QSE_NULL: ((qse_wchar_t*)++p);
+}
+
diff --git a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
index 4178639b..34002d75 100755
--- a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
@@ -42,7 +42,7 @@ WVList
0
10
WPickList
-51
+52
11
MItem
3
@@ -800,7 +800,7 @@ WVList
179
MItem
32
-..\..\..\..\..\lib\cmn\str_trm.c
+..\..\..\..\..\lib\cmn\str_tok.c
180
WString
4
@@ -817,8 +817,8 @@ WVList
0
183
MItem
-33
-..\..\..\..\..\lib\cmn\str_word.c
+32
+..\..\..\..\..\lib\cmn\str_trm.c
184
WString
4
@@ -835,8 +835,8 @@ WVList
0
187
MItem
-29
-..\..\..\..\..\lib\cmn\time.c
+33
+..\..\..\..\..\lib\cmn\str_word.c
188
WString
4
@@ -853,8 +853,8 @@ WVList
0
191
MItem
-28
-..\..\..\..\..\lib\cmn\tio.c
+29
+..\..\..\..\..\lib\cmn\time.c
192
WString
4
@@ -871,8 +871,8 @@ WVList
0
195
MItem
-32
-..\..\..\..\..\lib\cmn\tio_get.c
+28
+..\..\..\..\..\lib\cmn\tio.c
196
WString
4
@@ -890,7 +890,7 @@ WVList
199
MItem
32
-..\..\..\..\..\lib\cmn\tio_put.c
+..\..\..\..\..\lib\cmn\tio_get.c
200
WString
4
@@ -907,8 +907,8 @@ WVList
0
203
MItem
-28
-..\..\..\..\..\lib\cmn\xma.c
+32
+..\..\..\..\..\lib\cmn\tio_put.c
204
WString
4
@@ -925,26 +925,26 @@ WVList
0
207
MItem
-3
-*.h
+28
+..\..\..\..\..\lib\cmn\xma.c
208
WString
-3
-NIL
+4
+COBJ
209
WVList
0
210
WVList
0
--1
+11
1
1
0
211
MItem
-28
-..\..\..\..\..\lib\cmn\mem.h
+3
+*.h
212
WString
3
@@ -955,14 +955,14 @@ WVList
214
WVList
0
-207
+-1
1
1
0
215
MItem
-32
-..\..\..\..\..\lib\cmn\syscall.h
+28
+..\..\..\..\..\lib\cmn\mem.h
216
WString
3
@@ -973,7 +973,25 @@ WVList
218
WVList
0
-207
+211
+1
+1
+0
+219
+MItem
+32
+..\..\..\..\..\lib\cmn\syscall.h
+220
+WString
+3
+NIL
+221
+WVList
+0
+222
+WVList
+0
+211
1
1
0
diff --git a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt
index 545affb5..af112258 100755
--- a/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/debug/win32/lib/cmn/qsecmn.tgt
@@ -42,7 +42,7 @@ WVList
0
10
WPickList
-51
+52
11
MItem
3
@@ -800,7 +800,7 @@ WVList
179
MItem
32
-..\..\..\..\..\lib\cmn\str_trm.c
+..\..\..\..\..\lib\cmn\str_tok.c
180
WString
4
@@ -817,8 +817,8 @@ WVList
0
183
MItem
-33
-..\..\..\..\..\lib\cmn\str_word.c
+32
+..\..\..\..\..\lib\cmn\str_trm.c
184
WString
4
@@ -835,8 +835,8 @@ WVList
0
187
MItem
-29
-..\..\..\..\..\lib\cmn\time.c
+33
+..\..\..\..\..\lib\cmn\str_word.c
188
WString
4
@@ -853,8 +853,8 @@ WVList
0
191
MItem
-28
-..\..\..\..\..\lib\cmn\tio.c
+29
+..\..\..\..\..\lib\cmn\time.c
192
WString
4
@@ -871,8 +871,8 @@ WVList
0
195
MItem
-32
-..\..\..\..\..\lib\cmn\tio_get.c
+28
+..\..\..\..\..\lib\cmn\tio.c
196
WString
4
@@ -890,7 +890,7 @@ WVList
199
MItem
32
-..\..\..\..\..\lib\cmn\tio_put.c
+..\..\..\..\..\lib\cmn\tio_get.c
200
WString
4
@@ -907,8 +907,8 @@ WVList
0
203
MItem
-28
-..\..\..\..\..\lib\cmn\xma.c
+32
+..\..\..\..\..\lib\cmn\tio_put.c
204
WString
4
@@ -925,26 +925,26 @@ WVList
0
207
MItem
-3
-*.h
+28
+..\..\..\..\..\lib\cmn\xma.c
208
WString
-3
-NIL
+4
+COBJ
209
WVList
0
210
WVList
0
--1
+11
1
1
0
211
MItem
-28
-..\..\..\..\..\lib\cmn\mem.h
+3
+*.h
212
WString
3
@@ -955,14 +955,14 @@ WVList
214
WVList
0
-207
+-1
1
1
0
215
MItem
-32
-..\..\..\..\..\lib\cmn\syscall.h
+28
+..\..\..\..\..\lib\cmn\mem.h
216
WString
3
@@ -973,7 +973,25 @@ WVList
218
WVList
0
-207
+211
+1
+1
+0
+219
+MItem
+32
+..\..\..\..\..\lib\cmn\syscall.h
+220
+WString
+3
+NIL
+221
+WVList
+0
+222
+WVList
+0
+211
1
1
0
diff --git a/qse/watcom/qse.wpj b/qse/watcom/qse.wpj
index 95a8fb00..a385b537 100755
--- a/qse/watcom/qse.wpj
+++ b/qse/watcom/qse.wpj
@@ -68,8 +68,8 @@ WVList
VComponent
18
WRect
-840
-3160
+410
+1906
5700
4240
0
@@ -79,7 +79,7 @@ WFileName
30
release/os2/lib/cmn/qsecmn.tgt
18
-22
+24
20
VComponent
21
@@ -142,8 +142,8 @@ WRect
WFileName
28
debug/os2/lib/cmn/qsecmn.tgt
-24
-31
+37
+41
32
VComponent
33
@@ -184,7 +184,7 @@ WRect
1680
5700
4240
-1
+0
0
40
WFileName
@@ -207,7 +207,7 @@ WFileName
30
debug/win32/lib/cmn/qsecmn.tgt
17
-22
+24
44
VComponent
45
@@ -232,7 +232,7 @@ WRect
40
5700
4240
-0
+1
0
49
WFileName
@@ -240,4 +240,4 @@ WFileName
debug/win32/cmd/scm/qsescm.tgt
0
1
-29
+38
diff --git a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
index 0628f4cc..86acb80d 100755
--- a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
+++ b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
@@ -42,7 +42,7 @@ WVList
0
10
WPickList
-51
+52
11
MItem
3
@@ -864,7 +864,7 @@ WVList
195
MItem
32
-..\..\..\..\..\lib\cmn\str_trm.c
+..\..\..\..\..\lib\cmn\str_tok.c
196
WString
4
@@ -881,8 +881,8 @@ WVList
0
199
MItem
-33
-..\..\..\..\..\lib\cmn\str_word.c
+32
+..\..\..\..\..\lib\cmn\str_trm.c
200
WString
4
@@ -899,8 +899,8 @@ WVList
0
203
MItem
-29
-..\..\..\..\..\lib\cmn\time.c
+33
+..\..\..\..\..\lib\cmn\str_word.c
204
WString
4
@@ -917,8 +917,8 @@ WVList
0
207
MItem
-28
-..\..\..\..\..\lib\cmn\tio.c
+29
+..\..\..\..\..\lib\cmn\time.c
208
WString
4
@@ -935,8 +935,8 @@ WVList
0
211
MItem
-32
-..\..\..\..\..\lib\cmn\tio_get.c
+28
+..\..\..\..\..\lib\cmn\tio.c
212
WString
4
@@ -954,7 +954,7 @@ WVList
215
MItem
32
-..\..\..\..\..\lib\cmn\tio_put.c
+..\..\..\..\..\lib\cmn\tio_get.c
216
WString
4
@@ -971,8 +971,8 @@ WVList
0
219
MItem
-28
-..\..\..\..\..\lib\cmn\xma.c
+32
+..\..\..\..\..\lib\cmn\tio_put.c
220
WString
4
@@ -989,26 +989,26 @@ WVList
0
223
MItem
-3
-*.h
+28
+..\..\..\..\..\lib\cmn\xma.c
224
WString
-3
-NIL
+4
+COBJ
225
WVList
0
226
WVList
0
--1
+11
1
1
0
227
MItem
-28
-..\..\..\..\..\lib\cmn\mem.h
+3
+*.h
228
WString
3
@@ -1019,14 +1019,14 @@ WVList
230
WVList
0
-223
+-1
1
1
0
231
MItem
-32
-..\..\..\..\..\lib\cmn\syscall.h
+28
+..\..\..\..\..\lib\cmn\mem.h
232
WString
3
@@ -1037,7 +1037,25 @@ WVList
234
WVList
0
-223
+227
+1
+1
+0
+235
+MItem
+32
+..\..\..\..\..\lib\cmn\syscall.h
+236
+WString
+3
+NIL
+237
+WVList
+0
+238
+WVList
+0
+227
1
1
0