hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added qse_mbsdup()/qse_wcsdup() and related functions

Browse Source
This commit is contained in:
hyung-hwan
2011-03-30 05:20:29 +00:00
parent 22a3eee756
commit 5662ae2010
9 changed files with 344 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qse/lib/cmn/Makefile.am
View File

@ -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 \

10
qse/lib/cmn/Makefile.in
View File

@ -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@

49
qse/lib/cmn/str_bas.c
View File

@ -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;

80
qse/lib/cmn/str_cpy.c
View File

@ -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)

116
qse/lib/cmn/str_dup.c Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include <qse/cmn/str.h>
#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;
}