Changeset 368ee04 in mainline for uspace/lib/c/generic/dirent.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/c/generic/dirent.c (moved) (moved from uspace/lib/c/include/sys/stat.h ) (1 diff)

uspace/lib/c/generic/dirent.c

@@ -33 +33 @@
  */
 
-#ifndef LIBC_SYS_STAT_H_
-#define LIBC_SYS_STAT_H_
+#include <vfs/vfs.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <assert.h>
 
-#include <sys/types.h>
-#include <stdbool.h>
-#include <ipc/vfs.h>
-#include <ipc/loc.h>
+/** Open directory.
+ *
+ * @param dirname Directory pathname
+ *
+ * @return Non-NULL pointer on success. On error returns @c NULL and sets errno.
+ */
+DIR *opendir(const char *dirname)
+{
+        DIR *dirp = malloc(sizeof(DIR));
+        if (!dirp) {
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        int fd = vfs_lookup(dirname, WALK_DIRECTORY);
+        if (fd < 0) {
+                free(dirp);
+                errno = fd;
+                return NULL;
+        }
+        
+        int rc = vfs_open(fd, MODE_READ);
+        if (rc < 0) {
+                free(dirp);
+                vfs_put(fd);
+                errno = rc;
+                return NULL;
+        }
+        
+        dirp->fd = fd;
+        dirp->pos = 0;
+        return dirp;
+}
 
-struct stat {
-        fs_handle_t fs_handle;
-        service_id_t service_id;
-        fs_index_t index;
-        unsigned int lnkcnt;
-        bool is_file;
-        bool is_directory;
-        aoff64_t size;
-        service_id_t service;
-};
+/** Read directory entry.
+ *
+ * @param dirp Open directory
+ * @return Non-NULL pointer to directory entry on success. On error returns
+ *         @c NULL and sets errno.
+ */
+struct dirent *readdir(DIR *dirp)
+{
+        int rc;
+        ssize_t len = 0;
+        
+        rc = vfs_read_short(dirp->fd, dirp->pos, &dirp->res.d_name[0],
+            NAME_MAX + 1, &len);
+        if (rc != EOK) {
+                errno = rc;
+                return NULL;
+        }
+        
+        dirp->pos += len;
+        
+        return &dirp->res;
+}
 
-extern int fstat(int, struct stat *);
-extern int stat(const char *, struct stat *);
-extern int mkdir(const char *, mode_t);
+/** Rewind directory position to the beginning.
+ *
+ * @param dirp Open directory
+ */
+void rewinddir(DIR *dirp)
+{
+        dirp->pos = 0;
+}
 
-#endif
+/** Close directory.
+ *
+ * @param dirp Open directory
+ * @return 0 on success. On error returns -1 and sets errno.
+ */
+int closedir(DIR *dirp)
+{
+        int rc;
+        
+        rc = vfs_put(dirp->fd);
+        free(dirp);
+
+        /* On error errno was set by close() */
+        return rc;
+}
 
 /** @}