Merge branch 'device-sys'

[lunaix-os.git] / 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 7a63ba933d7c44469eedaee1de02b3655f66c2c3..54ffd97b20147425350d7ed44ac4028cf4955e6f 100644 (file)
--- a/lunaix-os/kernel/demos/dir_read.c
+++ b/lunaix-os/kernel/demos/dir_read.c
@@ -1,22 +1,30 @@
 #include <lunaix/dirent.h>
 #include <lunaix/fctrl.h>
-#include <lunaix/syslog.h>
-
-LOG_MODULE("RDDIR")
+#include <lunaix/lunistd.h>
+#include <lunaix/proc.h>
 
 void
 _readdir_main()
 {
-    int fd = open("/dev/block", 0);
+    int fd = open("/dev/./../dev/.", 0);
     if (fd == -1) {
-        kprintf(KERROR "fail to open\n");
+        printf("fail to open (%d)\n", geterrno());
         return;
     }
 
+    char path[129];
+    int len = realpathat(fd, path, 128);
+    if (len < 0) {
+        printf("fail to read (%d)\n", geterrno());
+    } else {
+        path[len] = 0;
+        printf("%s\n", path);
+    }
+
     struct dirent ent = { .d_offset = 0 };
 
-    while (!readdir(fd, &ent)) {
-        kprintf(KINFO "%s\n", ent.d_name);
+    while (readdir(fd, &ent) == 1) {
+        printf("%s\n", ent.d_name);
     }
 
     close(fd);