Changes in uspace/app/bdsh/cmds/modules/cmp/cmp.c [86cf96d:ce04ea44] in mainline

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;
 }