Changeset 96ef0d1e in mainline

Timestamp:

2026-03-07T19:50:50Z (8 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

a927af7a

Message:

Rename file (Navigator and command line).

Location:

uspace

Files:

• app/copy/copy.c (modified) (1 diff)
• app/meson.build (modified) (1 diff)
• app/move/move.c (modified) (1 diff)
• app/nav/dlg/copydlg.c (modified) (1 diff)
• app/nav/dlg/movedlg.c (modified) (3 diffs)
• app/nav/dlg/renamedlg.c (added)
• app/nav/dlg/renamedlg.h (added)
• app/nav/menu.c (modified) (4 diffs)
• app/nav/menu.h (modified) (1 diff)
• app/nav/meson.build (modified) (5 diffs)
• app/nav/nav.c (modified) (6 diffs)
• app/nav/rename.c (added)
• app/nav/rename.h (added)
• app/nav/test/dlg/renamedlg.c (added)
• app/nav/types/dlg/renamedlg.h (added)
• app/nav/types/menu.h (modified) (1 diff)
• app/nav/types/rename.h (added)
• app/rename/doc/doxygroups.h (added)
• app/rename/meson.build (added)
• app/rename/rename.c (added)
• lib/fmgt/include/fmgt.h (modified) (1 diff)
• lib/fmgt/include/fmgt/rename.h (added)
• lib/fmgt/include/types/fmgt.h (modified) (1 diff)
• lib/fmgt/meson.build (modified) (2 diffs)
• lib/fmgt/private/fsops.h (modified) (2 diffs)
• lib/fmgt/src/fsops.c (modified) (1 diff)
• lib/fmgt/src/rename.c (added)
• lib/fmgt/test/main.c (modified) (1 diff)
• lib/fmgt/test/rename.c (added)

uspace/app/copy/copy.c

@@ -161 +161 @@
         case fmgt_io_open:
                 fmt = "Error opening %s. (%s)\n";
+                break;
+        case fmgt_io_rename:
+                fmt = "Error renaming %s. (%s)\n";
                 break;
         }

uspace/app/meson.build

@@ -84 +84 @@
         'pkg',
         'redir',
+        'rename',
         'sbi',
         'shutdown',

uspace/app/move/move.c

@@ -161 +161 @@
         case fmgt_io_open:
                 fmt = "Error opening %s. (%s)\n";
+                break;
+        case fmgt_io_rename:
+                fmt = "Error renaming %s. (%s)\n";
                 break;
         }

uspace/app/nav/dlg/copydlg.c

@@ -186 +186 @@
         if (rc != EOK)
                 goto error;
+
+        ui_entry_activate(edest);
+
+        /* Select all */
+        ui_entry_seek_start(edest, false);
+        ui_entry_seek_end(edest, true);
 
         dialog->edest = edest;

uspace/app/nav/dlg/movedlg.c

@@ -89 +89 @@
         ui_resource_t *ui_res;
         fmgt_flist_entry_t *entry;
+        int rv;
         char *tmove = NULL;
         unsigned count;
@@ -129 +130 @@
         if (count == 1) {
                 entry = fmgt_flist_first(flist);
-                rc = asprintf(&tmove, "Move \"%s\" to:",
-                    entry->fname);
-        } else {
-                rc = asprintf(&tmove, "Move %u files/directories to:",
-                    count);
+                rv = asprintf(&tmove, "Move \"%s\" to:", entry->fname);
+                if (rv < 0)
+                        goto error;
+        } else {
+                rv = asprintf(&tmove, "Move %u files/directories to:", count);
+                if (rv < 0)
+                        goto error;
         }
 
@@ -186 +189 @@
         if (rc != EOK)
                 goto error;
+
+        ui_entry_activate(edest);
+
+        /* Select all */
+        ui_entry_seek_start(edest, false);
+        ui_entry_seek_end(edest, true);
 
         dialog->edest = edest;

uspace/app/nav/menu.c

@@ -60 +60 @@
         ui_menu_entry_t *mverify;
         ui_menu_entry_t *mcopy;
+        ui_menu_entry_t *mrename;
         ui_menu_entry_t *mmove;
         ui_menu_entry_t *mdelete;
@@ -90 +91 @@
         ui_menu_entry_set_cb(mnew, nav_menu_file_new_file, (void *) menu);
 
-        rc = ui_menu_entry_create(mfile, "New Di~r~ectory", "Ctrl-N", &mnewdir);
+        rc = ui_menu_entry_create(mfile, "New D~i~rectory", "Ctrl-N", &mnewdir);
         if (rc != EOK)
                 goto error;
@@ -119 +120 @@
 
         ui_menu_entry_set_cb(mcopy, nav_menu_file_copy, (void *) menu);
+
+        rc = ui_menu_entry_create(mfile, "~R~ename", "Ctrl-R", &mrename);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_entry_set_cb(mrename, nav_menu_file_rename, (void *) menu);
 
         rc = ui_menu_entry_create(mfile, "~M~ove", "Ctrl-X", &mmove);
@@ -268 +275 @@
 }
 
+/** File / Rename menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (navigator_t *)
+ */
+void nav_menu_file_rename(ui_menu_entry_t *mentry, void *arg)
+{
+        nav_menu_t *menu = (nav_menu_t *)arg;
+
+        if (menu->cb != NULL && menu->cb->file_rename != NULL)
+                menu->cb->file_rename(menu->cb_arg);
+}
+
 /** File / Move menu entry selected.
  *

uspace/app/nav/menu.h

@@ -52 +52 @@
 extern void nav_menu_file_verify(ui_menu_entry_t *, void *);
 extern void nav_menu_file_copy(ui_menu_entry_t *, void *);
+extern void nav_menu_file_rename(ui_menu_entry_t *, void *);
 extern void nav_menu_file_move(ui_menu_entry_t *, void *);
 extern void nav_menu_file_delete(ui_menu_entry_t *, void *);

uspace/app/nav/meson.build

@@ -37 +37 @@
         'dlg/newfiledlg.c',
         'dlg/progress.c',
+        'dlg/renamedlg.c',
         'dlg/verifydlg.c',
         'copy.c',
@@ -47 +48 @@
         'newfile.c',
         'panel.c',
+        'rename.c',
         'verify.c',
 )
@@ -59 +61 @@
         'dlg/newfiledlg.c',
         'dlg/progress.c',
+        'dlg/renamedlg.c',
         'dlg/verifydlg.c',
         'copy.c',
@@ -68 +71 @@
         'newfile.c',
         'panel.c',
+        'rename.c',
         'verify.c',
         'test/dlg/copydlg.c',
@@ -77 +81 @@
         'test/dlg/newfiledlg.c',
         'test/dlg/progress.c',
+        'test/dlg/renamedlg.c',
         'test/dlg/verifydlg.c',
         'test/main.c',

uspace/app/nav/nav.c

@@ -59 +59 @@
 #include "nav.h"
 #include "panel.h"
+#include "rename.h"
 #include "verify.h"
 
@@ -77 +78 @@
 static void navigator_file_verify(void *);
 static void navigator_file_copy(void *);
+static void navigator_file_rename(void *);
 static void navigator_file_move(void *);
 static void navigator_file_delete(void *);
@@ -88 +90 @@
         .file_verify = navigator_file_verify,
         .file_copy = navigator_file_copy,
+        .file_rename = navigator_file_rename,
         .file_move = navigator_file_move,
         .file_delete = navigator_file_delete,
@@ -179 +182 @@
                         navigator_file_delete((void *)navigator);
                         break;
+                case KC_R:
+                        navigator_file_rename((void *)navigator);
+                        break;
                 case KC_Q:
                         ui_quit(navigator->ui);
@@ -715 +721 @@
         /* flist ownership transferred */
         navigator_delete_dlg(navigator, flist);
+}
+
+/** File / Rename menu entry selected */
+static void navigator_file_rename(void *arg)
+{
+        navigator_t *navigator = (navigator_t *)arg;
+
+        ui_file_list_entry_t *entry;
+        ui_file_list_entry_attr_t attr;
+        panel_t *panel;
+
+        panel = navigator_get_active_panel(navigator);
+        entry = ui_file_list_get_cursor(panel->flist);
+        ui_file_list_entry_get_attr(entry, &attr);
+
+        /* flist ownership transferred */
+        navigator_rename_dlg(navigator, attr.name);
 }
 
@@ -871 +894 @@
                 fmt = "Error deleting %s.";
                 break;
+        case fmgt_io_rename:
+                fmt = "Error renaming %s.";
+                break;
         }
 

uspace/app/nav/types/menu.h

@@ -55 +55 @@
         /** File / Copy */
         void (*file_copy)(void *);
+        /** File / Rename */
+        void (*file_rename)(void *);
         /** File / Move */
         void (*file_move)(void *);

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);