Changes in uspace/lib/posix/sys/stat.h [e7f7c93:53900ab] in mainline

File:

• uspace/lib/posix/sys/stat.h (modified) (7 diffs)

uspace/lib/posix/sys/stat.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jiri Zarevucky
- * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup libposix
- * @{
- */
-/** @file
- */
-
 #ifndef POSIX_SYS_STAT_H_
 #define POSIX_SYS_STAT_H_
 
 #include "../libc/sys/stat.h"
-#include "types.h"
-#include "../time.h"
-#include <ipc/devmap.h>
-#include <task.h>
-
-typedef devmap_handle_t posix_dev_t;
-typedef task_id_t posix_pid_t;
+#include "time.h"
 
 /* values are the same as on Linux */
-
-#undef S_IFMT
-#undef S_IFSOCK
-#undef S_IFLNK
-#undef S_IFREG
-#undef S_IFBLK
-#undef S_IFDIR
-#undef S_IFCHR
-#undef S_IFIFO
 #define S_IFMT     0170000   /* all file types */
 #define S_IFSOCK   0140000   /* socket */
@@ -65 +43 @@
 #define S_IFIFO    0010000   /* FIFO */
 
-#undef S_ISUID
-#undef S_ISGID
-#undef S_ISVTX
 #define S_ISUID    0004000   /* SUID */
 #define S_ISGID    0002000   /* SGID */
 #define S_ISVTX    0001000   /* sticky */
 
-#undef S_IRWXU
-#undef S_IRUSR
-#undef S_IWUSR
-#undef S_IXUSR
 #define S_IRWXU    00700     /* owner permissions */
 #define S_IRUSR    00400
@@ -81 +52 @@
 #define S_IXUSR    00100
 
-#undef S_IRWXG
-#undef S_IRGRP
-#undef S_IWGRP
-#undef S_IXGRP
 #define S_IRWXG    00070     /* group permissions */
 #define S_IRGRP    00040
@@ -90 +57 @@
 #define S_IXGRP    00010
 
-#undef S_IRWXO
-#undef S_IROTH
-#undef S_IWOTH
-#undef S_IXOTH
 #define S_IRWXO    00007     /* other permissions */
 #define S_IROTH    00004
@@ -99 +62 @@
 #define S_IXOTH    00001
 
-#undef S_ISREG
-#undef S_ISDIR
-#undef S_ISCHR
-#undef S_ISBLK
-#undef S_ISFIFO
-#undef S_ISLNK
-#undef S_ISSOCK
 #define S_ISREG(m) ((m & S_IFREG) != 0)
 #define S_ISDIR(m) ((m & S_IFDIR) != 0)
@@ -111 +67 @@
 #define S_ISBLK(m) ((m & S_IFBLK) != 0)
 #define S_ISFIFO(m) ((m & S_IFIFO) != 0)
-#define S_ISLNK(m) ((m & S_IFLNK) != 0) /* symbolic link? (Not in POSIX.1-1996.) */
+#define S_ISLNK(m) ((m & S_IFLNK) != 0)   /* symbolic link? (Not in POSIX.1-1996.) */
 #define S_ISSOCK(m) ((m & S_IFSOCK) != 0) /* socket? (Not in POSIX.1-1996.) */
+
+typedef devmap_handle_t dev_t;
+typedef unsigned int ino_t;
+typedef unsigned int nlink_t;
+typedef unsigned int uid_t;
+typedef unsigned int gid_t;
+typedef aoff64_t off_t;
+typedef unsigned int blksize_t;
+typedef unsigned int blkcnt_t;
 
 struct posix_stat {
         struct stat sys_stat;
 
-        posix_dev_t     st_dev;     /* ID of device containing file */
-        posix_ino_t     st_ino;     /* inode number */
-        mode_t          st_mode;    /* protection */
-        posix_nlink_t   st_nlink;   /* number of hard links */
-        posix_uid_t     st_uid;     /* user ID of owner */
-        posix_gid_t     st_gid;     /* group ID of owner */
-        posix_dev_t     st_rdev;    /* device ID (if special file) */
-        posix_off_t     st_size;    /* total size, in bytes */
-        posix_blksize_t st_blksize; /* blocksize for file system I/O */
-        posix_blkcnt_t  st_blocks;  /* number of 512B blocks allocated */
-        time_t          st_atime;   /* time of last access */
-        time_t          st_mtime;   /* time of last modification */
-        time_t          st_ctime;   /* time of last status change */
+        dev_t     st_dev;     /* ID of device containing file */
+        ino_t     st_ino;     /* inode number */
+        mode_t    st_mode;    /* protection */
+        nlink_t   st_nlink;   /* number of hard links */
+        uid_t     st_uid;     /* user ID of owner */
+        gid_t     st_gid;     /* group ID of owner */
+        dev_t     st_rdev;    /* device ID (if special file) */
+        off_t     st_size;    /* total size, in bytes */
+        blksize_t st_blksize; /* blocksize for file system I/O */
+        blkcnt_t  st_blocks;  /* number of 512B blocks allocated */
+        time_t    st_atime;   /* time of last access */
+        time_t    st_mtime;   /* time of last modification */
+        time_t    st_ctime;   /* time of last status change */
 };
 
-extern int posix_fstat(int fd, struct posix_stat *st);
-extern int posix_lstat(const char *restrict path, struct posix_stat *restrict st);
-extern int posix_stat(const char *restrict path, struct posix_stat *restrict st);
-extern int posix_chmod(const char *path, mode_t mode);
-extern mode_t posix_umask(mode_t mask);
+extern int posix_fstat(int, struct posix_stat *);
+extern int posix_stat(const char *, struct posix_stat *);
 
 #ifndef LIBPOSIX_INTERNAL
-        #define dev_t posix_dev_t
-        #define pid_t posix_pid_t
         #define fstat posix_fstat
-        #define lstat posix_lstat
         #define stat posix_stat
-        #define chmod posix_chmod
-        #define umask posix_umask
 #endif
 
 #endif /* POSIX_SYS_STAT_H */
 
-/** @}
- */