Changeset cd0dce3 in mainline for uspace/lib

Timestamp:

2026-02-11T23:17:49Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

00d26202

Parents:

f9c30b9a

Message:

Create new directory (Navigator + command line utility).

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (1 diff)
• include/fmgt/newdir.h (added)
• meson.build (modified) (2 diffs)
• private/fsops.h (modified) (1 diff)
• src/copy.c (modified) (1 diff)
• src/fsops.c (modified) (3 diffs)
• src/move.c (modified) (1 diff)
• src/newdir.c (added)
• test/fsops.c (modified) (1 diff)
• test/newdir.c (added)

uspace/lib/fmgt/include/fmgt.h

@@ -45 +45 @@
 #include "fmgt/flist.h"
 #include "fmgt/move.h"
+#include "fmgt/newdir.h"
 #include "fmgt/newfile.h"
 #include "fmgt/verify.h"

uspace/lib/fmgt/meson.build

@@ -33 +33 @@
         'src/fsops.c',
         'src/move.c',
+        'src/newdir.c',
         'src/newfile.c',
         'src/verify.c',
@@ -45 +46 @@
         'test/main.c',
         'test/move.c',
+        'test/newdir.c',
         'test/newfile.c',
         'test/verify.c',

uspace/lib/fmgt/private/fsops.h

@@ -45 +45 @@
 errno_t fmgt_open(fmgt_t *, const char *, int *);
 errno_t fmgt_create_file(fmgt_t *, const char *, int *, fmgt_exists_action_t *);
-errno_t fmgt_create_dir(fmgt_t *, const char *);
+errno_t fmgt_create_dir(fmgt_t *, const char *, bool);
 errno_t fmgt_remove(fmgt_t *, const char *);
 errno_t fmgt_read(fmgt_t *, int, const char *, aoff64_t *, void *, size_t,

uspace/lib/fmgt/src/copy.c

@@ -64 +64 @@
 
         (void)dest;
-        return fmgt_create_dir(fmgt, dest);
+        return fmgt_create_dir(fmgt, dest, false);
 }
 

uspace/lib/fmgt/src/fsops.c

@@ -135 +135 @@
  * @param fmgt File management object
  * @param dname Directory name
- * @return EOK on success or an error code
- */
-errno_t fmgt_create_dir(fmgt_t *fmgt, const char *dname)
+ * @param exclusive If @c true, directory must not exist.
+ * @return EOK on success or an error code
+ */
+errno_t fmgt_create_dir(fmgt_t *fmgt, const char *dname, bool exclusive)
 {
         fmgt_io_error_t err;
@@ -146 +147 @@
                 rc = vfs_link_path(dname, KIND_DIRECTORY, NULL);
 
-                /* It is okay if the directory exists. */
                 if (rc == EOK || rc == EEXIST)
                         break;
@@ -160 +160 @@
         } while (action == fmgt_er_retry);
 
-        if (rc == EEXIST)
+        if (rc == EEXIST && !exclusive)
                 return EOK;
 

uspace/lib/fmgt/src/move.c

@@ -66 +66 @@
 
         (void)dest;
-        return fmgt_create_dir(fmgt, dest);
+        return fmgt_create_dir(fmgt, dest, false);
 }
 

uspace/lib/fmgt/test/fsops.c

@@ -122 +122 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = fmgt_create_dir(fmgt, p);
+        rc = fmgt_create_dir(fmgt, p, true);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);