Changeset 8e3498b in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2017-12-04T18:44:24Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

File:

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

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

@@ -180 +180 @@
     off64_t head, off64_t tail, bool tail_first)
 {
-        int fd, bytes = 0, count = 0, reads = 0;
+        int fd, count = 0, reads = 0;
+        size_t bytes;
         char *buff = NULL;
-        int i;
+        size_t i;
         size_t offset = 0, copied_bytes = 0;
         off64_t file_size = 0, length = 0;
         aoff64_t pos = 0;
+        int rc;
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
@@ -250 +252 @@
                 }
                 
-                bytes = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read);
+                rc = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read,
+                    &bytes);
                 copied_bytes = 0;
 
-                if (bytes > 0) {
+                if (rc == EOK && bytes > 0) {
                         buff[bytes] = '\0';
                         offset = 0;
@@ -284 +287 @@
                 if (reading_stdin)
                         fflush(stdout);
-        } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
+        } while (rc == EOK && bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
         vfs_put(fd);
-        if (bytes == -1) {
+        if (rc != EOK) {
                 printf("Error reading %s\n", fname);
                 free(buff);