Changes in uspace/app/sysinst/futil.c [f77c1c9:8d2dd7f2] in mainline

File:

• uspace/app/sysinst/futil.c (modified) (5 diffs)

uspace/app/sysinst/futil.c

@@ -57 +57 @@
 {
         int sf, df;
-        size_t nr, nw;
+        ssize_t nr, nw;
         int rc;
         aoff64_t posr = 0, posw = 0;
@@ -63 +63 @@
         printf("Copy '%s' to '%s'.\n", srcp, destp);
 
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
+        if (sf < 0)
                 return EIO;
 
-        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
-        if (rc != EOK)
+        df = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
+        if (df < 0)
                 return EIO;
 
         do {
-                rc = vfs_read(sf, &posr, buf, BUF_SIZE, &nr);
-                if (rc != EOK)
-                        goto error;
+                nr = vfs_read(sf, &posr, buf, BUF_SIZE);
                 if (nr == 0)
                         break;
+                if (nr < 0)
+                        return EIO;
 
-                rc= vfs_write(df, &posw, buf, nr, &nw);
-                if (rc != EOK)
-                        goto error;
-
-        } while (nr == BUF_SIZE);
+                nw = vfs_write(df, &posw, buf, nr);
+                if (nw <= 0)
+                        return EIO;
+        } while (true);
 
         (void) vfs_put(sf);
 
         rc = vfs_put(df);
-        if (rc != EOK)
+        if (rc < 0)
                 return EIO;
 
         return EOK;
-error:
-        vfs_put(sf);
-        vfs_put(df);
-        return rc;
 }
 
@@ -161 +156 @@
 {
         int sf;
-        size_t nr;
-        int rc;
+        ssize_t nr;
         size_t fsize;
         char *data;
         struct stat st;
 
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
+        if (sf < 0)
                 return ENOENT;
 
@@ -174 +168 @@
                 vfs_put(sf);
                 return EIO;
-        }
+        }       
 
         fsize = st.size;
@@ -184 +178 @@
         }
 
-        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
-        if (rc != EOK || nr != fsize) {
+        nr = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize);
+        if (nr != (ssize_t)fsize) {
                 vfs_put(sf);
                 free(data);