X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/90129c6876c9bac2e468ab82c8264352d1952b4d..f13e160f6aa2f74895ecf1f65099265643836210:/lunaix-os/kernel/demos/dir_read.c

diff --git a/lunaix-os/kernel/demos/dir_read.c b/lunaix-os/kernel/demos/dir_read.c
index a0ef65f..c97dfc9 100644
--- a/lunaix-os/kernel/demos/dir_read.c
+++ b/lunaix-os/kernel/demos/dir_read.c
@@ -1,35 +1,31 @@
-#include <lunaix/dirent.h>
-#include <lunaix/fctrl.h>
-#include <lunaix/proc.h>
-#include <lunaix/syslog.h>
-
-LOG_MODULE("RDDIR")
+#include <usr/errno.h>
+#include <usr/fcntl.h>
+#include <usr/sys/dirent.h>
+#include <usr/unistd.h>
 
 void
 _readdir_main()
 {
     int fd = open("/dev/./../dev/.", 0);
     if (fd == -1) {
-        kprintf(KERROR "fail to open (%d)\n", geterrno());
+        printf("fail to open (%d)\n", errno);
         return;
     }
 
-    struct dirent ent = { .d_offset = 0 };
-
-    while (!readdir(fd, &ent)) {
-        kprintf(KINFO "%s\n", ent.d_name);
-    }
-
     char path[129];
-
-    int len = readlinkat(fd, ".", path, 128);
+    int len = realpathat(fd, path, 128);
     if (len < 0) {
-        kprintf(KERROR "fail to read (%d)\n", geterrno());
+        printf("fail to read (%d)\n", errno);
+    } else {
+        path[len] = 0;
+        printf("%s\n", path);
     }
 
-    path[len] = 0;
+    struct lx_dirent ent = { .d_offset = 0 };
 
-    kprintf("%s\n", path);
+    while (sys_readdir(fd, &ent) == 1) {
+        printf("%s\n", ent.d_name);
+    }
 
     close(fd);