/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
+ * 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;