-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * 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 <zer0@droids-corp.org>
*/
#include <sys/types.h>
#include <ecoli_strvec.h>
#include <ecoli_string.h>
#include <ecoli_node.h>
-#include <ecoli_parsed.h>
-#include <ecoli_completed.h>
+#include <ecoli_parse.h>
+#include <ecoli_complete.h>
#include <ecoli_node_file.h>
EC_LOG_TYPE_REGISTER(node_file);
static int
ec_node_file_parse(const struct ec_node *gen_node,
- struct ec_parsed *state,
+ struct ec_parse *state,
const struct ec_strvec *strvec)
{
(void)gen_node;
(void)state;
if (ec_strvec_len(strvec) == 0)
- return EC_PARSED_NOMATCH;
+ return EC_PARSE_NOMATCH;
return 1;
}
static int
ec_node_file_complete(const struct ec_node *gen_node,
- struct ec_completed *completed,
+ struct ec_comp *comp,
const struct ec_strvec *strvec)
{
struct ec_node_file *node = (struct ec_node_file *)gen_node;
char *dname = NULL, *bname = NULL, *effective_dir;
- struct ec_completed_item *item = NULL;
- enum ec_completed_type type;
+ struct ec_comp_item *item = NULL;
+ enum ec_comp_type type;
struct stat st, st2;
const char *input;
size_t bname_len;
bname_len = strlen(bname);
while (1) {
+ int save_errno = errno;
+
errno = 0;
de = node->readdir(dir);
if (de == NULL) {
- if (errno == 0)
+ if (errno == 0) {
+ errno = save_errno;
goto out;
- else
+ } else {
goto fail;
+ }
}
if (!ec_str_startswith(de->d_name, bname))
if (ec_asprintf(&disp_str, "%s", de->d_name) < 0)
goto fail;
}
- if (ec_completed_add_item(completed, gen_node, &item,
+ if (ec_comp_add_item(comp, gen_node, &item,
type, input, comp_str) < 0)
goto out;
/* fix the display string: we don't want to display the full
* path. */
- if (ec_completed_item_set_display(item, disp_str) < 0)
+ if (ec_comp_item_set_display(item, disp_str) < 0)
goto out;
item = NULL;
static int
test_lstat(const char *pathname, struct stat *buf)
{
-// return lstat(pathname, buf);
-
if (!strcmp(pathname, "/tmp/toto/")) {
struct stat st = { .st_mode = S_IFDIR };
memcpy(buf, &st, sizeof(*buf));
static DIR *
test_opendir(const char *name)
{
-// return opendir(name);
int *p;
if (strcmp(name, "/tmp/toto/")) {
static struct dirent *
test_readdir(DIR *dirp)
{
- //return readdir(dirp);
static struct dirent de[] = {
{ .d_type = DT_DIR, .d_name = ".." },
{ .d_type = DT_DIR, .d_name = "." },
static int ec_node_file_testcase(void)
{
struct ec_node *node;
- int ret = 0;
+ int testres = 0;
node = ec_node("file", EC_NO_ID);
if (node == NULL) {
ec_node_file_override_functions(node);
/* any string matches */
- ret |= EC_TEST_CHECK_PARSE(node, 1, "foo");
- ret |= EC_TEST_CHECK_PARSE(node, 1, "/tmp/bar");
- ret |= EC_TEST_CHECK_PARSE(node, -1);
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "foo");
+ testres |= EC_TEST_CHECK_PARSE(node, 1, "/tmp/bar");
+ testres |= EC_TEST_CHECK_PARSE(node, -1);
/* test completion */
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
EC_NODE_ENDLIST,
EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"/tmp/toto/t", EC_NODE_ENDLIST,
EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE_PARTIAL(node,
+ testres |= EC_TEST_CHECK_COMPLETE_PARTIAL(node,
"/tmp/toto/t", EC_NODE_ENDLIST,
"/tmp/toto/titi/", "/tmp/toto/tutu/", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"/tmp/toto/f", EC_NODE_ENDLIST,
"/tmp/toto/foo", EC_NODE_ENDLIST);
- ret |= EC_TEST_CHECK_COMPLETE(node,
+ testres |= EC_TEST_CHECK_COMPLETE(node,
"/tmp/toto/b", EC_NODE_ENDLIST,
"/tmp/toto/bar", "/tmp/toto/bar2", EC_NODE_ENDLIST);
ec_node_free(node);
- return ret;
+ return testres;
}
/* LCOV_EXCL_STOP */