X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_re.c;h=6ac5182517d8e5262818ed3e6abc331c6a21bac3;hb=833dc6c2a9c47b821548b197a1d1f96f60df7de8;hp=d5c9b490adeb29ccff3d6182318ce53fb763d9ec;hpb=575fd5b430d5f1557d9a6bdb19c037efaf023759;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_re.c b/lib/ecoli_node_re.c index d5c9b49..6ac5182 100644 --- a/lib/ecoli_node_re.c +++ b/lib/ecoli_node_re.c @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the University of California, Berkeley nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2016, Olivier MATZ */ #include @@ -36,61 +13,55 @@ #include #include #include +#include +#include #include +EC_LOG_TYPE_REGISTER(node_re); + struct ec_node_re { struct ec_node gen; char *re_str; regex_t re; }; -static struct ec_parsed *ec_node_re_parse(const struct ec_node *gen_node, - const struct ec_strvec *strvec) +static int +ec_node_re_parse(const struct ec_node *gen_node, + struct ec_parse *state, + const struct ec_strvec *strvec) { struct ec_node_re *node = (struct ec_node_re *)gen_node; - struct ec_strvec *match_strvec; - struct ec_parsed *parsed = NULL; const char *str; regmatch_t pos; - parsed = ec_parsed_new(); - if (parsed == NULL) - goto fail; + (void)state; if (ec_strvec_len(strvec) == 0) - return parsed; + return EC_PARSE_NOMATCH; str = ec_strvec_val(strvec, 0); if (regexec(&node->re, str, 1, &pos, 0) != 0) - return parsed; + return EC_PARSE_NOMATCH; if (pos.rm_so != 0 || pos.rm_eo != (int)strlen(str)) - return parsed; - - match_strvec = ec_strvec_ndup(strvec, 0, 1); - if (match_strvec == NULL) - goto fail; - - ec_parsed_set_match(parsed, gen_node, match_strvec); - - return parsed; + return EC_PARSE_NOMATCH; - fail: - ec_parsed_free(parsed); - return NULL; + return 1; } static void ec_node_re_free_priv(struct ec_node *gen_node) { struct ec_node_re *node = (struct ec_node_re *)gen_node; - ec_free(node->re_str); - regfree(&node->re); + if (node->re_str != NULL) { + ec_free(node->re_str); + regfree(&node->re); + } } static struct ec_node_type ec_node_re_type = { .name = "re", .parse = ec_node_re_parse, - .complete = ec_node_default_complete, + .complete = ec_node_complete_unknown, .size = sizeof(struct ec_node_re), .free_priv = ec_node_re_free_priv, }; @@ -100,34 +71,44 @@ EC_NODE_TYPE_REGISTER(ec_node_re_type); int ec_node_re_set_regexp(struct ec_node *gen_node, const char *str) { struct ec_node_re *node = (struct ec_node_re *)gen_node; + char *str_copy = NULL; + regex_t re; int ret; - if (str == NULL) - return -EINVAL; - if (node->re_str != NULL) // XXX allow to replace - return -EEXIST; + EC_CHECK_ARG(str != NULL, -1, EINVAL); - ret = -ENOMEM; - node->re_str = ec_strdup(str); - if (node->re_str == NULL) + str_copy = ec_strdup(str); + if (str_copy == NULL) goto fail; - ret = -EINVAL; - if (regcomp(&node->re, node->re_str, REG_EXTENDED) != 0) + ret = regcomp(&re, str_copy, REG_EXTENDED); + if (ret != 0) { + if (ret == REG_ESPACE) + errno = ENOMEM; + else + errno = EINVAL; goto fail; + } + + if (node->re_str != NULL) { + ec_free(node->re_str); + regfree(&node->re); + } + node->re_str = str_copy; + node->re = re; return 0; fail: - ec_free(node->re_str); - return ret; + ec_free(str_copy); + return -1; } struct ec_node *ec_node_re(const char *id, const char *re_str) { struct ec_node *gen_node = NULL; - gen_node = __ec_node_new(&ec_node_re_type, id); + gen_node = ec_node_from_type(&ec_node_re_type, id); if (gen_node == NULL) goto fail; @@ -141,26 +122,28 @@ fail: return NULL; } +/* LCOV_EXCL_START */ static int ec_node_re_testcase(void) { struct ec_node *node; - int ret = 0; + int testres = 0; - node = ec_node_re(NULL, "fo+|bar"); + node = ec_node_re(EC_NO_ID, "fo+|bar"); if (node == NULL) { - ec_log(EC_LOG_ERR, "cannot create node\n"); + EC_LOG(EC_LOG_ERR, "cannot create node\n"); return -1; } - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar"); - ret |= EC_TEST_CHECK_PARSE(node, 1, "bar"); - ret |= EC_TEST_CHECK_PARSE(node, -1, "foobar"); - ret |= EC_TEST_CHECK_PARSE(node, -1, " foo"); - ret |= EC_TEST_CHECK_PARSE(node, -1, ""); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "foo", "bar"); + testres |= EC_TEST_CHECK_PARSE(node, 1, "bar"); + testres |= EC_TEST_CHECK_PARSE(node, -1, "foobar"); + testres |= EC_TEST_CHECK_PARSE(node, -1, " foo"); + testres |= EC_TEST_CHECK_PARSE(node, -1, ""); ec_node_free(node); - return ret; + return testres; } +/* LCOV_EXCL_STOP */ static struct ec_test ec_node_re_test = { .name = "node_re",