Changes in uspace/lib/posix/stdlib.c [cc3652db:823a929] in mainline

File:

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

uspace/lib/posix/stdlib.c

@@ -37 +37 @@
 
 #include "stdlib.h"
-#include "libc/sort.h"
-#include "libc/str.h"
-#include "libc/vfs/vfs.h"
 #include "internal/common.h"
-#include <errno.h>  // FIXME: use POSIX errno
 
 /**
@@ -58 +54 @@
 /**
  * 
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-int posix_abs(int i)
-{
-        return i < 0 ? -i : i;
-}
-
-/**
- * 
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-long posix_labs(long i)
-{
-        return i < 0 ? -i : i;
-}
-
-/**
- * 
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-long long posix_llabs(long long i)
-{
-        return i < 0 ? -i : i;
-}
-
-posix_div_t posix_div(int numer, int denom)
-{
-        return (posix_div_t) { .quot = numer / denom, .rem = numer % denom };
-}
-
-posix_ldiv_t posix_ldiv(long numer, long denom)
-{
-        return (posix_ldiv_t) { .quot = numer / denom, .rem = numer % denom };
-}
-
-posix_lldiv_t posix_lldiv(long long numer, long long denom)
-{
-        return (posix_lldiv_t) { .quot = numer / denom, .rem = numer % denom };
-}
-
-/**
- * Private helper function that serves as a compare function for qsort().
- *
- * @param elem1 First element to compare.
- * @param elem2 Second element to compare.
- * @param compare Comparison function without userdata parameter.
- *
- * @return Relative ordering of the elements.
- */
-static int sort_compare_wrapper(void *elem1, void *elem2, void *userdata)
-{
-        int (*compare)(const void *, const void *) = userdata;
-        return compare(elem1, elem2);
-}
-
-/**
- * Array sorting utilizing the quicksort algorithm.
- *
  * @param array
  * @param count
@@ -124 +59 @@
  * @param compare
  */
+int posix_abs(int i)
+{
+        // TODO
+        not_implemented();
+}
+
+/**
+ *
+ * @param array
+ * @param count
+ * @param size
+ * @param compare
+ */
 void posix_qsort(void *array, size_t count, size_t size,
     int (*compare)(const void *, const void *))
 {
-        /* Implemented in libc with one extra argument. */
-        qsort(array, count, size, sort_compare_wrapper, compare);
-}
-
-/**
- * Binary search in a sorted array.
- *
- * @param key Object to search for.
- * @param base Pointer to the first element of the array.
- * @param nmemb Number of elements in the array.
- * @param size Size of each array element.
- * @param compar Comparison function.
- * @return Pointer to a matching element, or NULL if none can be found.
- */
-void *posix_bsearch(const void *key, const void *base,
-    size_t nmemb, size_t size, int (*compar)(const void *, const void *))
-{
-        while (nmemb > 0) {
-                const void *middle = base + (nmemb / 2) * size;
-                int cmp = compar(key, middle);
-                if (cmp == 0) {
-                        return (void *) middle;
-                }
-                if (middle == base) {
-                        /* There is just one member left to check and it
-                         * didn't match the key. Avoid infinite loop.
-                         */
-                        break;
-                }
-                if (cmp < 0) {
-                        nmemb = nmemb / 2;
-                } else if (cmp > 0) {
-                        nmemb = nmemb - (nmemb / 2);
-                        base = middle;
-                }
-        }
-        
-        return NULL;
-}
-
-/**
- * Retrieve a value of the given environment variable.
- * Since HelenOS doesn't support env variables at the moment,
- * this function always returns NULL.
+        // TODO
+        not_implemented();
+}
+
+/**
  *
  * @param name
- * @return Always NULL.
+ * @return
  */
 char *posix_getenv(const char *name)
 {
-        return NULL;
+        // TODO
+        not_implemented();
 }
 
@@ -193 +103 @@
 
 /**
- *
- * @param string String to be passed to a command interpreter.
- * @return
- */
-int posix_system(const char *string) {
-        // TODO: does nothing at the moment
-        return 0;
-}
-
-/**
  * 
  * @param name
@@ -210 +110 @@
 char *posix_realpath(const char *name, char *resolved)
 {
-        #ifndef PATH_MAX
-                assert(resolved == NULL);
-        #endif
-        
-        if (name == NULL) {
-                errno = EINVAL;
-                return NULL;
-        }
-        
-        // TODO: symlink resolution
-        
-        /* Function absolutize is implemented in libc and declared in vfs.h.
-         * No more processing is required as HelenOS doesn't have symlinks
-         * so far (as far as I can tell), although this function will need
-         * to be updated when that support is implemented.
-         */
-        char* absolute = absolutize(name, NULL);
-        
-        if (absolute == NULL) {
-                /* POSIX requires some specific errnos to be set
-                 * for some cases, but there is no way to find out from
-                 * absolutize().
-                 */
-                errno = EINVAL;
-                return NULL;
-        }
-        
-        if (resolved == NULL) {
-                return absolute;
-        } else {
-                #ifdef PATH_MAX
-                        str_cpy(resolved, PATH_MAX, absolute);
-                #endif
-                free(absolute);
-                return resolved;
-        }
+        // TODO
+        not_implemented();
 }
 
@@ -253 +119 @@
  *
  * @param nptr
- * @return
- */
-double posix_atof(const char *nptr)
-{
-        return posix_strtod(nptr, NULL);
+ * @param endptr
+ * @return
+ */
+float posix_strtof(const char *restrict nptr, char **restrict endptr)
+{
+        return (float) posix_strtold(nptr, endptr);
 }
 
@@ -268 +135 @@
  * @return
  */
-float posix_strtof(const char *restrict nptr, char **restrict endptr)
-{
-        return (float) posix_strtold(nptr, endptr);
-}
-
-/**
- * Converts a string representation of a floating-point number to
- * its native representation. See posix_strtold().
- *
- * @param nptr
- * @param endptr
- * @return
- */
 double posix_strtod(const char *restrict nptr, char **restrict endptr)
 {
         return (double) posix_strtold(nptr, endptr);
+}
+
+/**
+ * 
+ * @param str
+ * @return
+ */
+int posix_atoi(const char *str)
+{
+        // TODO
+        not_implemented();
 }