libc: Add setenv/getenv

8 files changed, 134 insertions, 13 deletions

diff --git a/userland/libc/Makefile b/userland/libc/Makefile
index 19dabe6..e56f2cf 100644
--- a/userland/libc/Makefile
+++ b/userland/libc/Makefile
@@ -2,7 +2,7 @@ CC="i686-sb-gcc"
 AR="i686-sb-ar"
 AS="i686-sb-as"
 CFLAGS = -ggdb -ffreestanding -O2 -Wall -Wextra -pedantic -Werror -Wimplicit-fallthrough -I./include/ -static -I../../include/ -Wno-int-conversion -Wno-unused-parameter
-OBJ=crt0.o libc.o malloc/malloc.o pty.o sys/mman/mmap.o sys/mman/munmap.o memset.o assert.o stdio/snprintf.o stdio/vfprintf.o string/memcpy.o string/memcmp.o string/strcmp.o ubsan.o string/strcpy.o isspace.o stdio/puts.o stdio/putchar.o dirent/opendir.o dirent/readdir.o dirent/closedir.o unistd/getopt.o dirent/scandir.o dirent/alphasort.o stdio/printf.o stdio/vdprintf.o stdio/vprintf.o stdio/dprintf.o stdio/vprintf.o string/strlen.o string/strnlen.o stdio/stdin.o stdio/getchar.o stdio/fgetc.o arpa/inet/htons.o arpa/inet/htonl.o stdio/fread.o stdio/fwrite.o stdio/fopen.o stdio/fclose.o stdio/fseek.o ctype/isascii.o stdio/fprintf.o stdlib/atoi.o stdlib/strtol.o ctype/toupper.o ctype/tolower.o string/strcat.o string/strchr.o string/sscanf.o sys/stat/stat.o stdlib/getenv.o string/strrchr.o stdio/ftell.o stdio/tmpfile.o stdio/fgets.o stdio/feof.o stdio/fscanf.o stdio/ungetc.o string/strncmp.o stdio/fputc.o string/strncpy.o stdio/remove.o stdio/ferror.o stdio/fputs.o stdlib/rand.o stdlib/srand.o unistd/getpid.o stdlib/strtoul.o stdio/fflush.o stdlib/abort.o string/strcspn.o time/localtime.o time/time.o time/clock_gettime.o time/gmtime.o time/strftime.o string/strpbrk.o ctype/isdigit.o ctype/isalpha.o ctype/isxdigit.o ctype/ispunct.o stdio/setvbuf.o stdio/fileno.o stdio/putc.o stdio/sprintf.o stdlib/abs.o string/strspn.o stdlib/qsort.o string/memmove.o setjmp/longjmp.o setjmp/setjmp.o libgen/basename.o string/strdup.o string/strndup.o string/strlcpy.o stdlib/atexit.o stdio/open_memstream.o libgen/dirname.o unistd/unlink.o string/strstr.o string/strcasecmp.o string/strncasecmp.o stdlib/mkstemp.o string/strtok.o unistd/execvp.o unistd/_exit.o ctype/isalnum.o time/ctime_r.o stdlib/strtold.o sys/time/gettimeofday.o stdio/fgetpos.o stdio/fsetpos.o ctype/isprint.o stdlib/system.o stdio/tmpnam.o unistd/msleep.o stdlib/atof.o stdlib/strtod.o stdio/rename.o sys/stat/mkdir.o unistd/uptime.o unistd/ftruncate.o sys/socket/recvfrom.o sys/socket/sendto.o signal/kill.o signal/sigaction.o unistd/chdir.o unistd/getcwd.o stdio/getdelim.o stdio/getline.o unistd/isatty.o sys/socket/listen.o stdlib/realpath.o systemcall.o sys/random/randomfill.o fcntl/open.o unistd/write.o unistd/pwrite.o tb/sb.o tb/sv.o string/memchr.o stdlib/atol.o stdlib/atoll.o stdlib/strtoll.o sys/stat/fstat.o unistd/lseek.o ctype/isupper.o ctype/islower.o ctype/isblank.o ctype/isgraph.o ctype/iscntrl.o math/ldexp.o sys/socket/connect.o sys/socket/setsockopt.o arpa/inet/ntohl.o arpa/inet/ntohs.o netdb/getaddrinfo.o tb/sha1.o sys/socket/getpeername.o fcntl/fcntl.o queue.o sys/sendfile.o stdio/fdopen.o unistd/dup.o
+OBJ=crt1.o crti.o crtn.o libc.o malloc/malloc.o pty.o sys/mman/mmap.o sys/mman/munmap.o memset.o assert.o stdio/snprintf.o stdio/vfprintf.o string/memcpy.o string/memcmp.o string/strcmp.o ubsan.o string/strcpy.o isspace.o stdio/puts.o stdio/putchar.o dirent/opendir.o dirent/readdir.o dirent/closedir.o unistd/getopt.o dirent/scandir.o dirent/alphasort.o stdio/printf.o stdio/vdprintf.o stdio/vprintf.o stdio/dprintf.o stdio/vprintf.o string/strlen.o string/strnlen.o stdio/stdin.o stdio/getchar.o stdio/fgetc.o arpa/inet/htons.o arpa/inet/htonl.o stdio/fread.o stdio/fwrite.o stdio/fopen.o stdio/fclose.o stdio/fseek.o ctype/isascii.o stdio/fprintf.o stdlib/atoi.o stdlib/strtol.o ctype/toupper.o ctype/tolower.o string/strcat.o string/strchr.o string/sscanf.o sys/stat/stat.o stdlib/getenv.o string/strrchr.o stdio/ftell.o stdio/tmpfile.o stdio/fgets.o stdio/feof.o stdio/fscanf.o stdio/ungetc.o string/strncmp.o stdio/fputc.o string/strncpy.o stdio/remove.o stdio/ferror.o stdio/fputs.o stdlib/rand.o stdlib/srand.o unistd/getpid.o stdlib/strtoul.o stdio/fflush.o stdlib/abort.o string/strcspn.o time/localtime.o time/time.o time/clock_gettime.o time/gmtime.o time/strftime.o string/strpbrk.o ctype/isdigit.o ctype/isalpha.o ctype/isxdigit.o ctype/ispunct.o stdio/setvbuf.o stdio/fileno.o stdio/putc.o stdio/sprintf.o stdlib/abs.o string/strspn.o stdlib/qsort.o string/memmove.o setjmp/longjmp.o setjmp/setjmp.o libgen/basename.o string/strdup.o string/strndup.o string/strlcpy.o stdlib/atexit.o stdio/open_memstream.o libgen/dirname.o unistd/unlink.o string/strstr.o string/strcasecmp.o string/strncasecmp.o stdlib/mkstemp.o string/strtok.o unistd/execvp.o unistd/_exit.o ctype/isalnum.o time/ctime_r.o stdlib/strtold.o sys/time/gettimeofday.o stdio/fgetpos.o stdio/fsetpos.o ctype/isprint.o stdlib/system.o stdio/tmpnam.o unistd/msleep.o stdlib/atof.o stdlib/strtod.o stdio/rename.o sys/stat/mkdir.o unistd/uptime.o unistd/ftruncate.o sys/socket/recvfrom.o sys/socket/sendto.o signal/kill.o signal/sigaction.o unistd/chdir.o unistd/getcwd.o stdio/getdelim.o stdio/getline.o unistd/isatty.o sys/socket/listen.o stdlib/realpath.o systemcall.o sys/random/randomfill.o fcntl/open.o unistd/write.o unistd/pwrite.o tb/sb.o tb/sv.o string/memchr.o stdlib/atol.o stdlib/atoll.o stdlib/strtoll.o sys/stat/fstat.o unistd/lseek.o ctype/isupper.o ctype/islower.o ctype/isblank.o ctype/isgraph.o ctype/iscntrl.o math/ldexp.o sys/socket/connect.o sys/socket/setsockopt.o arpa/inet/ntohl.o arpa/inet/ntohs.o netdb/getaddrinfo.o tb/sha1.o sys/socket/getpeername.o fcntl/fcntl.o queue.o sys/sendfile.o stdio/fdopen.o unistd/dup.o stdlib/setenv.o
 all: libc.a
 
 %.o: %.c
diff --git a/userland/libc/include/stdlib.h b/userland/libc/include/stdlib.h
index a389e8c..2dcd447 100644
--- a/userland/libc/include/stdlib.h
+++ b/userland/libc/include/stdlib.h
@@ -35,4 +35,5 @@ int atoi(const char *str);
 char *realpath(const char *filename, char *resolvedname);
 long atol(const char *nptr);
 long long atoll(const char *nptr);
+int setenv(const char *name, const char *value, int overwrite);
 #endif
diff --git a/userland/libc/include/tb/sv.h b/userland/libc/include/tb/sv.h
index 0ffe266..7062741 100644
--- a/userland/libc/include/tb/sv.h
+++ b/userland/libc/include/tb/sv.h
@@ -11,6 +11,8 @@
 #define C_TO_SV(_c_string)                                                     \
   ((struct sv){.length = strlen(_c_string), .s = (_c_string)})
 
+#define sv_length(a) ((a).length)
+
 struct sv {
   const char *s;
   size_t length;
diff --git a/userland/libc/include/unistd.h b/userland/libc/include/unistd.h
index 3f17df4..6905a18 100644
--- a/userland/libc/include/unistd.h
+++ b/userland/libc/include/unistd.h
@@ -13,7 +13,7 @@ extern char *optarg;
 
 int close(int fildes);
 int ftruncate(int fildes, size_t length);
-int execv(char *path, char **argv);
+int execv(const char *pathname, char *const argv[]);
 int pipe(int fd[2]);
 int dup(int fildes);
 int dup2(int org_fd, int new_fd);
diff --git a/userland/libc/libc.c b/userland/libc/libc.c
index 52a8f3f..f2968b5 100644
--- a/userland/libc/libc.c
+++ b/userland/libc/libc.c
@@ -179,11 +179,6 @@ int close(int fd) {
   return syscall(SYS_CLOSE, (u32)fd, 0, 0, 0, 0);
 }
 
-int execv(char *path, char **argv) {
-  struct SYS_EXEC_PARAMS args = {.path = path, .argv = argv};
-  return syscall(SYS_EXEC, (u32)&args, 0, 0, 0, 0);
-}
-
 int s_syscall(int sys);
 
 int wait(int *stat_loc) {
diff --git a/userland/libc/stdlib/getenv.c b/userland/libc/stdlib/getenv.c
index 0240d66..487ac76 100644
--- a/userland/libc/stdlib/getenv.c
+++ b/userland/libc/stdlib/getenv.c
@@ -1,7 +1,19 @@
 #include <stdlib.h>
+#include <string.h>
+
+// Defined in stdlib/setenv.c
+struct env {
+  char *name;
+  char *value;
+  struct env *next;
+};
+
+struct env *internal_getenv(const char *name);
 
 char *getenv(const char *name) {
-  (void)name;
-  // FIXME
-  return NULL;
+  struct env *p = internal_getenv(name);
+  if (!p) {
+    return NULL;
+  }
+  return p->value;
 }
diff --git a/userland/libc/stdlib/setenv.c b/userland/libc/stdlib/setenv.c
new file mode 100644
index 0000000..c3a5b68
--- /dev/null
+++ b/userland/libc/stdlib/setenv.c
@@ -0,0 +1,71 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct env {
+  char *name;
+  char *value;
+  struct env *next;
+};
+
+struct env *env_head = NULL;
+
+struct env *internal_getenv(const char *name) {
+  struct env *p = env_head;
+  for (; p; p = p->next) {
+    if (0 == strcmp(p->name, name)) {
+      return p;
+    }
+  }
+  return NULL;
+}
+
+int setenv(const char *name, const char *value, int overwrite) {
+  if (NULL == name) {
+    errno = -EINVAL;
+    return -1;
+  }
+
+  int name_length = strlen(name);
+  if (0 == name_length) {
+    errno = -EINVAL;
+    return -1;
+  }
+  int value_length = strlen(value);
+
+  struct env *p = internal_getenv(name);
+  if (p) {
+    if (!overwrite) {
+      return 0;
+    }
+    char *new_ptr = realloc(p->value, value_length + 1);
+    if (!new_ptr) {
+      errno = -ENOMEM;
+      return -1;
+    }
+    p->value = new_ptr;
+    strcpy(p->value, value);
+    return 0;
+  }
+
+  struct env *new_env = malloc(sizeof(struct env));
+  if (!new_env) {
+    return -ENOMEM;
+  }
+  new_env->name = malloc(name_length + 1);
+  if (!new_env->name) {
+    free(new_env);
+    return -ENOMEM;
+  }
+  new_env->value = malloc(value_length + 1);
+  if (!new_env->value) {
+    free(new_env->name);
+    free(new_env);
+    return -ENOMEM;
+  }
+  strcpy(new_env->name, name);
+  strcpy(new_env->value, value);
+  new_env->next = env_head;
+  env_head = new_env;
+  return 0;
+}
diff --git a/userland/libc/unistd/execvp.c b/userland/libc/unistd/execvp.c
index e38b4b7..af3ed29 100644
--- a/userland/libc/unistd/execvp.c
+++ b/userland/libc/unistd/execvp.c
@@ -1,8 +1,48 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <syscall.h>
+#include <tb/sb.h>
+#include <tb/sv.h>
 #include <unistd.h>
 
-// FIXME: Path resolution
+int execv(const char *pathname, char *const argv[]) {
+  struct SYS_EXEC_PARAMS args = {.path = pathname, .argv = (char **)argv};
+  RC_ERRNO(syscall(SYS_EXEC, &args, 0, 0, 0, 0));
+}
+
 int execvp(const char *file, char *const argv[]) {
-  struct SYS_EXEC_PARAMS args = {.path = file, .argv = (char **)argv};
-  return syscall(SYS_EXEC, &args, 0, 0, 0, 0);
+  if ('/' == *file) {
+    return execv(file, argv);
+  }
+
+  char *p = getenv("PATH");
+  if (!p) {
+    errno = ENOENT;
+    return -1;
+  }
+
+  struct sv paths = C_TO_SV(p);
+
+  struct sb builder;
+  sb_init(&builder);
+  for (;;) {
+    struct sv path = sv_split_delim(paths, &paths, ':');
+    if (0 == sv_length(path)) {
+      break;
+    }
+    sb_reset(&builder);
+    sb_append_sv(&builder, path);
+    sb_append(&builder, "/");
+    sb_append(&builder, file);
+    sb_append_buffer(&builder, "\0", 1);
+
+    if (-1 == execv(builder.string, argv)) {
+      continue;
+    }
+  }
+  sb_free(&builder);
+  errno = ENOENT;
+  return -1;
 }