Changeset 59ed424e in mainline for uspace/lib/fmgt/src/copy.c

Timestamp:

2026-02-11T12:02:03Z (30 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

f9c30b9a

Parents:

857fba8

git-author:

Jiri Svoboda <jiri@…> (2026-02-10 20:01:03)

git-committer:

Jiri Svoboda <jiri@…> (2026-02-11 12:02:03)

Message:

Do not print error when user requests abort because file exists.

File:

• uspace/lib/fmgt/src/copy.c (modified) (5 diffs)

uspace/lib/fmgt/src/copy.c

@@ -43 +43 @@
 #include "../private/fsops.h"
 
-static errno_t fmgt_copy_dir_enter(void *, const char *, const char *);
-static errno_t fmgt_copy_file(void *, const char *, const char *);
+static errno_t fmgt_copy_dir_enter(fmgt_walk_t *, const char *, const char *);
+static errno_t fmgt_copy_file(fmgt_walk_t *, const char *, const char *);
 
 static fmgt_walk_cb_t fmgt_copy_cb = {
@@ -53 +53 @@
 /** Copy operation - enter directory.
  *
- * @param arg Argument (fmgt_t *)
+ * @param walk Walk
  * @param fname Source directory name
  * @param dest Destination directory name
  * @return EOK on success or an error code
  */
-static errno_t fmgt_copy_dir_enter(void *arg, const char *src, const char *dest)
+static errno_t fmgt_copy_dir_enter(fmgt_walk_t *walk, const char *src,
+    const char *dest)
 {
-        fmgt_t *fmgt = (fmgt_t *)arg;
+        fmgt_t *fmgt = (fmgt_t *)walk->params->arg;
 
         (void)dest;
@@ -68 +69 @@
 /** Copy single file.
  *
- * @param arg Argument (fmgt_t *)
+ * @param walk Walk
  * @param fname Source file name
  * @param dest Destination file name
  * @return EOK on success or an error code
  */
-static errno_t fmgt_copy_file(void *arg, const char *src, const char *dest)
+static errno_t fmgt_copy_file(fmgt_walk_t *walk, const char *src,
+    const char *dest)
 {
-        fmgt_t *fmgt = (fmgt_t *)arg;
+        fmgt_t *fmgt = (fmgt_t *)walk->params->arg;
+        fmgt_exists_action_t exaction;
         int rfd;
         int wfd;
@@ -82 +85 @@
         aoff64_t wpos = 0;
         char *buffer;
-        bool skip;
         errno_t rc;
 
@@ -95 +97 @@
         }
 
-        rc = fmgt_create_file(fmgt, dest, &wfd, &skip);
+        rc = fmgt_create_file(fmgt, dest, &wfd, &exaction);
         if (rc != EOK) {
                 free(buffer);
                 vfs_put(rfd);
 
-                /* User decided to skip and continue. */
-                if (rc == EEXIST && skip)
+                if (rc == EEXIST && exaction != fmgt_exr_fail) {
+                        if (exaction == fmgt_exr_abort)
+                                walk->stop = true;
                         return EOK;
+                }
+
                 return rc;
         }