Changeset 58898d1d in mainline for uspace/app/bdsh/cmds/modules/cp/cp.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/cp/cp.c (modified) (3 diffs)

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

@@ -377 +377 @@
         int64_t copied = 0;
         char *buff = NULL;
+        aoff64_t posr = 0, posw = 0;
+        struct stat st;
 
         if (vb)
@@ -392 +394 @@
         }
 
-        total = lseek(fd1, 0, SEEK_END);
-
+        if (fstat(fd1, &st) != EOK) {
+                printf("Unable to fstat %d\n", fd1);
+                close(fd1);
+                close(fd2);
+                return -1;      
+        }
+
+        total = st.size;
         if (vb)
                 printf("%" PRIu64 " bytes to copy\n", total);
-
-        lseek(fd1, 0, SEEK_SET);
 
         if (NULL == (buff = (char *) malloc(blen))) {
@@ -406 +412 @@
         }
 
-        while ((bytes = read(fd1, buff, blen)) > 0) {
-                if ((bytes = write(fd2, buff, bytes)) < 0)
+        while ((bytes = read(fd1, &posr, buff, blen)) > 0) {
+                if ((bytes = write(fd2, &posw, buff, bytes)) < 0)
                         break;
                 copied += bytes;