Changeset 75c430e3 in mainline

Timestamp:

2018-06-19T11:48:03Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

47be512

Parents:

6c440362

git-author:

Jiri Svoboda <jiri@…> (2018-06-18 17:47:07)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-19 11:48:03)

Message:

Bsearch, getenv, system need to go to libc. (although we might eventually want different implementation for POSIX mode.)

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/bsearch.c (added)
• c/generic/stdlib.c (modified) (1 diff)
• c/include/bsearch.h (added)
• c/include/stdlib.h (modified) (3 diffs)
• c/test/stdlib.c (modified) (1 diff)
• posix/include/posix/stdlib.h (modified) (1 diff)
• posix/src/stdlib.c (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -163 +163 @@
         generic/stats.c \
         generic/assert.c \
+        generic/bsearch.c \
         generic/pio_trace.c \
         generic/qsort.c \

uspace/lib/c/generic/stdlib.c

@@ -166 +166 @@
 }
 
+/** Get environment list entry.
+ *
+ * Note that this function is not reentrant. The returned string is only
+ * guaranteed to be valid until the next call to @c getenv.
+ *
+ * @param name Entry name
+ * @return Pointer to string or @c NULL if not found
+ */
+char *getenv(const char *name)
+{
+        (void) name;
+        return NULL;
+}
+
+/** Execute command.
+ *
+ * @param string Command to execute or @c NULL
+ *
+ * @return If @a string is @c NULL, return zero (no command processor
+ *         available). If @a string is not @c NULL, return 1 (failure).
+ */
+int system(const char *string)
+{
+        if (string == NULL)
+                return 0;
+
+        return 1;
+}
 
 /** Compute quotient and remainder of int division.

uspace/lib/c/include/stdlib.h

@@ -38 +38 @@
 #include <_bits/size_t.h>
 #include <_bits/wchar_t.h>
+#include <bsearch.h>
 #include <malloc.h>
 #include <qsort.h>
@@ -74 +75 @@
 
 extern int rand(void);
-extern void srand(unsigned int seed);
+extern void srand(unsigned int);
 
 extern void abort(void) __attribute__((noreturn));
@@ -82 +83 @@
 extern int at_quick_exit(void (*)(void));
 extern void quick_exit(int);
+
+extern char *getenv(const char *);
+extern int system(const char *);
 
 extern int atoi(const char *);

uspace/lib/c/test/stdlib.c

@@ -282 +282 @@
 }
 
+/** getenv function */
+PCUT_TEST(getenv)
+{
+        char *s;
+
+        s = getenv("FOO");
+        PCUT_ASSERT_NULL(s);
+}
+
+/** Test availability of command processor */
+PCUT_TEST(system_null)
+{
+        int rc;
+
+        rc = system(NULL);
+        PCUT_ASSERT_INT_EQUALS(0, rc);
+}
+
+/** Test running a command */
+PCUT_TEST(system_cmd)
+{
+        int rc;
+
+        /* This should fail as system is just a stub */
+        rc = system("/app/bdsh");
+        PCUT_ASSERT_INT_EQUALS(1, rc);
+}
+
+/** Comparison function for bsearch test */
+static int test_compar(const void *a, const void *b)
+{
+        const int *ia, *ib;
+
+        ia = (const int *)a;
+        ib = (const int *)b;
+
+        return *ia - *ib;
+}
+
+PCUT_TEST(bsearch)
+{
+        int numbers[] = { 1, 2, 6, 7, 7, 10, 100, 120 };
+        int k;
+        void *r;
+
+        k = 0;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NULL(r);
+
+        k = 1;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NOT_NULL(r);
+        PCUT_ASSERT_INT_EQUALS(1, *(int *)r);
+
+        k = 3;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NULL(r);
+
+        k = 6;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NOT_NULL(r);
+        PCUT_ASSERT_INT_EQUALS(6, *(int *)r);
+
+        k = 7;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NOT_NULL(r);
+        PCUT_ASSERT_INT_EQUALS(7, *(int *)r);
+
+        k = 200;
+        r = bsearch(&k, numbers, sizeof(numbers) / sizeof(int), sizeof(int),
+            test_compar);
+        PCUT_ASSERT_NULL(r);
+}
+
 /** Integer division */
 PCUT_TEST(div_func)

uspace/lib/posix/include/posix/stdlib.h

@@ -47 +47 @@
 extern long long llabs(long long i);
 
-/* Array Functions */
-extern void *bsearch(const void *key, const void *base,
-    size_t nmemb, size_t size, int (*compar)(const void *, const void *));
-
 /* Environment Access */
-extern char *getenv(const char *name);
 extern int putenv(char *string);
-extern int system(const char *string);
 
 /* Symbolic Links */

uspace/lib/posix/src/stdlib.c

@@ -84 +84 @@
 
 /**
- * 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 *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.
- *
- * @param name Name of the variable.
- * @return Value of the variable or NULL if such variable does not exist.
- */
-char *getenv(const char *name)
-{
-        return NULL;
-}
-
-/**
  *
  * @param name
@@ -143 +92 @@
 {
         // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
-        return 0;
-}
-
-/**
- * Issue a command.
- *
- * @param string String to be passed to a command interpreter or NULL.
- * @return Termination status of the command if the command is not NULL,
- *     otherwise indicate whether there is a command interpreter (non-zero)
- *     or not (zero).
- */
-int system(const char *string)
-{
-        // TODO: does nothing at the moment
         not_implemented();
         return 0;