Changeset 6dae798 in mainline for uspace/lib/c/generic/dirent.c

Timestamp:

2026-03-18T12:47:36Z (18 hours ago)

Author:

GitHub <noreply@…>

Parents:

222774a (diff), 34832c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Vít Skalický <skalicky@…> (2026-03-18 12:47:36)

git-committer:

GitHub <noreply@…> (2026-03-18 12:47:36)

Message:

Merge 34832c3e4df70614df5caa7d44b985f0460ef8ec into 222774a69b1583c34db4419abfda9fa6a1031f74

File:

• uspace/lib/c/generic/dirent.c (modified) (3 diffs)

uspace/lib/c/generic/dirent.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2026 Vít Skalický
  * All rights reserved.
  *
@@ -47 +48 @@
 };
 
-/** Open directory.
+/** Like opendir_handle, but takes ownership of the handle if successful. */
+static DIR *opendir_internal(int handle)
+{
+        DIR *dirp = malloc(sizeof(DIR));
+        if (!dirp) {
+                errno = ENOMEM;
+                return NULL;
+        }
+
+        errno_t rc = vfs_open(handle, MODE_READ);
+        if (rc != EOK) {
+                free(dirp);
+                errno = rc;
+                return NULL;
+        }
+
+        dirp->fd = handle;
+        dirp->pos = 0;
+        return dirp;
+}
+
+/** Open directory by its handle (a.k.a. file descriptor).
+ *
+ * @param handle Directory handle
+ * @return Non-NULL pointer on success. On error returns @c NULL and sets errno.
+ */
+DIR *opendir_handle(int handle)
+{
+        int my_handle;
+        // Clone the file handle, otherwise closedir would put the
+        // handle that was passed to us here by the caller and that we don't own.
+        errno_t rc = vfs_clone(handle, -1, false, &my_handle);
+        if (rc != EOK) {
+                errno = rc;
+                return NULL;
+        }
+
+        DIR *dirp = opendir_internal(my_handle);
+        if (!dirp) {
+                rc = errno;
+                vfs_put(my_handle);
+                errno = rc;
+                return NULL;
+        }
+        return dirp;
+}
+
+/** Open directory by its pathname.
  *
  * @param dirname Directory pathname
@@ -55 +103 @@
 DIR *opendir(const char *dirname)
 {
-        DIR *dirp = malloc(sizeof(DIR));
-        if (!dirp) {
-                errno = ENOMEM;
-                return NULL;
-        }
-
         int fd;
         errno_t rc = vfs_lookup(dirname, WALK_DIRECTORY, &fd);
         if (rc != EOK) {
-                free(dirp);
                 errno = rc;
                 return NULL;
         }
 
-        rc = vfs_open(fd, MODE_READ);
-        if (rc != EOK) {
-                free(dirp);
+        DIR *dirp = opendir_internal(fd);
+        if (!dirp) {
+                rc = errno;
                 vfs_put(fd);
                 errno = rc;
                 return NULL;
         }
-
-        dirp->fd = fd;
-        dirp->pos = 0;
         return dirp;
 }
 
-/** Read directory entry.
+/** Read current directory entry and advance to the next one.
  *
  * @param dirp Open directory