Changeset 0ce9eb8 in mainline for uspace/app/copy/copy.c

Timestamp:

2026-02-10T12:52:07Z (8 days 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.

File:

• uspace/app/copy/copy.c (modified) (5 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;
         }