summaryrefslogtreecommitdiff
path: root/userland
diff options
context:
space:
mode:
Diffstat (limited to 'userland')
-rw-r--r--userland/libc/Makefile2
-rw-r--r--userland/libc/include/signal.h45
-rw-r--r--userland/libc/include/syscall.h2
-rw-r--r--userland/libc/signal/kill.c4
-rw-r--r--userland/libc/signal/sigaction.c7
5 files changed, 58 insertions, 2 deletions
diff --git a/userland/libc/Makefile b/userland/libc/Makefile
index bcb82f8..c755b94 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 -pedantic -Wimplicit-fallthrough -I./include/ -static
-OBJ=crt0.o libc.o malloc/malloc.o pty.o sys/mman/mmap.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
+OBJ=crt0.o libc.o malloc/malloc.o pty.o sys/mman/mmap.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
all: libc.a
%.o: %.c
diff --git a/userland/libc/include/signal.h b/userland/libc/include/signal.h
index 2e6566d..621710b 100644
--- a/userland/libc/include/signal.h
+++ b/userland/libc/include/signal.h
@@ -1,9 +1,52 @@
#ifndef SIGNAL_H
#define SIGNAL_H
+#include <sys/types.h>
#define SIGHUP 0
#define SIGINT 1
#define SIGWINCH 2
#define SIGQUIT 3
#define SIG_IGN 4
-typedef int sig_atomic_t;
+#define SIGSEGV 5
+#define SIGILL 6
+#define SIGABRT 7
+#define SIGBUS 8
+#define SIGKILL 9
+#define SIGFPE 10
+
+typedef int pid_t;
+typedef int sigset_t;
+
+union sigval {
+ int sival_int; // Integer signal value.
+ void *sival_ptr; // Pointer signal value.
+};
+
+struct siginfo {
+ int si_signo; // Signal number.
+ int si_code; // Signal code.
+ int si_errno; // If non-zero, an errno value associated with
+ // this signal, as described in <errno.h>.
+ pid_t si_pid; // Sending process ID.
+ uid_t si_uid; // Real user ID of sending process.
+ void *si_addr; // Address of faulting instruction.
+ int si_status; // Exit value or signal.
+ long si_band; // Band event for SIGPOL9
+ union sigval si_value; // Signal value.
+};
+
+typedef struct siginfo siginfo_t;
+
+int kill(pid_t pid, int sig);
+
+struct sigaction {
+ void (*sa_handler)(int); // Pointer to a signal-catching function or one of
+ // the macros SIG_IGN or SIG_DFL.
+ sigset_t sa_mask; // Additional set of signals to be blocked during execution
+ // of signal-catching function.
+ int sa_flags; // Special flags to affect behavior of signal.
+ void (*sa_sigaction)(int, siginfo_t *,
+ void *); // Pointer to a signal-catching function.
+};
+
+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact);
#endif // SIGNAL_H
diff --git a/userland/libc/include/syscall.h b/userland/libc/include/syscall.h
index 3af425d..3faafbf 100644
--- a/userland/libc/include/syscall.h
+++ b/userland/libc/include/syscall.h
@@ -34,6 +34,8 @@
#define SYS_MKDIR 26
#define SYS_RECVFROM 27
#define SYS_SENDTO 28
+#define SYS_KILL 29
+#define SYS_SIGACTION 30
int syscall(uint32_t eax, uint32_t ebx, uint32_t ecx, uint32_t edx,
uint32_t esi, uint32_t edi);
diff --git a/userland/libc/signal/kill.c b/userland/libc/signal/kill.c
new file mode 100644
index 0000000..3351baa
--- /dev/null
+++ b/userland/libc/signal/kill.c
@@ -0,0 +1,4 @@
+#include <signal.h>
+#include <syscall.h>
+
+int kill(pid_t pid, int sig) { RC_ERRNO(syscall(SYS_KILL, pid, sig, 0, 0, 0)) }
diff --git a/userland/libc/signal/sigaction.c b/userland/libc/signal/sigaction.c
new file mode 100644
index 0000000..1ff22a7
--- /dev/null
+++ b/userland/libc/signal/sigaction.c
@@ -0,0 +1,7 @@
+#include <signal.h>
+#include <syscall.h>
+
+int sigaction(int sig, const struct sigaction *act,
+ struct sigaction *oact) {
+ RC_ERRNO(syscall(SYS_SIGACTION, sig, act, oact, 0,0))
+}