Changes in uspace/app/bdsh/cmds/modules/cmp/cmp.c [f77c1c9:582a0b8] in mainline

File:

• uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (3 diffs)

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

@@ -72 +72 @@
 static int cmp_files(const char *fn0, const char *fn1)
 {
-        int rc = EOK;
+        int rc = 0;
         const char *fn[2] = {fn0, fn1};
         int fd[2] = {-1, -1};
         char buffer[2][CMP_BUFLEN];
-        size_t offset[2];
+        ssize_t offset[2];
         aoff64_t pos[2] = {};
 
         for (int i = 0; i < 2; i++) {
-                rc = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ, &(fd[i]));
-                if (rc != EOK) {
+                fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
+                if (fd[i] < 0) {
+                        rc = fd[i];
                         printf("Unable to open %s\n", fn[i]);
                         goto end;
@@ -89 +90 @@
         do {
                 for (int i = 0; i < 2; i++) {
-                        rc = vfs_read(fd[i], &pos[i], buffer[i], CMP_BUFLEN,
-                            &offset[i]);
-                        if (rc != EOK) {
-                                printf("Error reading from %s\n",
-                                    fn[i]);
-                                goto end;
-                        }
+                        offset[i] = 0;
+                        ssize_t size;
+                        do {
+                                size = vfs_read(fd[i], &pos[i],
+                                    buffer[i] + offset[i],
+                                    CMP_BUFLEN - offset[i]);
+                                if (size < 0) {
+                                        rc = size;
+                                        printf("Error reading from %s\n",
+                                            fn[i]);
+                                        goto end;
+                                }
+                                offset[i] += size;
+                        } while (size && offset[i] < CMP_BUFLEN);
                 }
 
                 if (offset[0] != offset[1] ||
                     memcmp(buffer[0], buffer[1], offset[0]) != 0) {
-                        printf("Return 1\n");
                         rc = 1;
                         goto end;
@@ -142 +149 @@
 
         rc = cmp_files(argv[optind], argv[optind + 1]);
-        if (rc != EOK)
+        if (rc)
                 return CMD_FAILURE;
         else