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

fixed a bug of not checking the return value of wcrtomb properly in qse_wcrtomb().

Browse Source 
fixed a bug of passing a wrong buffer to qse_wcrtomb() in qse_wcsntombsn().
enhanced qse_tio_writembsn() and qse_tio_writewcsn()
This commit is contained in:
hyung-hwan
2011-12-13 15:48:00 +00:00
parent 283f388ae9
commit 7f0ad74286
23 changed files with 278 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
qse/lib/awk/parse.c
View File

@ -6057,7 +6057,7 @@ static int deparse (qse_awk_t* awk)
QSE_ASSERT (awk->tree.ngbls > 0);
qse_awk_getkwname (awk, QSE_AWK_KWID_GLOBAL, &kw);
if (qse_awk_putsrcstrx(awk,kw.ptr,kw.len) <= -1)
if (qse_awk_putsrcstrn(awk,kw.ptr,kw.len) <= -1)
{
EXIT_DEPARSE ();
}
@ -6073,7 +6073,7 @@ static int deparse (qse_awk_t* awk)
{
/* use the actual name if no named variable
* is allowed */
if (qse_awk_putsrcstrx (awk,
if (qse_awk_putsrcstrn (awk,
QSE_LDA_DPTR(awk->parse.gbls,i),
QSE_LDA_DLEN(awk->parse.gbls,i)) <= -1)
{
@ -6086,7 +6086,7 @@ static int deparse (qse_awk_t* awk)
awk, (qse_long_t)i,
10, QSE_T("__g"), tmp, QSE_COUNTOF(tmp));
QSE_ASSERT (len != (qse_size_t)-1);
if (qse_awk_putsrcstrx (awk, tmp, len) <= -1)
if (qse_awk_putsrcstrn (awk, tmp, len) <= -1)
{
EXIT_DEPARSE ();
}
@ -6099,7 +6099,7 @@ static int deparse (qse_awk_t* awk)
if ((awk->option & QSE_AWK_EXPLICIT) &&
!(awk->option & QSE_AWK_IMPLICIT))
{
if (qse_awk_putsrcstrx (awk,
if (qse_awk_putsrcstrn (awk,
QSE_LDA_DPTR(awk->parse.gbls,i),
QSE_LDA_DLEN(awk->parse.gbls,i)) <= -1)
{
@ -6112,7 +6112,7 @@ static int deparse (qse_awk_t* awk)
awk, (qse_long_t)i,
10, QSE_T("__g"), tmp, QSE_COUNTOF(tmp));
QSE_ASSERT (len != (qse_size_t)-1);
if (qse_awk_putsrcstrx (awk, tmp, len) <= -1)
if (qse_awk_putsrcstrn (awk, tmp, len) <= -1)
{
EXIT_DEPARSE ();
}
@ -6151,7 +6151,7 @@ static int deparse (qse_awk_t* awk)
qse_awk_getkwname (awk, QSE_AWK_KWID_BEGIN, &kw);
if (qse_awk_putsrcstrx (awk, kw.ptr, kw.len) <= -1) EXIT_DEPARSE ();
if (qse_awk_putsrcstrn (awk, kw.ptr, kw.len) <= -1) EXIT_DEPARSE ();
if (qse_awk_putsrcstr (awk, QSE_T(" ")) <= -1) EXIT_DEPARSE ();
if (qse_awk_prnnde (awk, nde) <= -1) EXIT_DEPARSE ();
@ -6213,7 +6213,7 @@ static int deparse (qse_awk_t* awk)
qse_awk_getkwname (awk, QSE_AWK_KWID_END, &kw);
if (qse_awk_putsrcstrx (awk, kw.ptr, kw.len) <= -1) EXIT_DEPARSE ();
if (qse_awk_putsrcstrn (awk, kw.ptr, kw.len) <= -1) EXIT_DEPARSE ();
if (qse_awk_putsrcstr (awk, QSE_T(" ")) <= -1) EXIT_DEPARSE ();
if (qse_awk_prnnde (awk, nde) <= -1) EXIT_DEPARSE ();
@ -6266,7 +6266,7 @@ static qse_htb_walk_t deparse_func (
}
#define PUT_SX(x,str,len) \
if (qse_awk_putsrcstrx (x->awk, str, len) <= -1) { \
if (qse_awk_putsrcstrn (x->awk, str, len) <= -1) { \
x->ret = -1; return QSE_HTB_WALK_STOP; \
}
@ -6356,7 +6356,7 @@ int qse_awk_putsrcstr (qse_awk_t* awk, const qse_char_t* str)
return 0;
}
int qse_awk_putsrcstrx (
int qse_awk_putsrcstrn (
qse_awk_t* awk, const qse_char_t* str, qse_size_t len)
{
const qse_char_t* end = str + len;

2
qse/lib/awk/parse.h
View File

@ -61,7 +61,7 @@ int qse_awk_putsrcstr (
const qse_char_t* str
);
int qse_awk_putsrcstrx (
int qse_awk_putsrcstrn (
qse_awk_t* awk,
const qse_char_t* str,
qse_size_t len

96
qse/lib/awk/tree.c
View File

@ -113,8 +113,8 @@ static const qse_char_t* print_outop_str[] =
PUT_SRCSTR (awk, QSE_T("\n")); \
)
#define PUT_SRCSTRX(awk,str,len) QSE_BLOCK (\
if (qse_awk_putsrcstrx (awk, str, len) == -1) return -1; \
#define PUT_SRCSTRN(awk,str,len) QSE_BLOCK (\
if (qse_awk_putsrcstrn (awk, str, len) == -1) return -1; \
)
#define PRINT_TABS(awk,depth) QSE_BLOCK (\
@ -263,7 +263,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
{
if (((qse_awk_nde_int_t*)nde)->str)
{
PUT_SRCSTRX (awk,
PUT_SRCSTRN (awk,
((qse_awk_nde_int_t*)nde)->str,
((qse_awk_nde_int_t*)nde)->len);
}
@ -298,7 +298,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
{
if (((qse_awk_nde_flt_t*)nde)->str)
{
PUT_SRCSTRX (awk,
PUT_SRCSTRN (awk,
((qse_awk_nde_flt_t*)nde)->str,
((qse_awk_nde_flt_t*)nde)->len);
}
@ -358,7 +358,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
PUT_SRCSTR (awk, QSE_T("\\\\"));
break;
default:
PUT_SRCSTRX (awk, &ptr[i], 1);
PUT_SRCSTRN (awk, &ptr[i], 1);
break;
}
}
@ -369,7 +369,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
case QSE_AWK_NDE_REX:
{
PUT_SRCSTR (awk, QSE_T("/"));
PUT_SRCSTRX (awk,
PUT_SRCSTRN (awk,
((qse_awk_nde_rex_t*)nde)->ptr,
((qse_awk_nde_rex_t*)nde)->len);
PUT_SRCSTR (awk, QSE_T("/"));
@ -390,7 +390,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
);
PUT_SRCSTR (awk, QSE_T("__p"));
PUT_SRCSTRX (awk, tmp, n);
PUT_SRCSTRN (awk, tmp, n);
QSE_ASSERT (px->idx == QSE_NULL);
break;
@ -409,7 +409,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
px->id.idxa, 10, QSE_NULL,
awk->tmp.fmt, QSE_COUNTOF(awk->tmp.fmt)
);
PUT_SRCSTRX (awk, awk->tmp.fmt, n);
PUT_SRCSTRN (awk, awk->tmp.fmt, n);
PUT_SRCSTR (awk, QSE_T("["));
PRINT_EXPR_LIST (awk, px->idx);
PUT_SRCSTR (awk, QSE_T("]"));
@ -422,7 +422,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
QSE_ASSERT (px->id.idxa == (qse_size_t)-1);
QSE_ASSERT (px->idx == QSE_NULL);
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
break;
}
@ -432,7 +432,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
QSE_ASSERT (px->id.idxa == (qse_size_t)-1);
QSE_ASSERT (px->idx != QSE_NULL);
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTR (awk, QSE_T("["));
PRINT_EXPR_LIST (awk, px->idx);
PUT_SRCSTR (awk, QSE_T("]"));
@ -451,12 +451,12 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
{
/* no implicit(named) variable is allowed.
* use the actual name */
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
else if (px->id.idxa < awk->tree.ngbls_base)
{
/* static global variables */
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
else
{
@ -471,12 +471,12 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
QSE_NULL,
tmp, QSE_COUNTOF(tmp)
);
PUT_SRCSTRX (awk, tmp, n);
PUT_SRCSTRN (awk, tmp, n);
}
}
else
{
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
QSE_ASSERT (px->idx == QSE_NULL);
break;
@ -493,12 +493,12 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
{
/* no implicit(named) variable is allowed.
* use the actual name */
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
else if (px->id.idxa < awk->tree.ngbls_base)
{
/* static global variables */
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
else
{
@ -513,13 +513,13 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
QSE_NULL,
tmp, QSE_COUNTOF(tmp)
);
PUT_SRCSTRX (awk, tmp, n);
PUT_SRCSTRN (awk, tmp, n);
}
PUT_SRCSTR (awk, QSE_T("["));
}
else
{
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTR (awk, QSE_T("["));
}
QSE_ASSERT (px->idx != QSE_NULL);
@ -544,11 +544,11 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
awk->tmp.fmt,
QSE_COUNTOF(awk->tmp.fmt)
);
PUT_SRCSTRX (awk, awk->tmp.fmt, n);
PUT_SRCSTRN (awk, awk->tmp.fmt, n);
}
else
{
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
}
QSE_ASSERT (px->idx == QSE_NULL);
break;
@ -570,12 +570,12 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
awk->tmp.fmt,
QSE_COUNTOF(awk->tmp.fmt)
);
PUT_SRCSTRX (awk, awk->tmp.fmt, n);
PUT_SRCSTRN (awk, awk->tmp.fmt, n);
PUT_SRCSTR (awk, QSE_T("["));
}
else
{
PUT_SRCSTRX (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTRN (awk, px->id.name.ptr, px->id.name.len);
PUT_SRCSTR (awk, QSE_T("["));
}
QSE_ASSERT (px->idx != QSE_NULL);
@ -594,7 +594,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
case QSE_AWK_NDE_FNC:
{
qse_awk_nde_fncall_t* px = (qse_awk_nde_fncall_t*)nde;
PUT_SRCSTRX (awk,
PUT_SRCSTRN (awk,
px->u.fnc.name.ptr, px->u.fnc.name.len);
PUT_SRCSTR (awk, QSE_T("("));
PRINT_EXPR_LIST (awk, px->args);
@ -605,7 +605,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
case QSE_AWK_NDE_FUN:
{
qse_awk_nde_fncall_t* px = (qse_awk_nde_fncall_t*)nde;
PUT_SRCSTRX (awk,
PUT_SRCSTRN (awk,
px->u.fun.name.ptr, px->u.fun.name.len);
PUT_SRCSTR (awk, QSE_T("("));
PRINT_EXPR_LIST (awk, px->args);
@ -630,7 +630,7 @@ static int print_expr (qse_awk_t* awk, qse_awk_nde_t* nde)
}
qse_awk_getkwname (awk, QSE_AWK_KWID_GETLINE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
if (px->var != QSE_NULL)
{
PUT_SRCSTR (awk, QSE_T(" "));
@ -701,7 +701,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth + 1);
qse_awk_getkwname (awk, QSE_AWK_KWID_LOCAL, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
for (i = 0; i < px->nlcls - 1; i++)
@ -715,7 +715,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
awk->tmp.fmt,
QSE_COUNTOF(awk->tmp.fmt)
);
PUT_SRCSTRX (awk, awk->tmp.fmt, n);
PUT_SRCSTRN (awk, awk->tmp.fmt, n);
PUT_SRCSTR (awk, QSE_T(", "));
}
@ -728,7 +728,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
awk->tmp.fmt,
QSE_COUNTOF(awk->tmp.fmt)
);
PUT_SRCSTRX (awk, awk->tmp.fmt, n);
PUT_SRCSTRN (awk, awk->tmp.fmt, n);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
}
@ -746,7 +746,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_IF, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" ("));
PRINT_EXPR (awk, px->test);
PUT_SRCSTR (awk, QSE_T(")"));
@ -762,7 +762,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_ELSE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_NL (awk);
if (px->else_part->type == QSE_AWK_NDE_BLK)
PRINT_STMTS (awk, px->else_part, depth);
@ -778,7 +778,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_WHILE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" ("));
PRINT_EXPR (awk, px->test);
PUT_SRCSTR (awk, QSE_T(")"));
@ -800,7 +800,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_DO, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_NL (awk);
if (px->body->type == QSE_AWK_NDE_BLK)
{
@ -813,7 +813,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_WHILE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" ("));
PRINT_EXPR (awk, px->test);
PUT_SRCSTR (awk, QSE_T(");"));
@ -827,7 +827,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_FOR, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" ("));
if (px->init != QSE_NULL)
{
@ -863,7 +863,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_FOR, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
PRINT_EXPR (awk, px->test);
PUT_NL (awk);
@ -882,7 +882,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_BREAK, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
break;
@ -892,7 +892,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_CONTINUE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
break;
@ -904,14 +904,14 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
if (((qse_awk_nde_return_t*)p)->val == QSE_NULL)
{
qse_awk_getkwname (awk, QSE_AWK_KWID_RETURN, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
}
else
{
qse_awk_getkwname (awk, QSE_AWK_KWID_RETURN, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
QSE_ASSERT (((qse_awk_nde_return_t*)p)->val->next == QSE_NULL);
@ -930,14 +930,14 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
if (px->val == QSE_NULL)
{
qse_awk_getkwname (awk, QSE_AWK_KWID_EXIT, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
}
else
{
qse_awk_getkwname (awk, QSE_AWK_KWID_EXIT, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
QSE_ASSERT (px->val->next == QSE_NULL);
PRINT_EXPR (awk, px->val);
@ -951,7 +951,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_NEXT, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
break;
@ -963,12 +963,12 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
if (((qse_awk_nde_nextfile_t*)p)->out)
{
qse_awk_getkwname (awk, QSE_AWK_KWID_NEXTOFILE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
}
else
{
qse_awk_getkwname (awk, QSE_AWK_KWID_NEXTFILE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
}
PUT_SRCSTR (awk, QSE_T(";"));
PUT_NL (awk);
@ -979,7 +979,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_DELETE, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
qse_awk_prnpt (awk, ((qse_awk_nde_delete_t*)p)->var);
break;
@ -989,7 +989,7 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
{
PRINT_TABS (awk, depth);
qse_awk_getkwname (awk, QSE_AWK_KWID_RESET, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
PUT_SRCSTR (awk, QSE_T(" "));
qse_awk_prnpt (awk, ((qse_awk_nde_reset_t*)p)->var);
break;
@ -1005,12 +1005,12 @@ static int print_stmt (qse_awk_t* awk, qse_awk_nde_t* p, int depth)
if (p->type == QSE_AWK_NDE_PRINT)
{
qse_awk_getkwname (awk, QSE_AWK_KWID_PRINT, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
}
else
{
qse_awk_getkwname (awk, QSE_AWK_KWID_PRINTF, &kw);
PUT_SRCSTRX (awk, kw.ptr, kw.len);
PUT_SRCSTRN (awk, kw.ptr, kw.len);
}
if (px->args != QSE_NULL)

7
qse/lib/cmn/assert.c
View File

@ -23,7 +23,6 @@
#ifndef NDEBUG
#include <stdio.h>
#include <qse/cmn/sio.h>
#include "mem.h"
@ -95,8 +94,12 @@ void qse_assert_failed (
qse_sio_t* sio, siobuf;
sio = &siobuf;
if (qse_sio_initstd (sio, QSE_MMGR_GETDFL(), QSE_SIO_STDERR, QSE_SIO_NOAUTOFLUSH) <= -1)
if (qse_sio_initstd (
sio, QSE_MMGR_GETDFL(), QSE_SIO_STDERR,
QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR | QSE_SIO_NOAUTOFLUSH) <= -1)
{
sio = QSE_SIO_ERR;
}
qse_sio_putms (sio, QSE_MT("=[ASSERTION FAILURE]============================================================\n"));

10
qse/lib/cmn/chr-cnv.c
View File

@ -59,8 +59,8 @@ qse_size_t qse_mbrlen (
#if 0
n = mblen (mb, mbl);
if (n == 0) return 1; /* a null character */
if (n == (size_t)-1) return 0; /* invalid or incomplete sequence */
if (n == 0) return 1; /* a null character */
return (qse_size_t)n;
#endif
#else
@ -119,16 +119,20 @@ qse_size_t qse_wcrtomb (
qse_mchar_t buf[QSE_MBLEN_MAX];
n = wcrtomb (buf, wc, (mbstate_t*)state);
if (n > mbl) return mbl + 1; /* buffer to small */
/* it's important that n is checked againt (size_t)-1
* before againt mbl. n > mbl is true if n is (size_t)-1.
* if the check comes later, i won't have a chance to
* determine the case of an illegal character */
if (n == (size_t)-1) return 0; /* illegal character */
if (n > mbl) return mbl + 1; /* buffer to small */
QSE_MEMCPY (mb, buf, mbl);
}
else
{
n = wcrtomb (mb, wc, (mbstate_t*)state);
if (n > mbl) return mbl + 1; /* buffer to small */
if (n == (size_t)-1) return 0; /* illegal character */
if (n > mbl) return mbl + 1; /* buffer to small */
}
return n; /* number of bytes written to the buffer */

10
qse/lib/cmn/sio.c
View File

@ -262,7 +262,7 @@ int qse_sio_initstd (
void qse_sio_fini (qse_sio_t* sio)
{
/*if (qse_sio_flush (sio) == -1) return -1;*/
/*if (qse_sio_flush (sio) <= -1) return -1;*/
qse_sio_flush (sio);
qse_tio_fini (&sio->tio);
qse_fio_fini (&sio->fio);
@ -325,24 +325,24 @@ qse_ssize_t qse_sio_puts (qse_sio_t* sio, const qse_char_t* str)
qse_ssize_t qse_sio_putms (qse_sio_t* sio, const qse_mchar_t* str)
{
return qse_tio_writem (&sio->tio, str, qse_mbslen(str));
return qse_tio_writembsn (&sio->tio, str, qse_mbslen(str));
}
qse_ssize_t qse_sio_putws (qse_sio_t* sio, const qse_wchar_t* str)
{
return qse_tio_writew (&sio->tio, str, qse_wcslen(str));
return qse_tio_writewcsn (&sio->tio, str, qse_wcslen(str));
}
qse_ssize_t qse_sio_putmsn (
qse_sio_t* sio, const qse_mchar_t* str, qse_size_t size)
{
return qse_tio_writem (&sio->tio, str, size);
return qse_tio_writembsn (&sio->tio, str, size);
}
qse_ssize_t qse_sio_putwsn (
qse_sio_t* sio, const qse_wchar_t* str, qse_size_t size)
{
return qse_tio_writew (&sio->tio, str, size);
return qse_tio_writewcsn (&sio->tio, str, size);
}
int qse_sio_getpos (qse_sio_t* sio, qse_sio_pos_t* pos)

4
qse/lib/cmn/str-cnv.c
View File

@ -342,7 +342,7 @@ int qse_wcstombs (
if (rem > 0) *mbs = QSE_MT('\0');
else
{
/* if ret is -2 and wcs[wcslen] == QSE_T('\0'),
/* if ret is -2 and wcs[wcslen] == QSE_WT('\0'),
* this means that the mbs buffer was lacking one
* slot for the terminating null */
ret = -2; /* buffer too small */
@ -428,7 +428,7 @@ int qse_wcsntombsn (
{
qse_size_t n;
n = qse_wcrtomb (*p, mbs, QSE_COUNTOF(mbsbuf), &state);
n = qse_wcrtomb (*p, mbsbuf, QSE_COUNTOF(mbsbuf), &state);
if (n == 0)
{
ret = -1;

1
qse/lib/cmn/str-fnmat.c
View File

@ -199,6 +199,7 @@ static int __mbsxnfnmat (
if (pl >= 9)
{
/* TODO: binary search or something more efficient ? */
if (qse_mbszcmp(pp, QSE_MT("[:upper:]"), 9) == 0)
{
matched = QSE_ISMUPPER(sc);

91
qse/lib/cmn/tio-put.c
View File

@ -129,7 +129,7 @@ qse_ssize_t qse_tio_write (qse_tio_t* tio, const qse_char_t* str, qse_size_t siz
return p - str;
}
qse_ssize_t qse_tio_writem (
qse_ssize_t qse_tio_writembsn (
qse_tio_t* tio, const qse_mchar_t* mptr, qse_size_t mlen)
{
const qse_mchar_t* xptr, * xend;
@ -155,7 +155,7 @@ qse_ssize_t qse_tio_writem (
{
for (xend = xptr + capa; xptr < xend; xptr++)
tio->outbuf[tio->outbuf_len++] = *xptr;
if (qse_tio_flush (tio) == -1) return -1;
if (qse_tio_flush (tio) <= -1) return -1;
mlen -= capa;
}
@ -171,20 +171,27 @@ qse_ssize_t qse_tio_writem (
for (xend = xptr + mlen; xptr < xend; xptr++)
{
/* TODO: support different line terminating characeter */
if (*xptr == QSE_MT('\n')) nl = 1;
tio->outbuf[tio->outbuf_len++] = *xptr;
if (*xptr == QSE_MT('\n'))
{
nl = 1;
break;
}
}
for (; xptr < xend; xptr++)
tio->outbuf[tio->outbuf_len++] = *xptr;
}
/* if the last part contains a new line, flush the internal
* buffer. note that this flushes characters after nl also.*/
if (nl && qse_tio_flush (tio) == -1) return -1;
if (nl && qse_tio_flush (tio) <= -1) return -1;
/* returns the number multi-bytes characters handled */
return xptr - mptr;
}
qse_ssize_t qse_tio_writew (
qse_ssize_t qse_tio_writewcsn (
qse_tio_t* tio, const qse_wchar_t* wptr, qse_size_t wlen)
{
qse_size_t capa, wcnt, mcnt, xwlen;
@ -198,49 +205,69 @@ qse_ssize_t qse_tio_writew (
capa = QSE_COUNTOF(tio->outbuf) - tio->outbuf_len;
wcnt = xwlen; mcnt = capa;
n = qse_wcsntombsn (wptr, &wcnt, &tio->outbuf[tio->outbuf_len], &mcnt);
n = qse_wcsntombsn (
wptr, &wcnt, &tio->outbuf[tio->outbuf_len], &mcnt);
tio->outbuf_len += mcnt;
if (n == -2)
{
/* the buffer is not large enough to
* convert more. so flush now and continue */
if (qse_tio_flush (tio) == -1) return -1;
* convert more. so flush now and continue.
* note that the buffer may not be full though
* it not large enough in this case */
if (qse_tio_flush (tio) <= -1) return -1;
nl = 0;
}
else if (n <= -1)
else
{
/* invalid wide-character is encountered. */
if (tio->flags & QSE_TIO_IGNOREMBWCERR)
if (tio->outbuf_len >= QSE_COUNTOF(tio->outbuf))
{
/* though an error occurred, wcnt and mcnt
* are valid for the bytes and characters
* processed so far. so i can insert a question
* mark using mcnt as an index */
tio->outbuf[tio->outbuf_len + mcnt] = QSE_MT('?');
mcnt++; wcnt++;
/* flush the full buffer regardless of conversion
* result. */
if (qse_tio_flush (tio) <= -1) return -1;
nl = 0;
}
if (n <= -1)
{
/* an invalid wide-character is encountered. */
if (tio->flags & QSE_TIO_IGNOREMBWCERR)
{
/* insert a question mark for an illegal
* character. */
QSE_ASSERT (tio->outbuf_len < QSE_COUNTOF(tio->outbuf));
tio->outbuf[tio->outbuf_len++] = QSE_MT('?');
wcnt++; /* skip this illegal character */
/* don't need to increment mcnt since
* it's not used below */
}
else
{
tio->errnum = QSE_TIO_EILCHR;
return -1;
}
}
else
{
tio->errnum = QSE_TIO_EILCHR;
return -1;
if (!(tio->flags & QSE_TIO_NOAUTOFLUSH) && !nl)
{
qse_size_t i;
/* checking for a newline this way looks damn ugly.
* TODO: how can i do this more elegantly? */
for (i = 0; i < wcnt; i++)
{
if (wptr[i] == QSE_WT('\n'))
{
nl = 1;
break;
}
}
}
}
}
else
{
if (!(tio->flags & QSE_TIO_NOAUTOFLUSH))
{
qse_size_t i;
/* checking for a newline this way looks damn ugly.
* TODO: how can i do this more elegantly? */
for (i = 0; i < wcnt; i++)
if (wptr[i] == QSE_WT('\n')) nl = 1;
}
}
wptr += wcnt; xwlen -= wcnt;
}
if (nl && qse_tio_flush (tio) == -1) return -1;
if (nl && qse_tio_flush (tio) <= -1) return -1;
return wlen;
}

2
qse/lib/stx/hash.c
View File

@ -33,7 +33,7 @@ qse_word_t qse_stx_hashstr (qse_stx_t* stx, const qse_char_t* str)
return h;
}
qse_word_t qse_stx_hashstrx (
qse_word_t qse_stx_hashstrn (
qse_stx_t* stx, const qse_char_t* str, qse_word_t len)
{
return qse_stx_hashbytes (stx, str, len * QSE_SIZEOF(*str));

2
qse/lib/stx/hash.h
View File

@ -20,7 +20,7 @@ qse_word_t qse_stx_hashstr (
const qse_char_t* str
);
qse_word_t qse_stx_hashstrx (
qse_word_t qse_stx_hashstrn (
qse_stx_t* stx,
const qse_char_t* str,
qse_word_t len