Changeset 6e5562a in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-31T19:57:38Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

80743a1

Parents:

a56cef9

Message:

Introduce vfs_link_path() and replace mkdir() with it

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (3 diffs)

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

@@ -43 +43 @@
 #include <fcntl.h>
 #include <stdio.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -765 +764 @@
 }
 
-/** Create directory.
+int vfs_link(int parent, const char *child, vfs_file_kind_t kind)
+{
+        int flags = (kind == KIND_DIRECTORY) ? WALK_DIRECTORY : WALK_REGULAR;
+        int file = _vfs_walk(parent, child, WALK_MUST_CREATE | flags);
+
+        if (file < 0)
+                return file;
+
+        close(file);
+
+        return EOK;
+}
+
+/** Link a file or directory.
  *
  * @param path Path
- * @param mode File mode
- * @return 0 on success. On error returns -1 and sets errno.
- */
-int mkdir(const char *path, mode_t mode)
-{
-        int fd = vfs_lookup(path, WALK_MUST_CREATE | WALK_DIRECTORY);
-        if (fd < 0) {
-                errno = fd;
-                return -1;
-        }
-        
-        return close(fd);
-}
+ * @param kind Kind of the file to be created.
+ * @return EOK on success or a negative error code otherwise
+ */
+int vfs_link_path(const char *path, vfs_file_kind_t kind)
+{
+        size_t pa_size;
+        char *pa = vfs_absolutize(path, &pa_size);
+        if (!pa)
+                return ENOMEM;
+
+        int parent;
+        char *slash = str_rchr(pa, L'/');
+        if (slash != pa) {
+                *slash = '\0';
+                parent = vfs_lookup(pa, WALK_DIRECTORY);
+                *slash = '/';
+        } else {
+                parent = vfs_root();
+        }
+
+        if (parent < 0) {
+                free(pa);
+                return parent;
+        }
+
+        int rc = vfs_link(parent, slash, kind);
+
+        free(pa);
+        close(parent);
+        return rc;
+}       
 
 int vfs_unlink(int parent, const char *child, int expect)
@@ -802 +832 @@
 }
 
-/** Unlink file or directory.
+/** Unlink a file or directory.
  *
  * @param path Path
- * @return EOk on success or a negative error code otherwise
+ * @return EOK on success or a negative error code otherwise
  */
 int vfs_unlink_path(const char *path)