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

added qse_httpd_getserveroptstd() and qse_httpd_setserveroptstd().

Browse Source 
added an output length parameter to qse_mbstowcsdup() and similar functions
This commit is contained in:
hyung-hwan
2012-10-18 06:52:03 +00:00
parent 8f5a0a3933
commit e2f152c927
30 changed files with 473 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qse/lib/awk/StdAwk.cpp
View File

@ -253,8 +253,8 @@ int StdAwk::__build_environ (Run* run, void* envptr)
*eq = QSE_MT('\0');
kptr = qse_mbstowcsdup (envarr[count], mmgr);
vptr = qse_mbstowcsdup (eq + 1, mmgr);
kptr = qse_mbstowcsdup (envarr[count], &klen, mmgr);
vptr = qse_mbstowcsdup (eq + 1, QSE_NULL, mmgr);
if (kptr == QSE_NULL || vptr == QSE_NULL)
{
if (kptr) QSE_MMGR_FREE (mmgr, kptr);
@ -266,7 +266,6 @@ int StdAwk::__build_environ (Run* run, void* envptr)
return -1;
}
klen = qse_wcslen (kptr);
*eq = QSE_MT('=');
#else
eq = qse_wcschr (envarr[count], QSE_WT('='));
@ -274,8 +273,8 @@ int StdAwk::__build_environ (Run* run, void* envptr)
*eq = QSE_WT('\0');
kptr = qse_wcstombsdup (envarr[count], mmgr);
vptr = qse_wcstombsdup (eq + 1, mmgr);
kptr = qse_wcstombsdup (envarr[count], &klen, mmgr);
vptr = qse_wcstombsdup (eq + 1, QSE_NULL, mmgr);
if (kptr == QSE_NULL || vptr == QSE_NULL)
{
if (kptr) QSE_MMGR_FREE (mmgr, kptr);
@ -287,7 +286,6 @@ int StdAwk::__build_environ (Run* run, void* envptr)
return -1;
}
klen = qse_mbslen (kptr);
*eq = QSE_WT('=');
#endif
@ -459,7 +457,7 @@ int StdAwk::system (Run& run, Value& ret, const Value* args, size_t nargs,
#else
qse_mchar_t* mbs;
mbs = qse_wcstombsdup (ptr, ((Awk*)run)->getMmgr());
mbs = qse_wcstombsdup (ptr, QSE_NULL, ((Awk*)run)->getMmgr());
if (mbs == QSE_NULL) return -1;
int n = ret.setInt ((long_t)::system(mbs));
QSE_MMGR_FREE (((Awk*)run)->getMmgr(), mbs);

2
qse/lib/awk/mpi.c
View File

@ -155,7 +155,7 @@ qse_awk_rtx_t* qse_awk_rtx_openmpi (
#else
mmgr = qse_awk_getmmgr(awk);
tmp = qse_mbstowcsdup (buf, mmgr);
tmp = qse_mbstowcsdup (buf, QSE_NULL, mmgr);
if (tmp == QSE_NULL)
{
qse_awk_rtx_close (rtx);

1
qse/lib/awk/run.c
View File

@ -6374,7 +6374,6 @@ static int read_record (qse_awk_rtx_t* rtx)
{
qse_ssize_t n;
qse_str_t* buf;
qse_awk_rtx_ecb_t* ecb;
read_again:
if (qse_awk_rtx_clrrec (rtx, QSE_FALSE) == -1) return -1;

12
qse/lib/awk/std.c
View File

@ -1628,8 +1628,8 @@ static int __build_environ (
*eq = QSE_MT('\0');
kptr = qse_mbstowcsdup (envarr[count], rtx->awk->mmgr);
vptr = qse_mbstowcsdup (eq + 1, rtx->awk->mmgr);
kptr = qse_mbstowcsdup (envarr[count], &klen, rtx->awk->mmgr);
vptr = qse_mbstowcsdup (eq + 1, QSE_NULL, rtx->awk->mmgr);
if (kptr == QSE_NULL || vptr == QSE_NULL)
{
if (kptr) QSE_MMGR_FREE (rtx->awk->mmgr, kptr);
@ -1642,7 +1642,6 @@ static int __build_environ (
return -1;
}
klen = qse_wcslen (kptr);
*eq = QSE_MT('=');
#else
eq = qse_wcschr (envarr[count], QSE_WT('='));
@ -1650,8 +1649,8 @@ static int __build_environ (
*eq = QSE_WT('\0');
kptr = qse_wcstombsdup (envarr[count], rtx->awk->mmgr);
vptr = qse_wcstombsdup (eq + 1, rtx->awk->mmgr);
kptr = qse_wcstombsdup (envarr[count], &klen, rtx->awk->mmgr);
vptr = qse_wcstombsdup (eq + 1, QSE_NULL, rtx->awk->mmgr);
if (kptr == QSE_NULL || vptr == QSE_NULL)
{
if (kptr) QSE_MMGR_FREE (rtx->awk->mmgr, kptr);
@ -1664,7 +1663,6 @@ static int __build_environ (
return -1;
}
klen = qse_mbslen (kptr);
*eq = QSE_WT('=');
#endif
@ -2083,7 +2081,7 @@ static int fnc_system (qse_awk_rtx_t* rtx, const qse_cstr_t* fnm)
{
qse_mchar_t* mbs;
mbs = qse_wcstombsdup (str, rtx->awk->mmgr);
mbs = qse_wcstombsdup (str, QSE_NULL, rtx->awk->mmgr);
if (mbs == QSE_NULL)
{
n = -1;