Changeset b017885 in mainline for uspace/app/cmpdirs/cmpdirs.c

Timestamp:

2026-03-17T12:37:41Z (24 hours ago)

Author:

Vít Skalický <skalicky@…>

Children:

74c69dc

Parents:

7952b336

git-author:

Vít Skalický <skalicky@…> (2026-03-17 12:16:27)

git-committer:

Vít Skalický <skalicky@…> (2026-03-17 12:37:41)

Message:

Fix use of vfs_walk()

Added slash to the beginning of file names in dirent so that they are
an absolute path. vfs_walk() resolves path staring from the directory
passed as parent, but the paths themselves must be absolute (start
with /).

File:

• uspace/app/cmpdirs/cmpdirs.c (modified) (3 diffs)

uspace/app/cmpdirs/cmpdirs.c

@@ -334 +334 @@
                                 assert(rc != EOK);
                         }
-                        check_ok(rc, close_inner, "Failed to open directory (handle %d", item.handle1);
+                        check_ok(rc, close_inner, "Failed to open directory of handle %d", item.handle1);
 
                         while ((dp = readdir(dirp))) { // 1.
@@ -345 +345 @@
                                 }
                                 check_ok_break(rc, "Name too long (limit is %"PRIdn" excluding null-terminator)", name_buffer_size);
+                                // add slash to the beginning of the name, because vfs_walk requires the path to be absolute (will be
+                                // resolved relatively to the starting directory)
+                                char name_with_slash[name_buffer_size+1];
+                                name_with_slash[0] = '/';
+                                str_cpy(name_with_slash + 1, name_size + 1, dp->d_name);
                                 // 2.
                                 int entry_handle1; // don't forget to put
-                                rc = vfs_walk(item.handle1, dp->d_name, 0, &entry_handle1);
-                                check_ok_break(rc, "(0) Failed to find entry \"%s\" in directory of handle %d\n", dp->d_name, item.handle1);
+                                rc = vfs_walk(item.handle1, name_with_slash, 0, &entry_handle1);
+                                check_ok_break(rc, "(0) Failed to find entry \"%s\" in directory of handle %d\n", name_with_slash, item.handle1);
                                 // 3.
                                 int entry_handle2; // must be put
-                                rc= vfs_walk(item.handle2, dp->d_name, 0, &entry_handle2);
+                                rc= vfs_walk(item.handle2, name_with_slash, 0, &entry_handle2);
                                 if (rc != EOK) {
                                         errno_t rc2 = vfs_put(entry_handle1);
@@ -360 +365 @@
                                                 break;
                                         }
-                                        check_ok_break(rc, "(1) Failed to find entry \"%s\" in directory of handle %d\n", dp->d_name, item.handle2);
+                                        check_ok_break(rc, "(1) Failed to find entry \"%s\" in directory of handle %d\n", name_with_slash, item.handle2);
                                 }