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

Timestamp:

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

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

@@ -33 +33 @@
 #include <getopt.h>
 #include <str.h>
-#include <fcntl.h>
 #include <io/console.h>
 #include <io/color.h>
@@ -187 +186 @@
         size_t offset = 0, copied_bytes = 0;
         off64_t file_size = 0, length = 0;
+        aoff64_t pos = 0;
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
@@ -195 +195 @@
                 blen = STR_BOUNDS(1);
         } else
-                fd = open(fname, O_RDONLY);
+                fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
         
         if (fd < 0) {
@@ -203 +203 @@
 
         if (NULL == (buff = (char *) malloc(blen + 1))) {
-                close(fd);
+                vfs_put(fd);
                 printf("Unable to allocate enough memory to read %s\n",
-                        fname);
+                    fname);
                 return 1;
         }
 
         if (tail != CAT_FULL_FILE) {
-                file_size = lseek(fd, 0, SEEK_END);
+                struct stat st;
+
+                if (vfs_stat(fd, &st) != EOK) {
+                        vfs_put(fd);
+                        free(buff);
+                        printf("Unable to vfs_stat %d\n", fd);
+                        return 1;
+                }
+                file_size = st.size;
                 if (head == CAT_FULL_FILE) {
                         head = file_size;
@@ -223 +231 @@
 
                 if (tail_first) {
-                        lseek(fd, (tail >= file_size) ? 0 : (file_size - tail), SEEK_SET);
+                        pos = (tail >= file_size) ? 0 : (file_size - tail);
                 } else {
-                        lseek(fd, ((head - tail) >= file_size) ? 0 : (head - tail), SEEK_SET);
+                        pos = ((head - tail) >= file_size) ? 0 : (head - tail);
                 }
         } else
@@ -243 +251 @@
                 }
                 
-                bytes = read(fd, buff + copied_bytes, bytes_to_read);
+                bytes = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read);
                 copied_bytes = 0;
 
@@ -279 +287 @@
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
-        close(fd);
+        vfs_put(fd);
         if (bytes == -1) {
                 printf("Error reading %s\n", fname);