Changeset 102a729 in mainline

Timestamp:

2011-07-20T19:43:22Z (13 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.

Location:

uspace/lib/posix

Files:

• stdlib.c (modified) (3 diffs)
• stdlib/strtol.c (modified) (1 diff)
• stdlib/strtold.c (modified) (1 diff)

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);
+        }
 }
 

uspace/lib/posix/stdlib/strtol.c

@@ -190 +190 @@
                                 /* overflow */
                                 errno = ERANGE;
-                                result = max_value;
+                                result = real_max_value;
                                 break;
                         }

uspace/lib/posix/stdlib/strtold.c

@@ -547 +547 @@
                 
                 if (endptr != NULL) {
-                        *endptr = (char *) &nptr[i + 3];
-                }
-                errno = ERANGE;
-                return negative ? -0.0l : +0.0l;
+                        *endptr = (char *) nptr;
+                }
+                errno = EINVAL;
+                return 0;
         }