Changeset 102a729 in mainline for uspace/lib/posix/stdlib.c

Timestamp:

2011-07-20T19:43:22Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

4cf8ca6

Parents:

087c8798

Message:

Various bugfixes in stdlib.h functions.

File:

• uspace/lib/posix/stdlib.c (modified) (3 diffs)

uspace/lib/posix/stdlib.c

@@ -40 +40 @@
 
 #include "errno.h"
+#include "limits.h"
 
 #include "libc/sort.h"
@@ -138 +139 @@
 {
         int (*compare)(const void *, const void *) = userdata;
-        return compare(elem1, elem2);
+        int ret = compare(elem1, elem2);
+        
+        /* Native qsort internals expect this. */
+        if (ret < 0) {
+                return -1;
+        } else if (ret > 0) {
+                return 1;
+        } else {
+                return 0;
+        }
 }
 
@@ -353 +363 @@
 void *posix_realloc(void *ptr, size_t size)
 {
-        return realloc(ptr, size);
+        if (ptr != NULL && size == 0) {
+                /* Native realloc does not handle this special case. */
+                free(ptr);
+                return NULL;
+        } else {
+                return realloc(ptr, size);
+        }
 }