Changeset 58898d1d in mainline for uspace/app/sysinst/futil.c

Timestamp:

2017-03-24T20:31:54Z (7 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/sysinst/futil.c (modified) (5 diffs)

uspace/app/sysinst/futil.c

@@ -60 +60 @@
         ssize_t nr, nw;
         int rc;
+        aoff64_t posr = 0, posw = 0;
 
         printf("Copy '%s' to '%s'.\n", srcp, destp);
@@ -72 +73 @@
 
         do {
-                nr = read(sf, buf, BUF_SIZE);
+                nr = read(sf, &posr, buf, BUF_SIZE);
                 if (nr == 0)
                         break;
@@ -78 +79 @@
                         return EIO;
 
-                nw = write(df, buf, nr);
+                nw = write(df, &posw, buf, nr);
                 if (nw <= 0)
                         return EIO;
@@ -157 +158 @@
         int sf;
         ssize_t nr;
-        off64_t off;
         size_t fsize;
         char *data;
+        struct stat st;
 
         sf = open(srcp, O_RDONLY);
@@ -165 +166 @@
                 return ENOENT;
 
-        off = lseek(sf, 0, SEEK_END);
-        if (off == (off64_t)-1)
+        if (fstat(sf, &st) != EOK) {
+                close(sf);
                 return EIO;
+        }       
 
-        fsize = (size_t)off;
-
-        off = lseek(sf, 0, SEEK_SET);
-        if (off == (off64_t)-1)
-                return EIO;
+        fsize = st.size;
 
         data = calloc(fsize, 1);
-        if (data == NULL)
+        if (data == NULL) {
+                close(sf);
                 return ENOMEM;
+        }
 
-        nr = read(sf, data, fsize);
-        if (nr != (ssize_t)fsize)
+        nr = read(sf, (aoff64_t []) { 0 }, data, fsize);
+        if (nr != (ssize_t)fsize) {
+                close(sf);
+                free(data);
                 return EIO;
+        }
 
         (void) close(sf);