Changeset 5973fd0 in mainline for uspace/lib/libc/generic/vfs.c

Timestamp:

2008-01-18T23:45:16Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ae78b53

Parents:

62da45a

Message:

Finish implementation of readdir(). Functions from this family are implemented
via using file descriptors for directories. For example, readdir() is
implemented as read() from an open directory. Of course, FS implementations
must understand that they are asked to read a directory and behave accordingly.

File:

• uspace/lib/libc/generic/vfs.c (modified) (2 diffs)

uspace/lib/libc/generic/vfs.c

@@ -244 +244 @@
                 return NULL;
         dirp->fd = open(dirname, 0);    /* TODO: must be a directory */
-        if (!dirp->fd) {
+        if (dirp->fd < 0) {
                 free(dirp);
                 return NULL;
         }
-        dirp->pos = 0;
         return dirp;
 }
@@ -254 +253 @@
 struct dirent *readdir(DIR *dirp)
 {
-        return NULL;    /* TODO */      
+        ssize_t len = read(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1);
+        if (len <= 0)
+                return NULL;
+        return &dirp->res;
 }
 
 void rewinddir(DIR *dirp)
 {
-        dirp->pos = 0;
+        (void) lseek(dirp->fd, 0, SEEK_SET);
 }