diff --git a/qse/include/qse/cmn/str.h b/qse/include/qse/cmn/str.h
index a19ad8e5..7a10f549 100644
--- a/qse/include/qse/cmn/str.h
+++ b/qse/include/qse/cmn/str.h
@@ -1,5 +1,5 @@
/*
- * $Id: str.h 419 2011-03-28 16:07:37Z hyunghwan.chung $
+ * $Id: str.h 420 2011-03-29 11:20:29Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@@ -710,34 +710,68 @@ int qse_wcsxncasecmp (
# define qse_strxncasecmp(s1,ln1,s2,ln2) qse_wcsxncasecmp(s1,ln1,s2,ln2)
#endif
-
-
-
-qse_char_t* qse_strdup (
- const qse_char_t* str,
- qse_mmgr_t* mmgr
+qse_mchar_t* qse_mbsdup (
+ const qse_mchar_t* str,
+ qse_mmgr_t* mmgr
);
-qse_char_t* qse_strdup2 (
- const qse_char_t* str1,
- const qse_char_t* str2,
- qse_mmgr_t* mmgr
+qse_mchar_t* qse_mbsdup2 (
+ const qse_mchar_t* str1,
+ const qse_mchar_t* str2,
+ qse_mmgr_t* mmgr
);
-qse_char_t* qse_strxdup (
- const qse_char_t* str,
- qse_size_t len,
- qse_mmgr_t* mmgr
+qse_mchar_t* qse_mbsxdup (
+ const qse_mchar_t* str,
+ qse_size_t len,
+ qse_mmgr_t* mmgr
);
-qse_char_t* qse_strxdup2 (
- const qse_char_t* str1,
- qse_size_t len1,
- const qse_char_t* str2,
- qse_size_t len2,
- qse_mmgr_t* mmgr
+qse_mchar_t* qse_mbsxdup2 (
+ const qse_mchar_t* str1,
+ qse_size_t len1,
+ const qse_mchar_t* str2,
+ qse_size_t len2,
+ qse_mmgr_t* mmgr
);
+qse_wchar_t* qse_wcsdup (
+ const qse_wchar_t* str,
+ qse_mmgr_t* mmgr
+);
+
+qse_wchar_t* qse_wcsdup2 (
+ const qse_wchar_t* str1,
+ const qse_wchar_t* str2,
+ qse_mmgr_t* mmgr
+);
+
+qse_wchar_t* qse_wcsxdup (
+ const qse_wchar_t* str,
+ qse_size_t len,
+ qse_mmgr_t* mmgr
+);
+
+qse_wchar_t* qse_wcsxdup2 (
+ const qse_wchar_t* str1,
+ qse_size_t len1,
+ const qse_wchar_t* str2,
+ qse_size_t len2,
+ qse_mmgr_t* mmgr
+);
+
+#ifdef QSE_CHAR_IS_MCHAR
+# define qse_strdup(s,mmgr) qse_mbsdup(s,mmgr)
+# define qse_strdup2(s1,s2,mmgr) qse_mbsdup2(s1,s2,mmgr)
+# define qse_strxdup(s,l,mmgr) qse_mbsxdup(s,l,mmgr)
+# define qse_strxdup2(s1,l1,s2,l2,mmgr) qse_mbsxdup(s1,l1,s2,l2,mmgr)
+#else
+# define qse_strdup(s,mmgr) qse_wcsdup(s,mmgr)
+# define qse_strdup2(s1,s2,mmgr) qse_wcsdup2(s1,s2,mmgr)
+# define qse_strxdup(s,l,mmgr) qse_wcsxdup(s,l,mmgr)
+# define qse_strxdup2(s1,l1,s2,l2,mmgr) qse_wcsxdup(s1,l1,s2,l2,mmgr)
+#endif
+
/**
* The qse_mbsstr() function searchs a string @a str for the first occurrence
* of a substring @a sub.
diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am
index 23215913..1a503955 100644
--- a/qse/lib/cmn/Makefile.am
+++ b/qse/lib/cmn/Makefile.am
@@ -9,8 +9,9 @@ lib_LTLIBRARIES = libqsecmn.la
libqsecmn_la_SOURCES = \
syscall.h mem.h \
mem.c xma.c fma.c chr.c chr_cnv.c rex.c \
- str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dyn.c \
- str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c str_utl.c \
+ str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dup.c \
+ str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c \
+ str_utl.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 96aa0de2..fce98740 100644
--- a/qse/lib/cmn/Makefile.in
+++ b/qse/lib/cmn/Makefile.in
@@ -74,8 +74,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
libqsecmn_la_DEPENDENCIES =
am_libqsecmn_la_OBJECTS = mem.lo xma.lo fma.lo chr.lo chr_cnv.lo \
rex.lo str_bas.lo str_cat.lo str_chr.lo str_cnv.lo str_cmp.lo \
- str_cpy.lo str_dyn.lo str_fcpy.lo str_pbrk.lo str_put.lo str_spn.lo \
- str_subst.lo str_utl.lo lda.lo oht.lo htb.lo rbt.lo sll.lo \
+ str_cpy.lo str_dup.lo str_dyn.lo str_fcpy.lo str_pbrk.lo str_put.lo \
+ str_spn.lo str_subst.lo str_utl.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
@@ -266,8 +266,9 @@ lib_LTLIBRARIES = libqsecmn.la $(am__append_1)
libqsecmn_la_SOURCES = \
syscall.h mem.h \
mem.c xma.c fma.c chr.c chr_cnv.c rex.c \
- str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dyn.c \
- str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c str_utl.c \
+ str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dup.c \
+ str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c \
+ str_utl.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 \
@@ -391,6 +392,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_cmp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_cnv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_cpy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_dup.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_dyn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_fcpy.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_pbrk.Plo@am__quote@
diff --git a/qse/lib/cmn/str_bas.c b/qse/lib/cmn/str_bas.c
index db7ee556..69177338 100644
--- a/qse/lib/cmn/str_bas.c
+++ b/qse/lib/cmn/str_bas.c
@@ -1,5 +1,5 @@
/*
- * $Id: str_bas.c 419 2011-03-28 16:07:37Z hyunghwan.chung $
+ * $Id: str_bas.c 420 2011-03-29 11:20:29Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@@ -43,53 +43,6 @@ qse_size_t qse_strbytes (const qse_char_t* str)
return (p - str) * QSE_SIZEOF(qse_char_t);
}
-qse_char_t* qse_strdup (const qse_char_t* str, qse_mmgr_t* mmgr)
-{
- qse_char_t* tmp;
-
- tmp = (qse_char_t*) QSE_MMGR_ALLOC (
- mmgr, (qse_strlen(str)+1)*QSE_SIZEOF(qse_char_t));
- if (tmp == QSE_NULL) return QSE_NULL;
-
- qse_strcpy (tmp, str);
- return tmp;
-}
-
-qse_char_t* qse_strdup2 (
- const qse_char_t* str1, const qse_char_t* str2, qse_mmgr_t* mmgr)
-{
- return qse_strxdup2 (
- str1, qse_strlen(str1), str2, qse_strlen(str2), mmgr);
-}
-
-qse_char_t* qse_strxdup (
- const qse_char_t* str, qse_size_t len, qse_mmgr_t* mmgr)
-{
- qse_char_t* tmp;
-
- tmp = (qse_char_t*) QSE_MMGR_ALLOC (
- mmgr, (len+1)*QSE_SIZEOF(qse_char_t));
- if (tmp == QSE_NULL) return QSE_NULL;
-
- qse_strncpy (tmp, str, len);
- return tmp;
-}
-
-qse_char_t* qse_strxdup2 (
- const qse_char_t* str1, qse_size_t len1,
- const qse_char_t* str2, qse_size_t len2, qse_mmgr_t* mmgr)
-{
- qse_char_t* tmp;
-
- tmp = (qse_char_t*) QSE_MMGR_ALLOC (
- mmgr, (len1+len2+1) * QSE_SIZEOF(qse_char_t));
- if (tmp == QSE_NULL) return QSE_NULL;
-
- qse_strncpy (tmp, str1, len1);
- qse_strncpy (tmp + len1, str2, len2);
- return tmp;
-}
-
qse_mchar_t* qse_mbsstr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
const qse_mchar_t* x, * y;
diff --git a/qse/lib/cmn/str_cpy.c b/qse/lib/cmn/str_cpy.c
index d9f4e523..0832f221 100644
--- a/qse/lib/cmn/str_cpy.c
+++ b/qse/lib/cmn/str_cpy.c
@@ -28,14 +28,7 @@ qse_size_t qse_mbscpy (qse_mchar_t* buf, const qse_mchar_t* str)
return buf - org - 1;
}
-qse_size_t qse_wcscpy (qse_wchar_t* buf, const qse_wchar_t* str)
-{
- qse_wchar_t* org = buf;
- while ((*buf++ = *str++) != QSE_WT('\0'));
- return buf - org - 1;
-}
-
-qse_size_t qse_mcsxcpy (
+qse_size_t qse_mbsxcpy (
qse_mchar_t* buf, qse_size_t bsz, const qse_mchar_t* str)
{
qse_mchar_t* p, * p2;
@@ -52,24 +45,7 @@ qse_size_t qse_mcsxcpy (
return p - buf;
}
-qse_size_t qse_wcsxcpy (
- qse_wchar_t* buf, qse_size_t bsz, const qse_wchar_t* str)
-{
- qse_wchar_t* p, * p2;
-
- p = buf; p2 = buf + bsz - 1;
-
- while (p < p2)
- {
- if (*str == QSE_WT('\0')) break;
- *p++ = *str++;
- }
-
- if (bsz > 0) *p = QSE_WT('\0');
- return p - buf;
-}
-
-qse_size_t qse_mcsncpy (
+qse_size_t qse_mbsncpy (
qse_mchar_t* buf, const qse_mchar_t* str, qse_size_t len)
{
/*
@@ -104,6 +80,44 @@ qse_size_t qse_mcsncpy (
return len;
}
+qse_size_t qse_mbsxncpy (
+ qse_mchar_t* buf, qse_size_t bsz,
+ const qse_mchar_t* str, qse_size_t len)
+{
+ qse_size_t n;
+
+ if (bsz <= 0) return 0;
+ if ((n = bsz - 1) > len) n = len;
+ QSE_MEMCPY (buf, str, n * QSE_SIZEOF(qse_mchar_t));
+ buf[n] = QSE_MT('\0');
+
+ return n;
+}
+
+qse_size_t qse_wcscpy (qse_wchar_t* buf, const qse_wchar_t* str)
+{
+ qse_wchar_t* org = buf;
+ while ((*buf++ = *str++) != QSE_WT('\0'));
+ return buf - org - 1;
+}
+
+qse_size_t qse_wcsxcpy (
+ qse_wchar_t* buf, qse_size_t bsz, const qse_wchar_t* str)
+{
+ qse_wchar_t* p, * p2;
+
+ p = buf; p2 = buf + bsz - 1;
+
+ while (p < p2)
+ {
+ if (*str == QSE_WT('\0')) break;
+ *p++ = *str++;
+ }
+
+ if (bsz > 0) *p = QSE_WT('\0');
+ return p - buf;
+}
+
qse_size_t qse_wcsncpy (
qse_wchar_t* buf, const qse_wchar_t* str, qse_size_t len)
{
@@ -139,20 +153,6 @@ qse_size_t qse_wcsncpy (
return len;
}
-qse_size_t qse_mcsxncpy (
- qse_mchar_t* buf, qse_size_t bsz,
- const qse_mchar_t* str, qse_size_t len)
-{
- qse_size_t n;
-
- if (bsz <= 0) return 0;
- if ((n = bsz - 1) > len) n = len;
- QSE_MEMCPY (buf, str, n * QSE_SIZEOF(qse_mchar_t));
- buf[n] = QSE_MT('\0');
-
- return n;
-}
-
qse_size_t qse_wcsxncpy (
qse_wchar_t* buf, qse_size_t bsz,
const qse_wchar_t* str, qse_size_t len)
diff --git a/qse/lib/cmn/str_dup.c b/qse/lib/cmn/str_dup.c
new file mode 100644
index 00000000..3e9d5dd5
--- /dev/null
+++ b/qse/lib/cmn/str_dup.c
@@ -0,0 +1,116 @@
+/*
+ * $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 "mem.h"
+
+qse_mchar_t* qse_mbsdup (const qse_mchar_t* str, qse_mmgr_t* mmgr)
+{
+ qse_mchar_t* tmp;
+
+ tmp = (qse_mchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (qse_mbslen(str)+1)*QSE_SIZEOF(qse_mchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_mbscpy (tmp, str);
+ return tmp;
+}
+
+qse_mchar_t* qse_mbsdup2 (
+ const qse_mchar_t* str1, const qse_mchar_t* str2, qse_mmgr_t* mmgr)
+{
+ return qse_mbsxdup2 (
+ str1, qse_mbslen(str1), str2, qse_mbslen(str2), mmgr);
+}
+
+qse_mchar_t* qse_mbsxdup (
+ const qse_mchar_t* str, qse_size_t len, qse_mmgr_t* mmgr)
+{
+ qse_mchar_t* tmp;
+
+ tmp = (qse_mchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (len+1)*QSE_SIZEOF(qse_mchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_mbsncpy (tmp, str, len);
+ return tmp;
+}
+
+qse_mchar_t* qse_mbsxdup2 (
+ const qse_mchar_t* str1, qse_size_t len1,
+ const qse_mchar_t* str2, qse_size_t len2, qse_mmgr_t* mmgr)
+{
+ qse_mchar_t* tmp;
+
+ tmp = (qse_mchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (len1+len2+1) * QSE_SIZEOF(qse_mchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_mbsncpy (tmp, str1, len1);
+ qse_mbsncpy (tmp + len1, str2, len2);
+ return tmp;
+}
+
+qse_wchar_t* qse_wcsdup (const qse_wchar_t* str, qse_mmgr_t* mmgr)
+{
+ qse_wchar_t* tmp;
+
+ tmp = (qse_wchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (qse_wcslen(str)+1)*QSE_SIZEOF(qse_wchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_wcscpy (tmp, str);
+ return tmp;
+}
+
+qse_wchar_t* qse_wcsdup2 (
+ const qse_wchar_t* str1, const qse_wchar_t* str2, qse_mmgr_t* mmgr)
+{
+ return qse_wcsxdup2 (
+ str1, qse_wcslen(str1), str2, qse_wcslen(str2), mmgr);
+}
+
+qse_wchar_t* qse_wcsxdup (
+ const qse_wchar_t* str, qse_size_t len, qse_mmgr_t* mmgr)
+{
+ qse_wchar_t* tmp;
+
+ tmp = (qse_wchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (len+1)*QSE_SIZEOF(qse_wchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_wcsncpy (tmp, str, len);
+ return tmp;
+}
+
+qse_wchar_t* qse_wcsxdup2 (
+ const qse_wchar_t* str1, qse_size_t len1,
+ const qse_wchar_t* str2, qse_size_t len2, qse_mmgr_t* mmgr)
+{
+ qse_wchar_t* tmp;
+
+ tmp = (qse_wchar_t*) QSE_MMGR_ALLOC (
+ mmgr, (len1+len2+1) * QSE_SIZEOF(qse_wchar_t));
+ if (tmp == QSE_NULL) return QSE_NULL;
+
+ qse_wcsncpy (tmp, str1, len1);
+ qse_wcsncpy (tmp + len1, str2, len2);
+ return tmp;
+}
diff --git a/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt b/qse/watcom/debug/os2/lib/cmn/qsecmn.tgt
index d9079973..b6fbe7e9 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
-44
+45
11
MItem
3
@@ -584,7 +584,7 @@ WVList
131
MItem
32
-..\..\..\..\..\lib\cmn\str_dyn.c
+..\..\..\..\..\lib\cmn\str_dup.c
132
WString
4
@@ -601,8 +601,8 @@ WVList
0
135
MItem
-33
-..\..\..\..\..\lib\cmn\str_fcpy.c
+32
+..\..\..\..\..\lib\cmn\str_dyn.c
136
WString
4
@@ -620,7 +620,7 @@ WVList
139
MItem
33
-..\..\..\..\..\lib\cmn\str_pbrk.c
+..\..\..\..\..\lib\cmn\str_fcpy.c
140
WString
4
@@ -637,8 +637,8 @@ WVList
0
143
MItem
-32
-..\..\..\..\..\lib\cmn\str_put.c
+33
+..\..\..\..\..\lib\cmn\str_pbrk.c
144
WString
4
@@ -656,7 +656,7 @@ WVList
147
MItem
32
-..\..\..\..\..\lib\cmn\str_spn.c
+..\..\..\..\..\lib\cmn\str_put.c
148
WString
4
@@ -673,8 +673,8 @@ WVList
0
151
MItem
-34
-..\..\..\..\..\lib\cmn\str_subst.c
+32
+..\..\..\..\..\lib\cmn\str_spn.c
152
WString
4
@@ -691,8 +691,8 @@ WVList
0
155
MItem
-32
-..\..\..\..\..\lib\cmn\str_utl.c
+34
+..\..\..\..\..\lib\cmn\str_subst.c
156
WString
4
@@ -709,8 +709,8 @@ WVList
0
159
MItem
-29
-..\..\..\..\..\lib\cmn\time.c
+32
+..\..\..\..\..\lib\cmn\str_utl.c
160
WString
4
@@ -727,8 +727,8 @@ WVList
0
163
MItem
-28
-..\..\..\..\..\lib\cmn\tio.c
+29
+..\..\..\..\..\lib\cmn\time.c
164
WString
4
@@ -745,8 +745,8 @@ WVList
0
167
MItem
-32
-..\..\..\..\..\lib\cmn\tio_get.c
+28
+..\..\..\..\..\lib\cmn\tio.c
168
WString
4
@@ -764,7 +764,7 @@ WVList
171
MItem
32
-..\..\..\..\..\lib\cmn\tio_put.c
+..\..\..\..\..\lib\cmn\tio_get.c
172
WString
4
@@ -781,8 +781,8 @@ WVList
0
175
MItem
-28
-..\..\..\..\..\lib\cmn\xma.c
+32
+..\..\..\..\..\lib\cmn\tio_put.c
176
WString
4
@@ -799,26 +799,26 @@ WVList
0
179
MItem
-3
-*.h
+28
+..\..\..\..\..\lib\cmn\xma.c
180
WString
-3
-NIL
+4
+COBJ
181
WVList
0
182
WVList
0
--1
+11
1
1
0
183
MItem
-28
-..\..\..\..\..\lib\cmn\mem.h
+3
+*.h
184
WString
3
@@ -829,14 +829,14 @@ WVList
186
WVList
0
-179
+-1
1
1
0
187
MItem
-32
-..\..\..\..\..\lib\cmn\syscall.h
+28
+..\..\..\..\..\lib\cmn\mem.h
188
WString
3
@@ -847,7 +847,25 @@ WVList
190
WVList
0
-179
+183
+1
+1
+0
+191
+MItem
+32
+..\..\..\..\..\lib\cmn\syscall.h
+192
+WString
+3
+NIL
+193
+WVList
+0
+194
+WVList
+0
+183
1
1
0
diff --git a/qse/watcom/qse.wpj b/qse/watcom/qse.wpj
index 0146c483..e914f8fc 100755
--- a/qse/watcom/qse.wpj
+++ b/qse/watcom/qse.wpj
@@ -131,7 +131,7 @@ WFileName
28
debug/os2/lib/cmn/qsecmn.tgt
24
-24
+29
29
VComponent
30
@@ -153,7 +153,7 @@ VComponent
33
WRect
3280
-1333
+1320
5700
4240
0
@@ -180,4 +180,4 @@ WFileName
debug/os2/cmd/scm/qsescm.tgt
0
1
-26
+14
diff --git a/qse/watcom/release/os2/lib/cmn/qsecmn.tgt b/qse/watcom/release/os2/lib/cmn/qsecmn.tgt
index 4e5cf3da..f4e9e7bc 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
-44
+45
11
MItem
3
@@ -648,7 +648,7 @@ WVList
147
MItem
32
-..\..\..\..\..\lib\cmn\str_dyn.c
+..\..\..\..\..\lib\cmn\str_dup.c
148
WString
4
@@ -665,8 +665,8 @@ WVList
0
151
MItem
-33
-..\..\..\..\..\lib\cmn\str_fcpy.c
+32
+..\..\..\..\..\lib\cmn\str_dyn.c
152
WString
4
@@ -684,7 +684,7 @@ WVList
155
MItem
33
-..\..\..\..\..\lib\cmn\str_pbrk.c
+..\..\..\..\..\lib\cmn\str_fcpy.c
156
WString
4
@@ -701,8 +701,8 @@ WVList
0
159
MItem
-32
-..\..\..\..\..\lib\cmn\str_put.c
+33
+..\..\..\..\..\lib\cmn\str_pbrk.c
160
WString
4
@@ -720,7 +720,7 @@ WVList
163
MItem
32
-..\..\..\..\..\lib\cmn\str_spn.c
+..\..\..\..\..\lib\cmn\str_put.c
164
WString
4
@@ -737,8 +737,8 @@ WVList
0
167
MItem
-34
-..\..\..\..\..\lib\cmn\str_subst.c
+32
+..\..\..\..\..\lib\cmn\str_spn.c
168
WString
4
@@ -755,48 +755,48 @@ WVList
0
171
MItem
-32
-..\..\..\..\..\lib\cmn\str_utl.c
+34
+..\..\..\..\..\lib\cmn\str_subst.c
172
WString
4
COBJ
173
WVList
-1
-174
-MVState
-175
-WString
-3
-WCC
-176
-WString
-25
-o?2??Include directories:
-1
-177
-WString
-54
-"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include"
0
-178
+174
WVList
0
11
1
1
0
-179
+175
MItem
-29
-..\..\..\..\..\lib\cmn\time.c
-180
+32
+..\..\..\..\..\lib\cmn\str_utl.c
+176
WString
4
COBJ
-181
+177
WVList
+1
+178
+MVState
+179
+WString
+3
+WCC
+180
+WString
+25
+o?2??Include directories:
+1
+181
+WString
+54
+"$(%watcom)/h;$(%watcom)/h/os2;..\..\..\..\..\include"
0
182
WVList
@@ -807,8 +807,8 @@ WVList
0
183
MItem
-28
-..\..\..\..\..\lib\cmn\tio.c
+29
+..\..\..\..\..\lib\cmn\time.c
184
WString
4
@@ -825,8 +825,8 @@ WVList
0
187
MItem
-32
-..\..\..\..\..\lib\cmn\tio_get.c
+28
+..\..\..\..\..\lib\cmn\tio.c
188
WString
4
@@ -844,7 +844,7 @@ WVList
191
MItem
32
-..\..\..\..\..\lib\cmn\tio_put.c
+..\..\..\..\..\lib\cmn\tio_get.c
192
WString
4
@@ -861,8 +861,8 @@ WVList
0
195
MItem
-28
-..\..\..\..\..\lib\cmn\xma.c
+32
+..\..\..\..\..\lib\cmn\tio_put.c
196
WString
4
@@ -879,26 +879,26 @@ WVList
0
199
MItem
-3
-*.h
+28
+..\..\..\..\..\lib\cmn\xma.c
200
WString
-3
-NIL
+4
+COBJ
201
WVList
0
202
WVList
0
--1
+11
1
1
0
203
MItem
-28
-..\..\..\..\..\lib\cmn\mem.h
+3
+*.h
204
WString
3
@@ -909,14 +909,14 @@ WVList
206
WVList
0
-199
+-1
1
1
0
207
MItem
-32
-..\..\..\..\..\lib\cmn\syscall.h
+28
+..\..\..\..\..\lib\cmn\mem.h
208
WString
3
@@ -927,7 +927,25 @@ WVList
210
WVList
0
-199
+203
+1
+1
+0
+211
+MItem
+32
+..\..\..\..\..\lib\cmn\syscall.h
+212
+WString
+3
+NIL
+213
+WVList
+0
+214
+WVList
+0
+203
1
1
0