Changeset d4067a7 in mainline

Timestamp:

2017-04-02T13:11:46Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1e2e5795

Parents:

ce04ea44

Message:

Separate the dirent functions to dirent.c

Location:

uspace/lib/c

Files:

• Makefile (modified) (2 diffs)
• generic/dirent.c (added)
• generic/vfs/vfs.c (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -73 +73 @@
         generic/device/clock_dev.c \
         generic/device/led_dev.c \
+        generic/dirent.c \
         generic/dhcp.c \
         generic/dnsr.c \
@@ -147 +148 @@
         generic/stdlib.c \
         generic/udebug.c \
+        generic/vfs/canonify.c \
         generic/vfs/vfs.c \
-        generic/vfs/canonify.c \
         generic/rcu.c \
         generic/setjmp.c \

uspace/lib/c/generic/vfs/vfs.c

@@ -39 +39 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -632 +630 @@
 }
 
-/** 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;
-}
-
-/** 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;
-}
-
-/** Rewind directory position to the beginning.
- *
- * @param dirp Open directory
- */
-void rewinddir(DIR *dirp)
-{
-        dirp->pos = 0;
-}
-
-/** 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;
-}
-
 int vfs_link(int parent, const char *child, vfs_file_kind_t kind)
 {