Changes in uspace/app/bdsh/compl.c [33b8d024:23a0368] in mainline

File:

• uspace/app/bdsh/compl.c (modified) (8 diffs)

uspace/app/bdsh/compl.c

@@ -34 +34 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
-#include <str.h>
 
 #include "cmds/cmds.h"
@@ -41 +40 @@
 #include "tok.h"
 
-static errno_t compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state);
-static errno_t compl_get_next(void *state, char **compl);
+static int compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state);
+static int compl_get_next(void *state, char **compl);
 static void compl_fini(void *state);
 
@@ -69 +68 @@
 
         /** Pointer inside list of directories */
-        const char *const *path;
+        const char **path;
         /** If not @c NULL, should be freed in the end. */
-        char **path_list;
+        const char **path_list;
         /** Current open directory */
         DIR *dir;
@@ -88 +87 @@
  * Set up iterators in completion object, based on current token.
  */
-static errno_t compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state)
+static int compl_init(wchar_t *text, size_t pos, size_t *cstart, void **state)
 {
         compl_t *cs = NULL;
@@ -94 +93 @@
         char *prefix = NULL;
         char *dirname = NULL;
-        errno_t retval;
+        int retval;
         
         token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
@@ -219 +218 @@
                 cs->path_list[0] = dirname;
                 cs->path_list[1] = NULL;
-                /* The second const ensures that we can't assign a const
-                 * string to the non-const array. */
-                cs->path = (const char *const *) cs->path_list;
+                cs->path = cs->path_list;
 
         } else if (cs->is_command) {
@@ -291 +288 @@
 
 /** Get next match. */
-static errno_t compl_get_next(void *state, char **compl)
+static int compl_get_next(void *state, char **compl)
 {
         compl_t *cs = (compl_t *) state;
@@ -362 +359 @@
                                 char *ent_path;
                                 asprintf(&ent_path, "%s/%s", *cs->path, dent->d_name);
-                                vfs_stat_t ent_stat;
+                                struct stat ent_stat;
                                 if (vfs_stat_path(ent_path, &ent_stat) != EOK) {
                                         /* Error */