Changeset 2b3dd78 in mainline for uspace/app/bdsh/compl.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

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

uspace/app/bdsh/compl.c

@@ -34 +34 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
+#include <str.h>
 
 #include "cmds/cmds.h"
@@ -68 +69 @@
 
         /** Pointer inside list of directories */
-        const char **path;
+        const char *const *path;
         /** If not @c NULL, should be freed in the end. */
-        const char **path_list;
+        char **path_list;
         /** Current open directory */
         DIR *dir;
@@ -218 +219 @@
                 cs->path_list[0] = dirname;
                 cs->path_list[1] = NULL;
-                cs->path = cs->path_list;
+                /* 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;
 
         } else if (cs->is_command) {
@@ -359 +362 @@
                                 char *ent_path;
                                 asprintf(&ent_path, "%s/%s", *cs->path, dent->d_name);
-                                struct stat ent_stat;
+                                vfs_stat_t ent_stat;
                                 if (vfs_stat_path(ent_path, &ent_stat) != EOK) {
                                         /* Error */