Changeset 96ef0d1e in mainline for uspace/lib

Timestamp:

2026-03-07T19:50:50Z (12 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

01cd15bc

Parents:

a927af7a

Message:

Rename file (Navigator and command line).

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (1 diff)
• include/fmgt/rename.h (added)
• include/types/fmgt.h (modified) (1 diff)
• meson.build (modified) (2 diffs)
• private/fsops.h (modified) (2 diffs)
• src/fsops.c (modified) (1 diff)
• src/rename.c (added)
• test/main.c (modified) (1 diff)
• test/rename.c (added)

uspace/lib/fmgt/include/fmgt.h

@@ -48 +48 @@
 #include "fmgt/newdir.h"
 #include "fmgt/newfile.h"
+#include "fmgt/rename.h"
 #include "fmgt/verify.h"
 #include "fmgt/walk.h"

uspace/lib/fmgt/include/types/fmgt.h

@@ -73 +73 @@
         fmgt_io_create,
         /** Delete */
-        fmgt_io_delete
+        fmgt_io_delete,
+        /** Rename */
+        fmgt_io_rename
 } fmgt_io_op_type_t;
 

uspace/lib/fmgt/meson.build

@@ -36 +36 @@
         'src/newdir.c',
         'src/newfile.c',
+        'src/rename.c',
         'src/verify.c',
         'src/walk.c'
@@ -49 +50 @@
         'test/newdir.c',
         'test/newfile.c',
+        'test/rename.c',
         'test/verify.c',
         'test/walk.c'

uspace/lib/fmgt/private/fsops.h

@@ -38 +38 @@
 #define PRIVATE_FSOPS_H
 
+#include <offset.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -47 +48 @@
 errno_t fmgt_create_dir(fmgt_t *, const char *, bool);
 errno_t fmgt_remove(fmgt_t *, const char *);
+errno_t fmgt_rename_entry(fmgt_t *, const char *, const char *);
 errno_t fmgt_read(fmgt_t *, int, const char *, aoff64_t *, void *, size_t,
     size_t *);

uspace/lib/fmgt/src/fsops.c

@@ -283 +283 @@
 }
 
+/** Rename file or directory.
+ *
+ * @param fmgt File management object
+ * @param old_path Original filesystem path
+ * @param new_name New name (does not need to be a full path)
+ * @return EOK on success or an error code
+ */
+errno_t fmgt_rename_entry(fmgt_t *fmgt, const char *old_path,
+    const char *new_name)
+{
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_rename_path(old_path, new_name);
+
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = old_path;
+                err.optype = fmgt_io_rename;
+                err.rc = rc;
+
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        return rc;
+}
+
 /** @}
  */

uspace/lib/fmgt/test/main.c

@@ -37 +37 @@
 PCUT_IMPORT(move);
 PCUT_IMPORT(newfile);
+PCUT_IMPORT(rename);
 PCUT_IMPORT(verify);
 PCUT_IMPORT(walk);