Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / usr / stat.c

diff --git a/lunaix-os/usr/stat.c b/lunaix-os/usr/stat.c
index 108f462b887ad42882698e1b5d0e885938a4286a..ea402000553e3273fe3d060205e623784f269b7d 100644 (file)
--- a/lunaix-os/usr/stat.c
+++ b/lunaix-os/usr/stat.c
@@ -15,7 +15,7 @@ main(int argc, char* argv[])
 
     int fd = open(argv[1], FO_RDONLY | FO_NOFOLLOW);
     if (fd < 0) {
 
     int fd = open(argv[1], FO_RDONLY | FO_NOFOLLOW);
     if (fd < 0) {

-        printf("fail to open %d\n", fd);
+        printf("fail to open %d\n", errno);

         return 1;
     }
 
         return 1;
     }
 


@@ -29,22 +29,21 @@ main(int argc, char* argv[])
 
     char* ftype = "directory";
     int mode = stat.mode;
 
     char* ftype = "directory";
     int mode = stat.mode;

-    if ((mode & F_MDEV)) {
-        if (!((mode & F_SEQDEV) ^ F_SEQDEV)) {
-            ftype = "sequential device";
-        } else if (!((mode & F_VOLDEV) ^ F_VOLDEV)) {
+    if ((mode & F_DEV)) {
+        ftype = "mappable (sequential) device";
+
+        if (!((mode & F_SVDEV) ^ F_SVDEV)) {

             ftype = "volumetric device";
             ftype = "volumetric device";

-        } else {
-            ftype = "regular device";

         }
         }

-    } else if ((mode & F_MSLNK)) {
+
+    } else if ((mode & F_SYMLINK)) {

         if (readlinkat(fd, NULL, buf, 256) < 0) {
             printf("fail to readlink %d\n", errno);
         } else {
             printf("-> %s", buf);
         }
         ftype = "symbolic link";
         if (readlinkat(fd, NULL, buf, 256) < 0) {
             printf("fail to readlink %d\n", errno);
         } else {
             printf("-> %s", buf);
         }
         ftype = "symbolic link";

-    } else if ((mode & F_MFILE)) {
+    } else if (mode == F_FILE) {

         ftype = "regular file";
     }
 
         ftype = "regular file";
     }
 


@@ -57,7 +56,7 @@ main(int argc, char* argv[])
     printf("Inode: %d;  ", stat.st_ino);
 
     dev_t* dev;
     printf("Inode: %d;  ", stat.st_ino);
 
     dev_t* dev;

-    if (!(stat.mode & F_MDEV)) {
+    if (!(stat.mode & F_DEV)) {

         dev = &stat.st_dev;
     } else {
         dev = &stat.st_rdev;
         dev = &stat.st_dev;
     } else {
         dev = &stat.st_rdev;