Changeset 0ce9eb8 in mainline

Timestamp:

2026-02-10T12:52:07Z (20 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

857fba8

Parents:

26a9388

git-author:

Jiri Svoboda <jiri@…> (2026-02-10 18:51:59)

git-committer:

Jiri Svoboda <jiri@…> (2026-02-10 12:52:07)

Message:

Ask user what to do if destination file exists while copying.

Location:

uspace

Files:

• app/copy/copy.c (modified) (5 diffs)
• app/nav/copy.c (modified) (2 diffs)
• app/nav/dlg/existsdlg.c (added)
• app/nav/dlg/existsdlg.h (added)
• app/nav/dlg/ioerrdlg.c (modified) (7 diffs)
• app/nav/meson.build (modified) (4 diffs)
• app/nav/nav.c (modified) (5 diffs)
• app/nav/nav.h (modified) (2 diffs)
• app/nav/test/dlg/existsdlg.c (added)
• app/nav/test/main.c (modified) (2 diffs)
• app/nav/types/dlg/existsdlg.h (added)
• app/nav/types/nav.h (modified) (2 diffs)
• lib/fmgt/include/types/fmgt.h (modified) (2 diffs)
• lib/fmgt/private/fmgt.h (modified) (2 diffs)
• lib/fmgt/src/copy.c (modified) (8 diffs)
• lib/fmgt/src/fmgt.c (modified) (2 diffs)
• lib/ui/src/promptdialog.c (modified) (2 diffs)

uspace/app/copy/copy.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 static void copy_progress(void *, fmgt_progress_t *);
 static fmgt_error_action_t copy_io_error_query(void *, fmgt_io_error_t *);
+static fmgt_exists_action_t copy_exists_query(void *, fmgt_exists_t *);
 
 static bool prog_upd = false;
@@ -59 +60 @@
         .abort_query = copy_abort_query,
         .io_error_query = copy_io_error_query,
+        .exists_query = copy_exists_query,
         .progress = copy_progress,
 };
@@ -188 +190 @@
                                 if (ev->key == KC_C)
                                         return fmgt_er_abort;
+                        }
+                }
+        }
+}
+
+/** Called by fmgt to let user choose destination exists recovery action.
+ *
+ * @param arg Argument (not used)
+ * @param err I/O error report
+ * @return Error recovery action.
+ */
+static fmgt_exists_action_t copy_exists_query(void *arg, fmgt_exists_t *exists)
+{
+        cons_event_t event;
+        kbd_event_t *ev;
+        errno_t rc;
+
+        (void)arg;
+
+        if (nonint)
+                return fmgt_exr_abort;
+
+        if (prog_upd)
+                putchar('\n');
+
+        fprintf(stderr, "File %s exists.\n", exists->fname);
+        fprintf(stderr, "[O]verwrite, [S]kip or [A]bort?\n");
+
+        if (con == NULL)
+                return fmgt_exr_abort;
+
+        while (true) {
+                rc = console_get_event(con, &event);
+                if (rc != EOK)
+                        return fmgt_exr_abort;
+
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                        ev = &event.ev.key;
+                        if ((ev->mods & KM_ALT) == 0 &&
+                            (ev->mods & KM_CTRL) == 0) {
+                                if (ev->c == 'o' || ev->c == 'O')
+                                        return fmgt_exr_overwrite;
+                                if (ev->c == 's' || ev->c == 'S')
+                                        return fmgt_exr_skip;
+                                if (ev->c == 'a' || ev->c == 'A')
+                                        return fmgt_exr_abort;
+                        }
+                }
+
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                        ev = &event.ev.key;
+                        if ((ev->mods & KM_ALT) == 0 &&
+                            (ev->mods & KM_SHIFT) == 0 &&
+                            (ev->mods & KM_CTRL) != 0) {
+                                if (ev->key == KC_C)
+                                        return fmgt_exr_abort;
                         }
                 }
@@ -256 +314 @@
                 putchar('\n');
         if (rc != EOK) {
-                printf("Error creating file: %s.\n", str_error(rc));
+                printf("Error copying file(s): %s.\n", str_error(rc));
                 goto error;
         }

uspace/app/nav/copy.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -69 +69 @@
         .abort_query = copy_abort_query,
         .io_error_query = navigator_io_error_query,
+        .exists_query = navigator_exists_query,
         .progress = copy_progress,
 };

uspace/app/nav/dlg/ioerrdlg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -272 +272 @@
 }
 
-/** Destroy prompt dialog.
- *
- * @param dialog Prompt dialog or @c NULL
+/** Destroy I/O error dialog.
+ *
+ * @param dialog I/O error dialog or @c NULL
  */
 void io_err_dlg_destroy(io_err_dlg_t *dialog)
@@ -285 +285 @@
 }
 
-/** Set mesage dialog callback.
- *
- * @param dialog Prompt dialog
- * @param cb Prompt dialog callbacks
+/** Set I/O error dialog callback.
+ *
+ * @param dialog I/O error dialog
+ * @param cb I/O error dialog callbacks
  * @param arg Callback argument
  */
@@ -298 +298 @@
 }
 
-/** Prompt dialog window close handler.
+/** I/O error dialog window close handler.
  *
  * @param window Window
@@ -313 +313 @@
 }
 
-/** Prompt dialog window keyboard event handler.
+/** I/O error dialog window keyboard event handler.
  *
  * @param window Window
@@ -344 +344 @@
 }
 
-/** Prompt dialog OK button click handler.
+/** I/O error dialog abort button click handler.
  *
  * @param pbutton Push button
@@ -358 +358 @@
 }
 
-/** Prompt dialog cancel button click handler.
+/** I/O error dialog retry button click handler.
  *
  * @param pbutton Push button

uspace/app/nav/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2025 Jiri Svoboda
+# Copyright (c) 2026 Jiri Svoboda
 # All rights reserved.
 #
@@ -30 +30 @@
 src = files(
         'dlg/copydlg.c',
+        'dlg/existsdlg.c',
         'dlg/ioerrdlg.c',
         'dlg/newfiledlg.c',
@@ -45 +46 @@
 test_src = files(
         'dlg/copydlg.c',
+        'dlg/existsdlg.c',
         'dlg/ioerrdlg.c',
         'dlg/newfiledlg.c',
@@ -56 +58 @@
         'verify.c',
         'test/dlg/copydlg.c',
+        'test/dlg/existsdlg.c',
         'test/dlg/ioerrdlg.c',
         'test/dlg/newfiledlg.c',

uspace/app/nav/nav.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 #include <ui/window.h>
 #include "copy.h"
+#include "dlg/existsdlg.h"
 #include "dlg/ioerrdlg.h"
 #include "menu.h"
@@ -106 +107 @@
         .bretry = navigator_io_err_retry,
         .close = navigator_io_err_close
+};
+
+static void navigator_exists_overwrite(exists_dlg_t *, void *);
+static void navigator_exists_skip(exists_dlg_t *, void *);
+static void navigator_exists_abort(exists_dlg_t *, void *);
+static void navigator_exists_close(exists_dlg_t *, void *);
+
+static exists_dlg_cb_t navigator_exists_dlg_cb = {
+        .boverwrite = navigator_exists_overwrite,
+        .bskip = navigator_exists_skip,
+        .babort = navigator_exists_abort,
+        .close = navigator_exists_close
 };
 
@@ -273 +286 @@
         navigator->io_err_act_sel = false;
 
+        fibril_mutex_initialize(&navigator->exists_act_lock);
+        fibril_condvar_initialize(&navigator->exists_act_cv);
+        navigator->exists_act_sel = false;
+
         *rnavigator = navigator;
         return EOK;
@@ -857 +874 @@
 }
 
+/** Called by fmgt to query for file/directory exists recovery action.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param exists File/directory exists report
+ * @return Recovery action to take.
+ */
+fmgt_exists_action_t navigator_exists_query(void *arg, fmgt_exists_t *exists)
+{
+        navigator_t *nav = (navigator_t *)arg;
+        exists_dlg_t *dlg;
+        exists_dlg_params_t params;
+        fmgt_exists_action_t exists_act;
+        char *text1;
+        errno_t rc;
+        int rv;
+
+        exists_dlg_params_init(&params);
+        rv = asprintf(&text1, "File %s exists.", exists->fname);
+        if (rv < 0)
+                return fmgt_exr_abort;
+
+        params.text1 = text1;
+
+        ui_lock(nav->ui);
+        rc = exists_dlg_create(nav->ui, &params, &dlg);
+        if (rc != EOK) {
+                ui_unlock(nav->ui);
+                free(text1);
+                return fmgt_exr_abort;
+        }
+
+        exists_dlg_set_cb(dlg, &navigator_exists_dlg_cb, (void *)nav);
+
+        ui_unlock(nav->ui);
+        free(text1);
+
+        fibril_mutex_lock(&nav->exists_act_lock);
+
+        while (!nav->exists_act_sel) {
+                fibril_condvar_wait(&nav->exists_act_cv,
+                    &nav->exists_act_lock);
+        }
+
+        exists_act = nav->exists_act;
+        nav->exists_act_sel = false;
+        fibril_mutex_unlock(&nav->exists_act_lock);
+
+        return exists_act;
+}
+
+/** File/directory exists dialog overwrite button was pressed.
+ *
+ * @param dlg File/directory exists dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_exists_overwrite(exists_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        exists_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->exists_act_lock);
+        nav->exists_act = fmgt_exr_overwrite;
+        nav->exists_act_sel = true;
+        fibril_condvar_signal(&nav->exists_act_cv);
+        fibril_mutex_unlock(&nav->exists_act_lock);
+}
+
+/** File/directory exists dialog skip button was pressed.
+ *
+ * @param dlg File/directory exists dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_exists_skip(exists_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        exists_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->exists_act_lock);
+        nav->exists_act = fmgt_exr_skip;
+        nav->exists_act_sel = true;
+        fibril_condvar_signal(&nav->exists_act_cv);
+        fibril_mutex_unlock(&nav->exists_act_lock);
+}
+
+/** File/directory exists dialog abort button was pressed.
+ *
+ * @param dlg File/directory exists dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_exists_abort(exists_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        exists_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->exists_act_lock);
+        nav->exists_act = fmgt_exr_abort;
+        nav->exists_act_sel = true;
+        fibril_condvar_signal(&nav->exists_act_cv);
+        fibril_mutex_unlock(&nav->exists_act_lock);
+}
+
+/** File/directory exists dialog closure requested.
+ *
+ * @param dlg File/directory exists dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_exists_close(exists_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        exists_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->exists_act_lock);
+        nav->exists_act = fmgt_exr_abort;
+        nav->exists_act_sel = true;
+        fibril_condvar_signal(&nav->exists_act_cv);
+        fibril_mutex_unlock(&nav->exists_act_lock);
+}
+
 /** @}
  */

uspace/app/nav/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -55 +55 @@
     void *);
 extern fmgt_error_action_t navigator_io_error_query(void *, fmgt_io_error_t *);
+extern fmgt_exists_action_t navigator_exists_query(void *, fmgt_exists_t *);
 
 #endif

uspace/app/nav/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +32 @@
 
 PCUT_IMPORT(copydlg);
+PCUT_IMPORT(existsdlg);
 PCUT_IMPORT(ioerrdlg);
 PCUT_IMPORT(newfiledlg);

uspace/app/nav/types/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -75 +75 @@
         /** Synchronizes access to I/O error recovery action */
         fibril_mutex_t io_err_act_lock;
+
+        /** @c true if user selected file/dir exists recovery action */
+        bool exists_act_sel;
+        /** Selected file/directory exists recovery action */
+        fmgt_exists_action_t exists_act;
+        /** Signalled when user selects file/directory exists recovery action */
+        fibril_condvar_t exists_act_cv;
+        /** Synchronizes access to file/directory exists recovery action */
+        fibril_mutex_t exists_act_lock;
 } navigator_t;
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -90 +90 @@
 } fmgt_error_action_t;
 
+/** File management file/directory exists report */
+typedef struct {
+        /** File name */
+        const char *fname;
+} fmgt_exists_t;
+
+/** File management file/directory exists recovery action */
+typedef enum {
+        /** Overwrite */
+        fmgt_exr_overwrite,
+        /** Skip */
+        fmgt_exr_skip,
+        /** Abort */
+        fmgt_exr_abort
+} fmgt_exists_action_t;
+
 /** File management callbacks */
 typedef struct {
         bool (*abort_query)(void *);
         fmgt_error_action_t (*io_error_query)(void *, fmgt_io_error_t *);
+        fmgt_exists_action_t (*exists_query)(void *, fmgt_exists_t *);
         void (*progress)(void *, fmgt_progress_t *);
 } fmgt_cb_t;

uspace/lib/fmgt/private/fmgt.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 extern bool fmgt_abort_query(fmgt_t *);
 extern fmgt_error_action_t fmgt_io_error_query(fmgt_t *, fmgt_io_error_t *);
+extern fmgt_exists_action_t fmgt_exists_query(fmgt_t *, fmgt_exists_t *);
 extern void fmgt_progress_init(fmgt_t *);
 extern void fmgt_progress_init_file(fmgt_t *, const char *);

uspace/lib/fmgt/src/copy.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 };
 
+/** Open file.
+ *
+ * @param fmgt File management object
+ * @param fname File name
+ * @param rfd Place to store file descriptor
+ * @return EOK on success or an error code
+ */
+static errno_t fmgt_open(fmgt_t *fmgt, const char *fname, int *rfd)
+{
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, rfd);
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = fname;
+                err.optype = fmgt_io_open;
+                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;
+}
+
+/** Create file.
+ *
+ * @param fmgt File management object
+ * @param fname Destination file name
+ * @param rfd Place to store file descriptor
+ * @param rskip If @c true, skip existing file and continue
+ * @return EOK on success or an error code
+ */
+static errno_t fmgt_create_file(fmgt_t *fmgt, const char *fname, int *rfd,
+    bool *rskip)
+{
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        fmgt_exists_t exists;
+        fmgt_exists_action_t exaction;
+        bool may_overwrite = false;
+        unsigned flags;
+        errno_t rc;
+
+        *rskip = false;
+
+        do {
+                flags = WALK_REGULAR | (may_overwrite ? WALK_MAY_CREATE :
+                    WALK_MUST_CREATE);
+                rc = vfs_lookup_open(fname, flags, MODE_WRITE, rfd);
+                if (rc == EOK)
+                        break;
+
+                if (rc == EEXIST) {
+                        /* File exists */
+                        exists.fname = fname;
+                        fmgt_timer_stop(fmgt);
+                        exaction = fmgt_exists_query(fmgt, &exists);
+                        fmgt_timer_start(fmgt);
+
+                        if (exaction == fmgt_exr_skip)
+                                *rskip = true;
+                        if (exaction != fmgt_exr_overwrite)
+                                break;
+
+                        may_overwrite = true;
+                } else {
+                        /* I/O error */
+                        err.fname = fname;
+                        err.optype = fmgt_io_create;
+                        err.rc = rc;
+                        fmgt_timer_stop(fmgt);
+                        action = fmgt_io_error_query(fmgt, &err);
+                        fmgt_timer_start(fmgt);
+
+                        if (action != fmgt_er_retry)
+                                break;
+                }
+        } while (true);
+
+        return rc;
+}
+
+/** Create directory.
+ *
+ * @param fmgt File management object
+ * @param dname Directory name
+ * @return EOK on success or an error code
+ */
+static errno_t fmgt_create_dir(fmgt_t *fmgt, const char *dname)
+{
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_link_path(dname, KIND_DIRECTORY, NULL);
+
+                /* It is okay if the directory exists. */
+                if (rc == EOK || rc == EEXIST)
+                        break;
+
+                /* I/O error */
+                err.fname = dname;
+                err.optype = fmgt_io_create;
+                err.rc = rc;
+
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        if (rc == EEXIST)
+                return EOK;
+
+        return rc;
+}
+
+/** Read data from file.
+ *
+ * @param fmgt File management object
+ * @param fd File descriptor
+ * @param fname File name (for printing diagnostics)
+ * @param pos Pointer to current position (will be updated)
+ * @param buffer Data buffer
+ * @param nbytes Number of bytes to read
+ * @param nr Place to store number of bytes read
+ * @return EOK on success or an error code
+ */
+static errno_t fmgt_read(fmgt_t *fmgt, int fd, const char *fname,
+    aoff64_t *pos, void *buffer, size_t nbytes, size_t *nr)
+{
+        char *bp = (char *)buffer;
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_read(fd, pos, bp, nbytes, nr);
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = fname;
+                err.optype = fmgt_io_read;
+                err.rc = rc;
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        /* Not recovered? */
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Write data to file.
+ *
+ * @param fmgt File management object
+ * @param fd File descriptor
+ * @param fname File name (for printing diagnostics)
+ * @param pos Pointer to current position (will be updated)
+ * @param buffer Pointer to data
+ * @param nbytes Number of bytes to write
+ * @return EOK on success or an error code
+ */
 static errno_t fmgt_write(fmgt_t *fmgt, int fd, const char *fname,
     aoff64_t *pos, void *buffer, size_t nbytes)
@@ -97 +270 @@
 {
         fmgt_t *fmgt = (fmgt_t *)arg;
-        fmgt_io_error_t err;
-        fmgt_error_action_t action;
-        errno_t rc;
-
-        do {
-                rc = vfs_link_path(dest, KIND_DIRECTORY, NULL);
-
-                /* It is okay if the directory exists. */
-                if (rc == EOK || rc == EEXIST)
-                        break;
-
-                /* I/O error */
-                err.fname = dest;
-                err.optype = fmgt_io_create;
-                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;
+
+        (void)dest;
+        return fmgt_create_dir(fmgt, dest);
 }
 
@@ -137 +291 @@
         aoff64_t wpos = 0;
         char *buffer;
-        fmgt_io_error_t err;
-        fmgt_error_action_t action;
+        bool skip;
         errno_t rc;
 
@@ -145 +298 @@
                 return ENOMEM;
 
-        do {
-                rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &rfd);
-                if (rc == EOK)
-                        break;
-
-                /* I/O error */
-                err.fname = src;
-                err.optype = fmgt_io_open;
-                err.rc = rc;
-                fmgt_timer_stop(fmgt);
-                action = fmgt_io_error_query(fmgt, &err);
-                fmgt_timer_start(fmgt);
-        } while (action == fmgt_er_retry);
-
-        /* Not recovered? */
+        rc = fmgt_open(fmgt, src, &rfd);
         if (rc != EOK) {
                 free(buffer);
@@ -165 +304 @@
         }
 
-        do {
-                rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE,
-                    MODE_WRITE, &wfd);
-                if (rc == EOK)
-                        break;
-
-                /* I/O error */
-                err.fname = dest;
-                err.optype = fmgt_io_create;
-                err.rc = rc;
-                fmgt_timer_stop(fmgt);
-                action = fmgt_io_error_query(fmgt, &err);
-                fmgt_timer_start(fmgt);
-        } while (action == fmgt_er_retry);
-
+        rc = fmgt_create_file(fmgt, dest, &wfd, &skip);
         if (rc != EOK) {
                 free(buffer);
                 vfs_put(rfd);
+
+                /* User decided to skip and continue. */
+                if (rc == EEXIST && skip)
+                        return EOK;
                 return rc;
         }
@@ -189 +318 @@
 
         do {
-                do {
-                        rc = vfs_read(rfd, &rpos, buffer, BUFFER_SIZE, &nr);
-                        if (rc == EOK)
-                                break;
-
-                        /* I/O error */
-                        err.fname = src;
-                        err.optype = fmgt_io_read;
-                        err.rc = rc;
-                        fmgt_timer_stop(fmgt);
-                        action = fmgt_io_error_query(fmgt, &err);
-                        fmgt_timer_start(fmgt);
-                } while (action == fmgt_er_retry);
-
-                /* Not recovered? */
+                rc = fmgt_read(fmgt, rfd, src, &rpos, buffer, BUFFER_SIZE,
+                    &nr);
                 if (rc != EOK)
                         goto error;
@@ -233 +349 @@
 }
 
-/** copy files.
+/** Copy files.
  *
  * @param fmgt File management object

uspace/lib/fmgt/src/fmgt.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -283 +283 @@
 }
 
+/** Query caller how to recover from existing destination file/directory.
+ *
+ * @param fmgt File management object
+ * @param exists File/directory exists report
+ * @return What recovery action should be taken.
+ */
+fmgt_exists_action_t fmgt_exists_query(fmgt_t *fmgt, fmgt_exists_t *exists)
+{
+        if (fmgt->cb != NULL && fmgt->cb->exists_query != NULL)
+                return fmgt->cb->exists_query(fmgt->cb_arg, exists);
+        else
+                return fmgt_exr_abort;
+}
+
 /** Return base name (without path component).
  *

uspace/lib/ui/src/promptdialog.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -291 +291 @@
 }
 
-/** Set mesage dialog callback.
+/** Set prompt dialog callback.
  *
  * @param dialog Prompt dialog