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

added qse_xli_dupflatstr() and renamed qse_xli_addnextsegtostr() to qse_xli_addsegtostr().

Browse Source 
made relevant changes to cmd/httpd/httpd.c for the change of qse_xli_str_t
This commit is contained in:
hyung-hwan 2013-07-01 09:10:13 +00:00
parent aeb9b79220
commit 6f965a75d9
4 changed files with 113 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
qse/cmd/http/httpd.c
View File

@ -850,7 +850,7 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, loc_xcfg_items[i].y); if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, loc_xcfg_items[i].y);
if (pair && pair->val->type == QSE_XLI_STR) if (pair && pair->val->type == QSE_XLI_STR)
{ {
cfg->xcfg[i] = qse_httpd_strtombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr); cfg->xcfg[i] = qse_httpd_strntombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len);
if (cfg->xcfg[i] == QSE_NULL) if (cfg->xcfg[i] == QSE_NULL)
{ {
/*qse_printf (QSE_T("ERROR in copying - %s\n"), qse_httpd_geterrmsg (httpd));*/ /*qse_printf (QSE_T("ERROR in copying - %s\n"), qse_httpd_geterrmsg (httpd));*/
@ -864,22 +864,26 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, QSE_T("server-default.index")); if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, QSE_T("server-default.index"));
if (pair && pair->val->type == QSE_XLI_STR) if (pair && pair->val->type == QSE_XLI_STR)
{ {
const qse_char_t* tmpptr, * tmpend; qse_char_t* duptmp;
qse_size_t count; qse_size_t count, duplen;
tmpptr = ((qse_xli_str_t*)pair->val)->ptr; duptmp = qse_xli_dupflatstr (httpd_xtn->xli, (qse_xli_str_t*)pair->val, &duplen, &count);
tmpend = tmpptr + ((qse_xli_str_t*)pair->val)->len; if (duptmp == QSE_NULL)
{
for (count = 0; tmpptr < tmpend; count++) tmpptr += qse_strlen (tmpptr) + 1; qse_printf (QSE_T("ERROR: in copying index\n"));
return -1;
}
cfg->index.files = qse_httpd_strntombsdup (httpd, duptmp, duplen);
qse_xli_freemem (httpd_xtn->xli, duptmp);
cfg->index.count = count;
cfg->index.files = qse_httpd_strntombsdup (
httpd, ((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len);
if (cfg->index.files == QSE_NULL) if (cfg->index.files == QSE_NULL)
{ {
qse_printf (QSE_T("ERROR: in copying index\n")); qse_printf (QSE_T("ERROR: in copying index\n"));
return -1; return -1;
} }
cfg->index.count = count;
} }
pair = qse_xli_findpairbyname (httpd_xtn->xli, list, QSE_T("cgi")); pair = qse_xli_findpairbyname (httpd_xtn->xli, list, QSE_T("cgi"));
@ -921,21 +925,20 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
} }
if (pair->val->type == QSE_XLI_STR) if (pair->val->type == QSE_XLI_STR)
{ {
const qse_char_t* tmpptr, * tmpend; qse_xli_str_t* str;
qse_size_t count; qse_size_t count = 0;
tmpptr = ((qse_xli_str_t*)pair->val)->ptr; for (str = (qse_xli_str_t*)pair->val; str; str = str->next)
tmpend = tmpptr + ((qse_xli_str_t*)pair->val)->len;
for (count = 0; tmpptr < tmpend; count++)
{ {
if (count == 0) if (count == 0)
{ {
if (qse_strcmp (tmpptr, QSE_T("nph")) == 0) cgi->nph = 1; /* the first segment */
if (qse_strxcmp (str->ptr, str->len, QSE_T("nph")) == 0) cgi->nph = 1;
} }
else if (count == 1) else if (count == 1)
{ {
cgi->shebang = qse_httpd_strtombsdup (httpd, tmpptr); /* second segment */
cgi->shebang = qse_httpd_strntombsdup (httpd, str->ptr, str->len);
if (!cgi->shebang) if (!cgi->shebang)
{ {
qse_httpd_freemem (httpd, cgi->spec); qse_httpd_freemem (httpd, cgi->spec);
@ -945,9 +948,9 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
} }
} }
tmpptr += qse_strlen (tmpptr) + 1; count++;
/* TODO: more sanity check */ /* TODO: more sanity check like the number of maximum segments or the value of the first segment...*/
} }
} }
@ -974,7 +977,6 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
{ {
struct auth_rule_t* auth_rule; struct auth_rule_t* auth_rule;
int type; int type;
const qse_char_t* tmp;
if (qse_strcmp (pair->key, QSE_T("prefix")) == 0 && pair->name) type = AUTH_RULE_PREFIX; if (qse_strcmp (pair->key, QSE_T("prefix")) == 0 && pair->name) type = AUTH_RULE_PREFIX;
else if (qse_strcmp (pair->key, QSE_T("suffix")) == 0 && pair->name) type = AUTH_RULE_SUFFIX; else if (qse_strcmp (pair->key, QSE_T("suffix")) == 0 && pair->name) type = AUTH_RULE_SUFFIX;
@ -1002,7 +1004,7 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
} }
auth_rule->noauth = 0; auth_rule->noauth = 0;
if (qse_strcmp (((qse_xli_str_t*)pair->val)->ptr, QSE_T("noauth")) == 0) auth_rule->noauth = 1; if (qse_strxcmp (((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len, QSE_T("noauth")) == 0) auth_rule->noauth = 1;
if (cfg->auth_rule[type].tail) if (cfg->auth_rule[type].tail)
cfg->auth_rule[type].tail->next = auth_rule; cfg->auth_rule[type].tail->next = auth_rule;
@ -1050,7 +1052,7 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
return -1; return -1;
} }
mime->value = qse_httpd_strtombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr); mime->value = qse_httpd_strntombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len);
if (!mime->value) if (!mime->value)
{ {
qse_httpd_freemem (httpd, mime->spec); qse_httpd_freemem (httpd, mime->spec);
@ -1084,6 +1086,7 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
{ {
struct access_t* acc; struct access_t* acc;
const qse_char_t* tmp; const qse_char_t* tmp;
qse_size_t len;
int type, value; int type, value;
if (qse_strcmp (pair->key, QSE_T("prefix")) == 0 && pair->name) type = ACCESS_PREFIX; if (qse_strcmp (pair->key, QSE_T("prefix")) == 0 && pair->name) type = ACCESS_PREFIX;
@ -1093,9 +1096,10 @@ static int load_loccfg (qse_httpd_t* httpd, qse_xli_list_t* list, loccfg_t* cfg)
else continue; else continue;
tmp = ((qse_xli_str_t*)pair->val)->ptr; tmp = ((qse_xli_str_t*)pair->val)->ptr;
if (qse_strcmp (tmp, QSE_T("noent")) == 0) value = 404; len = ((qse_xli_str_t*)pair->val)->len;
else if (qse_strcmp (tmp, QSE_T("forbid")) == 0) value = 403; if (qse_strxcmp (tmp, len, QSE_T("noent")) == 0) value = 404;
else if (qse_strcmp (tmp, QSE_T("ok")) == 0) value = 200; else if (qse_strxcmp (tmp, len, QSE_T("forbid")) == 0) value = 403;
else if (qse_strxcmp (tmp, len, QSE_T("ok")) == 0) value = 200;
else continue; else continue;
/* TODO: more sanity check */ /* TODO: more sanity check */
@ -1208,7 +1212,7 @@ static int load_server_config (qse_httpd_t* httpd, qse_httpd_server_t* server, q
if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, scfg_items[i].y); if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, scfg_items[i].y);
if (pair && pair->val->type == QSE_XLI_STR) if (pair && pair->val->type == QSE_XLI_STR)
{ {
server_xtn->scfg[i] = qse_httpd_strtombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr); server_xtn->scfg[i] = qse_httpd_strntombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len);
if (server_xtn->scfg[i] == QSE_NULL) if (server_xtn->scfg[i] == QSE_NULL)
{ {
/*qse_printf (QSE_T("ERROR in copying - %s\n"), qse_httpd_geterrmsg (httpd));*/ /*qse_printf (QSE_T("ERROR in copying - %s\n"), qse_httpd_geterrmsg (httpd));*/
@ -1340,7 +1344,7 @@ static qse_httpd_server_t* attach_server (qse_httpd_t* httpd, int num, qse_xli_l
} }
qse_memset (&dope, 0, QSE_SIZEOF(dope)); qse_memset (&dope, 0, QSE_SIZEOF(dope));
if (qse_strtonwad (((qse_xli_str_t*)pair->val)->ptr, &dope.nwad) <= -1) if (qse_strntonwad (((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len, &dope.nwad) <= -1)
{ {
/* TOOD: logging */ /* TOOD: logging */
qse_printf (QSE_T("WARNING: invalid value for bind - %s\n"), ((qse_xli_str_t*)pair->val)->ptr); qse_printf (QSE_T("WARNING: invalid value for bind - %s\n"), ((qse_xli_str_t*)pair->val)->ptr);
@ -1349,7 +1353,8 @@ static qse_httpd_server_t* attach_server (qse_httpd_t* httpd, int num, qse_xli_l
pair = qse_xli_findpairbyname (httpd_xtn->xli, list, QSE_T("ssl")); pair = qse_xli_findpairbyname (httpd_xtn->xli, list, QSE_T("ssl"));
if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, QSE_T("server-default.ssl")); if (!pair) pair = qse_xli_findpairbyname (httpd_xtn->xli, QSE_NULL, QSE_T("server-default.ssl"));
if (pair && pair->val->type == QSE_XLI_STR) dope.flags |= QSE_HTTPD_SERVER_SECURE; if (pair && pair->val->type == QSE_XLI_STR &&
qse_strxcmp (((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len, QSE_T("yes")) == 0) dope.flags |= QSE_HTTPD_SERVER_SECURE;
dope.detach = free_server_config; dope.detach = free_server_config;
xserver = qse_httpd_attachserverstd (httpd, &dope, QSE_SIZEOF(server_xtn_t)); xserver = qse_httpd_attachserverstd (httpd, &dope, QSE_SIZEOF(server_xtn_t));
@ -1444,11 +1449,13 @@ static void set_limit (qse_httpd_t* httpd, const qse_char_t* name, int what)
if (getrlimit (what, &lim) == 0) if (getrlimit (what, &lim) == 0)
{ {
const qse_char_t* str; const qse_char_t* str;
qse_size_t len;
str = ((qse_xli_str_t*)pair->val)->ptr; str = ((qse_xli_str_t*)pair->val)->ptr;
if (qse_strcasecmp (str, QSE_T("none")) != 0) len = ((qse_xli_str_t*)pair->val)->len;
if (qse_strxcmp (str, len, QSE_T("none")) != 0)
{ {
if (qse_strcasecmp (str, QSE_T("unlimited")) == 0) if (qse_strxcmp (str, len, QSE_T("unlimited")) == 0)
lim.rlim_cur = RLIM_INFINITY; lim.rlim_cur = RLIM_INFINITY;
else else
lim.rlim_cur = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr); lim.rlim_cur = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr);
@ -1476,7 +1483,7 @@ static int load_config (qse_httpd_t* httpd)
if (pair && pair->val->type == QSE_XLI_STR) if (pair && pair->val->type == QSE_XLI_STR)
{ {
qse_mchar_t* tmp; qse_mchar_t* tmp;
tmp = qse_httpd_strtombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr); tmp = qse_httpd_strntombsdup (httpd, ((qse_xli_str_t*)pair->val)->ptr, ((qse_xli_str_t*)pair->val)->len);
if (tmp) qse_httpd_setname (httpd, tmp); if (tmp) qse_httpd_setname (httpd, tmp);
qse_httpd_freemem (httpd, tmp); qse_httpd_freemem (httpd, tmp);
} }

14
qse/include/qse/xli/xli.h
View File

@ -534,12 +534,24 @@ QSE_EXPORT qse_size_t qse_xli_getnumpairsbyname (
const qse_char_t* name const qse_char_t* name
); );
QSE_EXPORT qse_xli_str_t* qse_xli_addnextsegtostr ( QSE_EXPORT qse_xli_str_t* qse_xli_addsegtostr (
qse_xli_t* xli, qse_xli_t* xli,
qse_xli_str_t* str, qse_xli_str_t* str,
const qse_cstr_t* value const qse_cstr_t* value
); );
/**
* The qse_xli_dupflatstr() function duplicates the character strings
* found in the string list led by \a str and flattens them into a single
* character string each of whose segment is delimited by '\0' and the last
* segment is delimited by double '\0's.
*/
qse_char_t* qse_xli_dupflatstr (
qse_xli_t* xli,
qse_xli_str_t* str,
qse_size_t* len,
qse_size_t* nsegs
);
QSE_EXPORT void qse_xli_clear ( QSE_EXPORT void qse_xli_clear (
qse_xli_t* xli qse_xli_t* xli

33
qse/lib/xli/read.c
View File

@ -612,20 +612,12 @@ static int read_pair (qse_xli_t* xli)
{ {
qse_xli_str_t* curstrseg; qse_xli_str_t* curstrseg;
pair = qse_xli_insertpairwithstr (xli, parlist, QSE_NULL, key, name, QSE_STR_CSTR(xli->tok.name)); /* add a new pair with the initial string segment */
if (pair == QSE_NULL) goto oops; pair = qse_xli_insertpairwithstr (xli, parlist, QSE_NULL, key, name, QSE_STR_CSTR(xli->tok.name));
if (pair == QSE_NULL) goto oops;
curstrseg = (qse_xli_str_t*)pair->val; curstrseg = (qse_xli_str_t*)pair->val;
#if 0
if (qse_str_ncpy (xli->tmp[0], QSE_STR_PTR(xli->tok.name), QSE_STR_LEN(xli->tok.name) + 1) == (qse_size_t)-1)
{
qse_xli_seterrnum (xli, QSE_XLI_ENOMEM, QSE_NULL);
goto oops;
}
#endif
if (get_token (xli) <= -1) goto oops; if (get_token (xli) <= -1) goto oops;
if (MATCH(xli, TOK_COMMA)) if (MATCH(xli, TOK_COMMA))
{ {
@ -641,27 +633,14 @@ if (pair == QSE_NULL) goto oops;
} }
#if 0 /* add an additional segment to the string */
if (qse_str_ncat (xli->tmp[0], QSE_STR_PTR(xli->tok.name), QSE_STR_LEN(xli->tok.name) + 1) == (qse_size_t)-1) curstrseg = qse_xli_addsegtostr (xli, curstrseg, QSE_STR_CSTR(xli->tok.name));
{ if (curstrseg == QSE_NULL) goto oops;
qse_xli_seterrnum (xli, QSE_XLI_ENOMEM, QSE_NULL);
goto oops;
}
#endif
curstrseg = qse_xli_addnextsegtostr (xli, curstrseg, QSE_STR_CSTR(xli->tok.name));
if (curstrseg == QSE_NULL) goto oops;
if (get_token (xli) <= -1) goto oops; /* skip the value */ if (get_token (xli) <= -1) goto oops; /* skip the value */
} }
while (MATCH (xli, TOK_COMMA)); while (MATCH (xli, TOK_COMMA));
} }
#if 0
pair = qse_xli_insertpairwithstr (
xli, parlist, QSE_NULL, key, name, QSE_STR_CSTR(xli->tmp[0]));
if (pair == QSE_NULL) goto oops;
#endif
/* semicolon is mandatory for a string */ /* semicolon is mandatory for a string */
if (!MATCH (xli, TOK_SEMICOLON)) if (!MATCH (xli, TOK_SEMICOLON))

73
qse/lib/xli/xli.c
View File

@ -286,23 +286,6 @@ qse_xli_pair_t* qse_xli_insertpairwithstr (
return tmp; return tmp;
} }
qse_xli_str_t* qse_xli_addnextsegtostr (
qse_xli_t* xli, qse_xli_str_t* str, const qse_cstr_t* value)
{
qse_xli_str_t* val;
val = qse_xli_callocmem (xli, QSE_SIZEOF(*val) + ((value->len + 1) * QSE_SIZEOF(*value->ptr)));
if (val == QSE_NULL) return QSE_NULL;
val->type = QSE_XLI_STR;
qse_strncpy ((qse_char_t*)(val + 1), value->ptr, value->len);
val->ptr = (const qse_char_t*)(val + 1);
val->len = value->len;
str->next = val;
return str->next;
}
qse_xli_text_t* qse_xli_inserttext ( qse_xli_text_t* qse_xli_inserttext (
qse_xli_t* xli, qse_xli_list_t* parent, qse_xli_atom_t* peer, const qse_char_t* str) qse_xli_t* xli, qse_xli_list_t* parent, qse_xli_atom_t* peer, const qse_char_t* str)
{ {
@ -369,10 +352,22 @@ static void free_atom (qse_xli_t* xli, qse_xli_atom_t* atom)
{ {
qse_xli_pair_t* pair = (qse_xli_pair_t*)atom; qse_xli_pair_t* pair = (qse_xli_pair_t*)atom;
if (pair->val != &xli->xnil) if ((qse_xli_nil_t*)pair->val != &xli->xnil)
{ {
if (pair->val->type == QSE_XLI_LIST) if (pair->val->type == QSE_XLI_LIST)
free_list (xli, (qse_xli_list_t*)pair->val); free_list (xli, (qse_xli_list_t*)pair->val);
else if (pair->val->type == QSE_XLI_STR)
{
qse_xli_str_t* cur, * next;
cur = ((qse_xli_str_t*)pair->val)->next;
while (cur)
{
next = cur->next;
QSE_MMGR_FREE (xli->mmgr, cur);
cur = next;
}
}
QSE_MMGR_FREE (xli->mmgr, pair->val); QSE_MMGR_FREE (xli->mmgr, pair->val);
} }
@ -744,3 +739,45 @@ noent:
return 0; return 0;
} }
qse_xli_str_t* qse_xli_addsegtostr (
qse_xli_t* xli, qse_xli_str_t* str, const qse_cstr_t* value)
{
qse_xli_str_t* val;
val = qse_xli_callocmem (xli, QSE_SIZEOF(*val) + ((value->len + 1) * QSE_SIZEOF(*value->ptr)));
if (val == QSE_NULL) return QSE_NULL;
val->type = QSE_XLI_STR;
qse_strncpy ((qse_char_t*)(val + 1), value->ptr, value->len);
val->ptr = (const qse_char_t*)(val + 1);
val->len = value->len;
val->next = str->next;
str->next = val;
return str->next;
}
qse_char_t* qse_xli_dupflatstr (qse_xli_t* xli, qse_xli_str_t* str, qse_size_t* len, qse_size_t* nsegs)
{
qse_char_t* tmp;
qse_xli_str_t* cur;
qse_size_t x, y;
for (x = 0, cur = str; cur; cur = cur->next) x += (cur->len + 1);
tmp = qse_xli_allocmem (xli, (x + 1) * QSE_SIZEOF(*tmp));
if (tmp == QSE_NULL) return QSE_NULL;
for (x = 0, y = 0, cur = str; cur; cur = cur->next, y++)
{
qse_strncpy (&tmp[x], cur->ptr, cur->len);
x += (cur->len + 1);
}
tmp[x] = QSE_T('\0');
if (len) *len = x;
if (nsegs) *nsegs = y;
return tmp;
}