Changeset 368ee04 in mainline for uspace/lib/posix/source/sys/stat.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/posix/source/sys/stat.c (modified) (8 diffs)

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

@@ -39 +39 @@
 #include "../internal/common.h"
 #include "posix/sys/stat.h"
-#include "libc/sys/stat.h"
+#include "libc/vfs/vfs.h"
 
 #include "posix/errno.h"
@@ -49 +49 @@
  * @param dest POSIX stat struct.
  * @param src HelenOS stat struct.
+ *
+ * @return 0 on success, -1 on error.
  */
-static void stat_to_posix(struct posix_stat *dest, struct stat *src)
+static int stat_to_posix(struct posix_stat *dest, struct stat *src)
 {
         memset(dest, 0, sizeof(struct posix_stat));
@@ -68 +70 @@
         dest->st_nlink = src->lnkcnt;
         dest->st_size = src->size;
+
+        if (src->size > INT64_MAX) {
+                errno = ERANGE;
+                return -1;
+        }
+
+        return 0;
 }
 
@@ -80 +89 @@
 {
         struct stat hst;
-        int rc = negerrno(fstat, fd, &hst);
+        int rc = rcerrno(vfs_stat, fd, &hst);
         if (rc < 0)
-                return rc;
-        stat_to_posix(st, &hst);
-        return 0;
+                return -1;
+        return stat_to_posix(st, &hst);
 }
 
@@ -110 +118 @@
 {
         struct stat hst;
-        int rc = negerrno(stat, path, &hst);
+        int rc = rcerrno(vfs_stat_path, path, &hst);
         if (rc < 0)
-                return rc;
-        stat_to_posix(st, &hst);
-        return 0;
+                return -1;
+        return stat_to_posix(st, &hst);
 }
 
@@ -124 +131 @@
  * @return Zero on success, -1 otherwise.
  */
-int posix_chmod(const char *path, mode_t mode)
+int posix_chmod(const char *path, posix_mode_t mode)
 {
         /* HelenOS doesn't support permissions, return success. */
@@ -137 +144 @@
  * @return Previous file mode creation mask.
  */
-mode_t posix_umask(mode_t mask)
+posix_mode_t posix_umask(posix_mode_t mask)
 {
         /* HelenOS doesn't support permissions, return empty mask. */
@@ -143 +150 @@
 }
 
+/**
+ * Create a directory.
+ * 
+ * @param path Path to the new directory.
+ * @param mode Permission bits to be set.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_mkdir(const char *path, posix_mode_t mode)
+{
+        int rc = rcerrno(vfs_link_path, path, KIND_DIRECTORY, NULL);
+        if (rc != EOK)
+                return -1;
+        else
+                return 0;
+}
+
 /** @}
  */