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

Timestamp:

2017-04-05T18:10:39Z (9 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/cmp/cmp.c (modified) (4 diffs)

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

@@ -28 +28 @@
 
 #include <errno.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <mem.h>
@@ -79 +78 @@
         char buffer[2][CMP_BUFLEN];
         ssize_t offset[2];
+        aoff64_t pos[2] = {};
 
         for (int i = 0; i < 2; i++) {
-                fd[i] = open(fn[i], O_RDONLY);
+                fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
                 if (fd[i] < 0) {
-                        rc = errno;
+                        rc = fd[i];
                         printf("Unable to open %s\n", fn[i]);
                         goto end;
@@ -94 +94 @@
                         ssize_t size;
                         do {
-                                size = read(fd[i], buffer[i] + offset[i],
+                                size = vfs_read(fd[i], &pos[i],
+                                    buffer[i] + offset[i],
                                     CMP_BUFLEN - offset[i]);
                                 if (size < 0) {
-                                        rc = errno;
+                                        rc = size;
                                         printf("Error reading from %s\n",
                                             fn[i]);
@@ -115 +116 @@
 end:
         if (fd[0] >= 0)
-                close(fd[0]);
+                vfs_put(fd[0]);
         if (fd[1] >= 0)
-                close(fd[1]);
+                vfs_put(fd[1]);
         return rc;
 }