Changes in uspace/app/sysinst/futil.c [39330200:8e3498b] in mainline

File:

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

uspace/app/sysinst/futil.c

@@ -54 +54 @@
  * @return EOK on success, EIO on I/O error
  */
-errno_t futil_copy_file(const char *srcp, const char *destp)
+int futil_copy_file(const char *srcp, const char *destp)
 {
         int sf, df;
         size_t nr, nw;
-        errno_t rc;
+        int rc;
         aoff64_t posr = 0, posw = 0;
 
         printf("Copy '%s' to '%s'.\n", srcp, destp);
 
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
-                return EIO;
-
-        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
-        if (rc != EOK)
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
+        if (sf < 0)
+                return EIO;
+
+        df = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
+        if (df < 0)
                 return EIO;
 
@@ -87 +87 @@
 
         rc = vfs_put(df);
-        if (rc != EOK)
+        if (rc < 0)
                 return EIO;
 
@@ -104 +104 @@
  * @return EOK on success, ENOMEM if out of memory, EIO on I/O error
  */
-errno_t futil_rcopy_contents(const char *srcdir, const char *destdir)
+int futil_rcopy_contents(const char *srcdir, const char *destdir)
 {
         DIR *dir;
         struct dirent *de;
-        vfs_stat_t s;
+        struct stat s;
         char *srcp, *destp;
-        errno_t rc;
+        int rc;
 
         dir = opendir(srcdir);
@@ -158 +158 @@
  *         I/O error, ENOMEM if out of memory
  */
-errno_t futil_get_file(const char *srcp, void **rdata, size_t *rsize)
+int futil_get_file(const char *srcp, void **rdata, size_t *rsize)
 {
         int sf;
         size_t nr;
-        errno_t rc;
+        int rc;
         size_t fsize;
         char *data;
-        vfs_stat_t st;
-
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
+        struct stat st;
+
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
+        if (sf < 0)
                 return ENOENT;