Changeset a6fc88a in mainline

Timestamp:

2017-04-03T21:15:17Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8fe46a0

Parents:

ea4a3f0

Message:

Let vfs_link() and vfs_link_path() return the linked file handle

Add an output argument to both vfs_link() and vfs_link_path() so that the
client may receive the file handle of the linked file or directory. This
makes it easy to work with the new file or directory as it is ready to be
opened or in case of a directory to use it as a parent for further
operations without the need for additional vfs_lookup().

Location:

uspace

Files:

• app/bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• app/bdsh/cmds/modules/mkdir/mkdir.c (modified) (3 diffs)
• app/sysinst/futil.c (modified) (1 diff)
• app/sysinst/sysinst.c (modified) (2 diffs)
• app/tester/vfs/vfs1.c (modified) (1 diff)
• app/untar/main.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (4 diffs)
• lib/c/include/vfs/vfs.h (modified) (1 diff)
• lib/posix/source/sys/stat.c (modified) (1 diff)

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

@@ -294 +294 @@
                                 merge_paths(dest_path, PATH_MAX, src_dirname);
 
-                                if (vfs_link_path(dest_path, KIND_DIRECTORY) != EOK) {
+                                if (vfs_link_path(dest_path, KIND_DIRECTORY,
+                                    NULL) != EOK) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -308 +309 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (vfs_link_path(dest_path, KIND_DIRECTORY) != EOK) {
+                        if (vfs_link_path(dest_path, KIND_DIRECTORY,
+                            NULL) != EOK) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);

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

@@ -96 +96 @@
 
         if (!create_parents) {
-                ret = vfs_link_path(path, KIND_DIRECTORY);
+                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
                 if (ret != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
@@ -135 +135 @@
                         path[prev_off] = 0;
 
-                        ret = vfs_link_path(path, KIND_DIRECTORY);
+                        ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
                         if (ret != EOK && ret != EEXIST) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
@@ -146 +146 @@
                 }
                 /* Create the final directory. */
-                ret = vfs_link_path(path, KIND_DIRECTORY);
+                ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
                 if (ret != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",

uspace/app/sysinst/futil.c

@@ -128 +128 @@
                 } else if (s.is_directory) {
                         printf("Create directory '%s'\n", destp);
-                        rc = vfs_link_path(destp, KIND_DIRECTORY);
+                        rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
                         if (rc != EOK)
                                 return EIO;

uspace/app/sysinst/sysinst.c

@@ -174 +174 @@
                 return EIO;
 
-        rc = vfs_link_path(MOUNT_POINT, KIND_DIRECTORY);
+        rc = vfs_link_path(MOUNT_POINT, KIND_DIRECTORY, NULL);
         if (rc != EOK)
                 return rc;
@@ -213 +213 @@
 
         printf("sysinst_copy_boot_files(): create CD mount point\n");
-        rc = vfs_link_path(CD_MOUNT_POINT, KIND_DIRECTORY);
+        rc = vfs_link_path(CD_MOUNT_POINT, KIND_DIRECTORY, NULL);
         if (rc != EOK)
                 return rc;

uspace/app/tester/vfs/vfs1.c

@@ -71 +71 @@
         int rc;
 
-        rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY);
+        rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);
         if (rc != EOK) {
                 TPRINTF("rc=%d\n", rc);

uspace/app/untar/main.c

@@ -105 +105 @@
         int rc;
 
-        rc = vfs_link_path(header->filename, KIND_DIRECTORY);
+        rc = vfs_link_path(header->filename, KIND_DIRECTORY, NULL);
         if (rc != EOK) {
                 if (rc != EEXIST) {

uspace/lib/c/generic/vfs/vfs.c

@@ -359 +359 @@
  * @param kind          Kind of the object to be created: KIND_FILE or
  *                      KIND_DIRECTORY
+ * @param[out] linkedfd If not NULL, will receive a file handle to the linked
+ *                      child
  * @return              EOK on success or a negative error code
  */
-int vfs_link(int parent, const char *child, vfs_file_kind_t kind)
+int vfs_link(int parent, const char *child, vfs_file_kind_t kind, int *linkedfd)
 {
         int flags = (kind == KIND_DIRECTORY) ? WALK_DIRECTORY : WALK_REGULAR;
@@ -369 +371 @@
                 return file;
 
-        vfs_put(file);
+        if (linkedfd)
+                *linkedfd = file;
+        else
+                vfs_put(file);
 
         return EOK;
@@ -384 +389 @@
  * @param kind          Kind of the object to be created: KIND_FILE or
  *                      KIND_DIRECTORY
+ * @param[out] linkedfd If not NULL, will receive a file handle to the linked
+ *                      child
  * @return              EOK on success or a negative error code
  */
-int vfs_link_path(const char *path, vfs_file_kind_t kind)
+int vfs_link_path(const char *path, vfs_file_kind_t kind, int *linkedfd)
 {
         char *child;
@@ -393 +400 @@
                 return parent;
 
-        int rc = vfs_link(parent, child, kind);
+        int rc = vfs_link(parent, child, kind, linkedfd);
 
         free(child);

uspace/lib/c/include/vfs/vfs.h

@@ -81 +81 @@
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);
-extern int vfs_link(int, const char *, vfs_file_kind_t);
-extern int vfs_link_path(const char *, vfs_file_kind_t);
+extern int vfs_link(int, const char *, vfs_file_kind_t, int *);
+extern int vfs_link_path(const char *, vfs_file_kind_t, int *);
 extern int vfs_lookup(const char *, int);
 extern int vfs_lookup_open(const char *, int, int);

uspace/lib/posix/source/sys/stat.c

@@ -152 +152 @@
 int posix_mkdir(const char *path, mode_t mode)
 {
-        int rc = rcerrno(vfs_link_path, path, KIND_DIRECTORY);
+        int rc = rcerrno(vfs_link_path, path, KIND_DIRECTORY, NULL);
         if (rc != EOK)
                 return -1;