Changeset 132ab5d1 in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (6 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);
@@ -193 +195 @@
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else
-                fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
+        } else {
+                int rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+                if (rc != EOK) {
+                        fd = -1;
+                }
+        }
         
         if (fd < 0) {
@@ -250 +256 @@
                 }
                 
-                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 +291 @@
                 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);
@@ -321 +328 @@
         console_rows = 0;
         should_quit = false;
+        dash_represents_stdin = false;
         console = console_init(stdin, stdout);
         number = false;
@@ -331 +339 @@
 
         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:sn", long_options, &opt_ind);
                 switch (c) {
                 case 'h':