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

Timestamp:

2026-02-11T12:02:03Z (22 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/walk.c (modified) (15 diffs)

uspace/lib/fmgt/src/walk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 #include "fmgt/walk.h"
 
-static errno_t fmgt_walk_subtree(fmgt_walk_params_t *, const char *,
-    const char *);
+static errno_t fmgt_walk_subtree(fmgt_walk_t *, const char *, const char *);
 
 /** Initialize walk parameters.
@@ -63 +62 @@
 /** Walk file (invoke file callback).
  *
- * @param params Walk parameters
+ * @param walk Walk
  * @param fname Source path
  * @param dest Destination path
@@ -69 +68 @@
  * @return EOK on success or an error code
  */
-static errno_t fmgt_walk_file(fmgt_walk_params_t *params, const char *fname,
-    const char *dest)
-{
-        if (params->cb->file != NULL)
-                return params->cb->file(params->arg, fname, dest);
+static errno_t fmgt_walk_file(fmgt_walk_t *walk, const char *fname,
+    const char *dest)
+{
+        if (walk->params->cb->file != NULL)
+                return walk->params->cb->file(walk, fname, dest);
         else
                 return EOK;
@@ -80 +79 @@
 /** Enter directory (invoke directory entry callback).
  *
- * @param params Walk parameters
+ * @param walk Walk
  * @param dname Source directory
  * @param dest Destination path
  * @return EOK on success or an error code
  */
-static errno_t fmgt_walk_dir_enter(fmgt_walk_params_t *params,
-    const char *dname, const char *dest)
-{
-        if (params->cb->dir_enter != NULL)
-                return params->cb->dir_enter(params->arg, dname, dest);
+static errno_t fmgt_walk_dir_enter(fmgt_walk_t *walk, const char *dname,
+    const char *dest)
+{
+        if (walk->params->cb->dir_enter != NULL)
+                return walk->params->cb->dir_enter(walk, dname, dest);
         else
                 return EOK;
@@ -96 +95 @@
 /** Leave directory (invoke directory exit callback).
  *
- * @param params Walk parameters
+ * @param walk Walk
  * @param dname Directory path
  * @param dest Destination path
  * @return EOK on success or an error code
  */
-static errno_t fmgt_walk_dir_leave(fmgt_walk_params_t *params,
-    const char *dname, const char *dest)
-{
-        if (params->cb->dir_leave != NULL)
-                return params->cb->dir_leave(params->arg, dname, dest);
+static errno_t fmgt_walk_dir_leave(fmgt_walk_t *walk, const char *dname,
+    const char *dest)
+{
+        if (walk->params->cb->dir_leave != NULL)
+                return walk->params->cb->dir_leave(walk, dname, dest);
         else
                 return EOK;
@@ -112 +111 @@
 /** Walk directory.
  *
- * @param params Walk parameters
+ * @param walk Walk
  * @param dname Directory name
  * @param dest Destination path or @c NULL
  * @return EOK on success or an error code
  */
-static errno_t fmgt_walk_dir(fmgt_walk_params_t *params, const char *dname,
+static errno_t fmgt_walk_dir(fmgt_walk_t *walk, const char *dname,
     const char *dest)
 {
@@ -127 +126 @@
         int rv;
 
-        rc = fmgt_walk_dir_enter(params, dname, dest);
+        rc = fmgt_walk_dir_enter(walk, dname, dest);
         if (rc != EOK)
                 goto error;
@@ -138 +137 @@
 
         de = readdir(dir);
-        while (de != NULL) {
+        while (!walk->stop && de != NULL) {
                 rv = asprintf(&srcpath, "%s/%s", dname, de->d_name);
                 if (rv < 0) {
@@ -154 +153 @@
                 }
 
-                rc = fmgt_walk_subtree(params, srcpath, destpath);
+                rc = fmgt_walk_subtree(walk, srcpath, destpath);
                 if (rc != EOK) {
                         free(srcpath);
@@ -168 +167 @@
         }
 
-        rc = fmgt_walk_dir_leave(params, dname, dest);
+        rc = fmgt_walk_dir_leave(walk, dname, dest);
         if (rc != EOK)
                 return rc;
@@ -182 +181 @@
 /** Walk subtree.
  *
- * @param params Walk parameters.
- * @param fname Subtree path.
+ * @param walk Walk
+ * @param fname Subtree path
  * @param dest Destination path
  *
  * @return EOK on success or an error code.
  */
-static errno_t fmgt_walk_subtree(fmgt_walk_params_t *params, const char *fname,
+static errno_t fmgt_walk_subtree(fmgt_walk_t *walk, const char *fname,
     const char *dest)
 {
@@ -200 +199 @@
         if (stat.is_directory) {
                 /* Directory */
-                rc = fmgt_walk_dir(params, fname, dest);
+                rc = fmgt_walk_dir(walk, fname, dest);
                 if (rc != EOK)
                         return rc;
         } else {
                 /* Not a directory */
-                rc = fmgt_walk_file(params, fname, dest);
+                rc = fmgt_walk_file(walk, fname, dest);
                 if (rc != EOK)
                         return rc;
@@ -225 +224 @@
 {
         fmgt_flist_entry_t *entry;
+        fmgt_walk_t walk;
         char *destname;
         errno_t rc;
         int rv;
 
+        walk.params = params;
+        walk.stop = false;
+
         entry = fmgt_flist_first(params->flist);
-        while (entry != NULL) {
+        while (!walk.stop && entry != NULL) {
                 if (params->into_dest) {
                         rv = asprintf(&destname, "%s/%s",
@@ -240 +243 @@
                 }
 
-                rc = fmgt_walk_subtree(params, entry->fname,
+                rc = fmgt_walk_subtree(&walk, entry->fname,
                     destname != NULL ? destname : params->dest);
                 if (rc != EOK)