Changeset 2b3dd78 in mainline for uspace/lib/posix/src/sys/stat.c

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/sys/stat.c (moved) (moved from uspace/lib/posix/source/sys/stat.c ) (8 diffs)

uspace/lib/posix/src/sys/stat.c

@@ -34 +34 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "../internal/common.h"
 #include "posix/sys/stat.h"
@@ -52 +49 @@
  * @return 0 on success, -1 on error.
  */
-static int stat_to_posix(struct posix_stat *dest, struct stat *src)
+static int stat_to_posix(struct stat *dest, vfs_stat_t *src)
 {
-        memset(dest, 0, sizeof(struct posix_stat));
+        memset(dest, 0, sizeof(struct stat));
         
         dest->st_dev = src->service;
@@ -86 +83 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_fstat(int fd, struct posix_stat *st)
+int fstat(int fd, struct stat *st)
 {
-        struct stat hst;
+        vfs_stat_t hst;
         if (failed(vfs_stat(fd, &hst)))
                 return -1;
@@ -101 +98 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_lstat(const char *restrict path, struct posix_stat *restrict st)
+int lstat(const char *restrict path, struct stat *restrict st)
 {
         /* There are currently no symbolic links in HelenOS. */
-        return posix_stat(path, st);
+        return stat(path, st);
 }
 
@@ -114 +111 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_stat(const char *restrict path, struct posix_stat *restrict st)
+int stat(const char *restrict path, struct stat *restrict st)
 {
-        struct stat hst;
+        vfs_stat_t hst;
         if (failed(vfs_stat_path(path, &hst)))
                 return -1;
@@ -129 +126 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_chmod(const char *path, posix_mode_t mode)
+int chmod(const char *path, mode_t mode)
 {
         /* HelenOS doesn't support permissions, return success. */
@@ -142 +139 @@
  * @return Previous file mode creation mask.
  */
-posix_mode_t posix_umask(posix_mode_t mask)
+mode_t umask(mode_t mask)
 {
         /* HelenOS doesn't support permissions, return empty mask. */
@@ -155 +152 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_mkdir(const char *path, posix_mode_t mode)
+int mkdir(const char *path, mode_t mode)
 {
         if (failed(vfs_link_path(path, KIND_DIRECTORY, NULL)))