Changeset 368ee04 in mainline for uspace/app/sysinst/futil.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

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

uspace/app/sysinst/futil.c

@@ -35 +35 @@
 #include <dirent.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
+#include <vfs/vfs.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -60 +59 @@
         ssize_t nr, nw;
         int rc;
+        aoff64_t posr = 0, posw = 0;
 
         printf("Copy '%s' to '%s'.\n", srcp, destp);
 
-        sf = open(srcp, O_RDONLY);
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
         if (sf < 0)
                 return EIO;
 
-        df = open(destp, O_CREAT | O_WRONLY, 0);
+        df = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
         if (df < 0)
                 return EIO;
 
         do {
-                nr = read(sf, buf, BUF_SIZE);
+                nr = vfs_read(sf, &posr, buf, BUF_SIZE);
                 if (nr == 0)
                         break;
@@ -78 +78 @@
                         return EIO;
 
-                nw = write(df, buf, nr);
+                nw = vfs_write(df, &posw, buf, nr);
                 if (nw <= 0)
                         return EIO;
         } while (true);
 
-        (void) close(sf);
+        (void) vfs_put(sf);
 
-        rc = close(df);
+        rc = vfs_put(df);
         if (rc < 0)
                 return EIO;
@@ -118 +118 @@
                         return ENOMEM;
 
-                rc = stat(srcp, &s);
+                rc = vfs_stat_path(srcp, &s);
                 if (rc != EOK)
                         return EIO;
@@ -128 +128 @@
                 } else if (s.is_directory) {
                         printf("Create directory '%s'\n", destp);
-                        rc = mkdir(destp, 0);
+                        rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
                         if (rc != EOK)
                                 return EIO;
@@ -157 +157 @@
         int sf;
         ssize_t nr;
-        off64_t off;
         size_t fsize;
         char *data;
+        struct stat st;
 
-        sf = open(srcp, O_RDONLY);
+        sf = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ);
         if (sf < 0)
                 return ENOENT;
 
-        off = lseek(sf, 0, SEEK_END);
-        if (off == (off64_t)-1)
+        if (vfs_stat(sf, &st) != EOK) {
+                vfs_put(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) {
+                vfs_put(sf);
                 return ENOMEM;
+        }
 
-        nr = read(sf, data, fsize);
-        if (nr != (ssize_t)fsize)
+        nr = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize);
+        if (nr != (ssize_t)fsize) {
+                vfs_put(sf);
+                free(data);
                 return EIO;
+        }
 
-        (void) close(sf);
+        (void) vfs_put(sf);
         *rdata = data;
         *rsize = fsize;