Changeset 9350bfdd in mainline

Timestamp:

2011-07-28T22:51:32Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

7ae249d

Parents:

955c2b0

Message:

Fix the case when errno is non-zero on entry to getcwd().

File:

• uspace/lib/posix/unistd.c (modified) (1 diff)

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);
-        /* Check errno to avoid shadowing possible ENOMEM. */
-        if (ret == NULL && errno == EOK) {
-                errno = ERANGE;
-        }
+        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;
 }