Changeset 58898d1d in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2017-03-24T20:31:54Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

File:

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

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

@@ -31 +31 @@
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include <getopt.h>
 #include <str.h>
@@ -187 +188 @@
         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);
@@ -205 +207 @@
                 close(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 (fstat(fd, &st) != EOK) {
+                        close(fd);
+                        free(buff);
+                        printf("Unable to fstat %d\n", fd);
+                        return 1;
+                }
+                file_size = st.size;
                 if (head == CAT_FULL_FILE) {
                         head = file_size;
@@ -223 +233 @@
 
                 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 +253 @@
                 }
                 
-                bytes = read(fd, buff + copied_bytes, bytes_to_read);
+                bytes = read(fd, &pos, buff + copied_bytes, bytes_to_read);
                 copied_bytes = 0;