Changeset ff381a7 in mainline for uspace/lib/posix/source/unistd.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

uspace/lib/posix/source/unistd.c

@@ -105 +105 @@
 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;
+        char *p = getcwd(buf, size);
+
+        if (p == NULL) {
+                errno = -errno;
                 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;
-        }
-        
-        return ret;
+
+        return p;
 }
 
@@ -141 +122 @@
 int posix_chdir(const char *path)
 {
-        return errnify(chdir, path);
+        return negerrno(chdir, path);
 }
 
@@ -194 +175 @@
 int posix_close(int fildes)
 {
-        return errnify(close, fildes);
+        return negerrno(close, fildes);
 }
 
@@ -207 +188 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        return errnify(read, fildes, buf, nbyte);
+        return negerrno(read, fildes, buf, nbyte);
 }
 
@@ -220 +201 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        return errnify(write, fildes, buf, nbyte);
+        return negerrno(write, fildes, buf, nbyte);
 }
 
@@ -234 +215 @@
 posix_off_t posix_lseek(int fildes, posix_off_t offset, int whence)
 {
-        return errnify(lseek, fildes, offset, whence);
+        return negerrno(lseek, fildes, offset, whence);
 }
 
@@ -245 +226 @@
 int posix_fsync(int fildes)
 {
-        return errnify(fsync, fildes);
+        return negerrno(fsync, fildes);
 }
 
@@ -257 +238 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        return errnify(ftruncate, fildes, (aoff64_t) length);
+        return negerrno(ftruncate, fildes, (aoff64_t) length);
 }
 
@@ -268 +249 @@
 int posix_rmdir(const char *path)
 {
-        return errnify(rmdir, path);
+        return negerrno(rmdir, path);
 }
 
@@ -279 +260 @@
 int posix_unlink(const char *path)
 {
-        return errnify(unlink, path);
+        return negerrno(unlink, path);
 }
 
@@ -303 +284 @@
 int posix_dup2(int fildes, int fildes2)
 {
-        return errnify(dup2, fildes, fildes2);
+        return negerrno(dup2, fildes, fildes2);
 }
 
@@ -321 +302 @@
                  * Check file existence by attempting to open it.
                  */
-                int fd = open(path, O_RDONLY);
+                int fd = negerrno(open, path, O_RDONLY);
                 if (fd < 0) {
-                        errno = -fd;
+                        /* errno was set by open() */
                         return -1;
                 }