aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

config: Remember the address and length of the option name.

Browse Source 
A later commit will take advantage of this.
(cherry picked from commit 3f077d109a)
This commit is contained in:
Kalle Olavi Niemitalo 2008-02-03 06:48:15 +02:00 committed by Kalle Olavi Niemitalo
parent 0c8c9cc16f
commit 34c91ea021
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/config/conf.c
View File

@ -199,33 +199,32 @@ static enum parse_error
parse_set(struct option *opt_tree, struct conf_parsing_state *state, parse_set(struct option *opt_tree, struct conf_parsing_state *state,
struct string *mirror, int is_system_conf) struct string *mirror, int is_system_conf)
{ {
unsigned char *optname; const unsigned char *optname_orig;
size_t optname_len;
unsigned char *optname_copy;
skip_white(&state->pos); skip_white(&state->pos);
if (!*state->pos.look) return show_parse_error(state, ERROR_PARSE); if (!*state->pos.look) return show_parse_error(state, ERROR_PARSE);
/* Option name */ /* Option name */
optname = state->pos.look; optname_orig = state->pos.look;
while (isident(*state->pos.look) || *state->pos.look == '*' while (isident(*state->pos.look) || *state->pos.look == '*'
|| *state->pos.look == '.' || *state->pos.look == '+') || *state->pos.look == '.' || *state->pos.look == '+')
state->pos.look++; state->pos.look++;
optname_len = state->pos.look - optname_orig;
optname = memacpy(optname, state->pos.look - optname);
if (!optname) return show_parse_error(state, ERROR_NOMEM);
skip_white(&state->pos); skip_white(&state->pos);
/* Equal sign */ /* Equal sign */
if (*state->pos.look != '=') { if (*state->pos.look != '=')
mem_free(optname);
return show_parse_error(state, ERROR_PARSE); return show_parse_error(state, ERROR_PARSE);
}
state->pos.look++; /* '=' */ state->pos.look++; /* '=' */
skip_white(&state->pos); skip_white(&state->pos);
if (!*state->pos.look) { if (!*state->pos.look)
mem_free(optname);
return show_parse_error(state, ERROR_VALUE); return show_parse_error(state, ERROR_VALUE);
}
optname_copy = memacpy(optname_orig, optname_len);
if (!optname_copy) return show_parse_error(state, ERROR_NOMEM);
/* Mirror what we already have */ /* Mirror what we already have */
if (mirror) { if (mirror) {
@ -240,8 +239,11 @@ parse_set(struct option *opt_tree, struct conf_parsing_state *state,
unsigned char *val; unsigned char *val;
const struct conf_parsing_pos pos_before_value = state->pos; const struct conf_parsing_pos pos_before_value = state->pos;
opt = mirror ? get_opt_rec_real(opt_tree, optname) : get_opt_rec(opt_tree, optname); opt = mirror
mem_free(optname); ? get_opt_rec_real(opt_tree, optname_copy)
: get_opt_rec(opt_tree, optname_copy);
mem_free(optname_copy);
optname_copy = NULL;
if (!opt || (opt->flags & OPT_HIDDEN)) { if (!opt || (opt->flags & OPT_HIDDEN)) {
show_parse_error(state, ERROR_OPTION); show_parse_error(state, ERROR_OPTION);
@ -297,7 +299,9 @@ static enum parse_error
parse_unset(struct option *opt_tree, struct conf_parsing_state *state, parse_unset(struct option *opt_tree, struct conf_parsing_state *state,
struct string *mirror, int is_system_conf) struct string *mirror, int is_system_conf)
{ {
unsigned char *optname; const unsigned char *optname_orig;
size_t optname_len;
unsigned char *optname_copy;
/* XXX: This does not handle the autorewriting well and is mostly a /* XXX: This does not handle the autorewriting well and is mostly a
* quick hack than anything now. --pasky */ * quick hack than anything now. --pasky */
@ -306,13 +310,14 @@ parse_unset(struct option *opt_tree, struct conf_parsing_state *state,
if (!*state->pos.look) return show_parse_error(state, ERROR_PARSE); if (!*state->pos.look) return show_parse_error(state, ERROR_PARSE);
/* Option name */ /* Option name */
optname = state->pos.look; optname_orig = state->pos.look;
while (isident(*state->pos.look) || *state->pos.look == '*' while (isident(*state->pos.look) || *state->pos.look == '*'
|| *state->pos.look == '.' || *state->pos.look == '+') || *state->pos.look == '.' || *state->pos.look == '+')
state->pos.look++; state->pos.look++;
optname_len = state->pos.look - optname_orig;
optname = memacpy(optname, state->pos.look - optname); optname_copy = memacpy(optname_orig, optname_len);
if (!optname) return show_parse_error(state, ERROR_NOMEM); if (!optname_copy) return show_parse_error(state, ERROR_NOMEM);
/* Mirror what we have */ /* Mirror what we have */
if (mirror) { if (mirror) {
@ -324,8 +329,9 @@ parse_unset(struct option *opt_tree, struct conf_parsing_state *state,
{ {
struct option *opt; struct option *opt;
opt = get_opt_rec_real(opt_tree, optname); opt = get_opt_rec_real(opt_tree, optname_copy);
mem_free(optname); mem_free(optname_copy);
optname_copy = NULL;
if (!opt || (opt->flags & OPT_HIDDEN)) if (!opt || (opt->flags & OPT_HIDDEN))
return show_parse_error(state, ERROR_OPTION); return show_parse_error(state, ERROR_OPTION);