Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <sys/types.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <str.h>
 #include <sort.h>
@@ -185 +183 @@
                 buff[len] = '\0';
 
-                rc = stat(buff, &tosort[nbdirs++].s);
-                if (rc != 0) {
+                rc = vfs_stat_path(buff, &tosort[nbdirs++].s);
+                if (rc != EOK) {
                         printf("ls: skipping bogus node %s\n", buff);
-                        printf("error=%d\n", errno);
+                        printf("error=%d\n", rc);
                         goto out;
                 }
@@ -315 +313 @@
 static unsigned int ls_scope(const char *path, struct dir_elem_t *de)
 {
-        if (stat(path, &de->s) != 0) {
+        if (vfs_stat_path(path, &de->s) != EOK) {
                 cli_error(CL_ENOENT, "%s", path);
                 return LS_BOGUS;
@@ -388 +386 @@
 
         if (argc == 0) {
-                if (getcwd(de.name, PATH_MAX) == NULL) {
+                if (vfs_cwd_get(de.name, PATH_MAX) != EOK) {
                         cli_error(CL_EFAIL, "%s: Failed determining working "
                             "directory", cmdname);