Changeset 221afc9e in mainline for uspace/lib/posix/unistd.c

Timestamp:

2011-07-12T02:43:56Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

2346e78

Parents:

46ac986

Message:

Redefinitions of some libc functions (mainly return value corrections).

File:

• uspace/lib/posix/unistd.c (modified) (2 diffs)

uspace/lib/posix/unistd.c

@@ -94 +94 @@
 
 /**
+ * Get the pathname of the current working directory.
+ *
+ * @param buf Buffer into which the pathname shall be put.
+ * @param size Size of the buffer.
+ * @return Buffer pointer on success, NULL on failure.
+ */
+char *posix_getcwd(char *buf, size_t size)
+{
+        /* Native getcwd() does not set any errno despite the fact that general
+         * usage pattern of this function depends on it (caller is repeatedly
+         * guessing the required size of the buffer by checking for ERANGE on
+         * failure). */
+        if (size == 0) {
+                errno = EINVAL;
+                return NULL;
+        }
+        char *ret = getcwd(buf, size);
+        if (ret == NULL && errno == EOK) {
+                errno = ERANGE;
+        }
+        return ret;
+}
+
+/**
  * Determine the page size of the current run of the process.
  *
@@ -133 +157 @@
         /* There is currently no support for user accounts in HelenOS. */
         return 0;
+}
+
+/**
+ * Read from a file.
+ *
+ * @param fildes File descriptor of the opened file.
+ * @param buf Buffer to which the read bytes shall be stored.
+ * @param nbyte Upper limit on the number of read bytes.
+ * @return Number of read bytes on success, -1 otherwise.
+ */
+ssize_t posix_read(int fildes, void *buf, size_t nbyte)
+{
+        int rc = read(fildes, buf, nbyte);
+        if (rc < 0) {
+                errno = -rc;
+                return -1;
+        } else {
+                return rc;
+        }
+}
+
+/**
+ * Remove a link to a file.
+ * 
+ * @param path File pathname.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_unlink(const char *path)
+{
+        int rc = unlink(path);
+        if (rc < 0) {
+                errno = -rc;
+                return -1;
+        } else {
+                return rc;
+        }
 }