Changes in uspace/lib/posix/unistd.c [9350bfdd:d542aad] in mainline

File:

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

uspace/lib/posix/unistd.c

@@ -110 +110 @@
                 return NULL;
         }
-        
-        /* Save the original value to comply with the "no modification on
-         * success" semantics.
-         */
-        int orig_errno = errno;
-        errno = EOK;
-        
         char *ret = getcwd(buf, size);
-        if (ret == NULL) {
-                /* Check errno to avoid shadowing other possible errors. */
-                if (errno == EOK) {
-                        errno = ERANGE;
-                }
-        } else {
-                /* Success, restore previous errno value. */
-                errno = orig_errno;
-        }
-        
+        if (ret == NULL && errno == EOK) {
+                errno = ERANGE;
+        }
         return ret;
-}
-
-/**
- * Change the current working directory.
- *
- * @param path New working directory.
- */
-int posix_chdir(const char *path)
-{
-        return errnify(chdir, path);
 }
 
@@ -181 +157 @@
         /* There is currently no support for user accounts in HelenOS. */
         return 0;
-}
-
-/**
- * Close a file.
- *
- * @param fildes
- * @return 0 on success, -1 on error.
- */
-int posix_close(int fildes)
-{
-        return errnify(close, fildes);
 }
 
@@ -204 +169 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        return errnify(read, fildes, buf, nbyte);
-}
-
-/**
- * Write to a file.
- *
- * @param fildes File descriptor of the opened file.
- * @param buf Buffer to write.
- * @param nbyte Size of the buffer.
- * @return Number of written bytes on success, -1 otherwise.
- */
-ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
-{
-        return errnify(write, fildes, buf, nbyte);
-}
-
-/**
- * Requests outstanding data to be written to the underlying storage device.
- *
- * @param fildes
- */
-int posix_fsync(int fildes)
-{
-        return errnify(fsync, fildes);
-}
-
-int posix_ftruncate(int fildes, posix_off_t length)
-{
-        return errnify(ftruncate, fildes, (aoff64_t) length);
-}
-
-/**
- * Remove a directory.
- *
- * @param path Directory pathname.
- * @return Zero on success, -1 otherwise.
- */
-int posix_rmdir(const char *path)
-{
-        return errnify(rmdir, path);
+        int rc = read(fildes, buf, nbyte);
+        if (rc < 0) {
+                errno = -rc;
+                return -1;
+        } else {
+                return rc;
+        }
 }
 
@@ -254 +186 @@
 int posix_unlink(const char *path)
 {
-        return errnify(unlink, path);
-}
-
-int posix_dup(int fildes)
-{
-        return posix_fcntl(fildes, F_DUPFD, 0);
-}
-
-int posix_dup2(int fildes, int fildes2)
-{
-        return errnify(dup2, fildes, fildes2);
+        int rc = unlink(path);
+        if (rc < 0) {
+                errno = -rc;
+                return -1;
+        } else {
+                return rc;
+        }
 }
 
@@ -276 +204 @@
 int posix_access(const char *path, int amode)
 {
-        if (amode == F_OK || (amode & (X_OK | W_OK | R_OK))) {
-                /* HelenOS doesn't support permissions, permission checks
-                 * are equal to existence check.
-                 *
-                 * Check file existence by attempting to open it.
-                 */
+        if (amode == F_OK) {
+                /* Check file existence by attempt to open it. */
                 int fd = open(path, O_RDONLY);
-                if (fd < 0) {
-                        errno = -fd;
-                        return -1;
+                if (fd != -1) {
+                        close(fd);
                 }
-                close(fd);
+                return fd;
+        } else if (amode & (X_OK | W_OK | R_OK)) {
+                /* HelenOS doesn't support permissions, return success. */
                 return 0;
         } else {