From f3c7d7fbdea1f2bac81909116ddb747a1f8abdf5 Mon Sep 17 00:00:00 2001 From: Anton Kling Date: Wed, 22 Nov 2023 00:47:55 +0100 Subject: Meta: Cleanup of header files such that they are partially shared The /include directory contains definitons that both the kernel and libc need to be in sync. --- userland/libc/include/stdio.h | 3 +-- userland/libc/include/stdlib.h | 1 + userland/libc/include/sys/socket.h | 1 + userland/libc/include/sys/stat.h | 31 ------------------------------- userland/libc/include/sys/types.h | 28 ---------------------------- userland/libc/include/syscall.h | 2 -- 6 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 userland/libc/include/sys/stat.h delete mode 100644 userland/libc/include/sys/types.h (limited to 'userland/libc/include') diff --git a/userland/libc/include/stdio.h b/userland/libc/include/stdio.h index aafae78..43700e0 100644 --- a/userland/libc/include/stdio.h +++ b/userland/libc/include/stdio.h @@ -3,6 +3,7 @@ #include #include #include +#include // FIXME: Most of these should probably not be here. But I am too lazy // to fix it right now. This is futures mees problem to deal wth. @@ -56,8 +57,6 @@ extern FILE *__stderr_FILE; #define stdout __stdout_FILE #define stderr __stderr_FILE -typedef int mode_t; - void perror(const char *s); int putchar(int c); diff --git a/userland/libc/include/stdlib.h b/userland/libc/include/stdlib.h index c88f2f3..0c3d0f4 100644 --- a/userland/libc/include/stdlib.h +++ b/userland/libc/include/stdlib.h @@ -29,4 +29,5 @@ int system(const char *command); double atof(const char *str); double strtod(const char *restrict nptr, char **restrict endptr); int atoi(const char *str); +char *realpath(const char *filename, char *resolvedname); #endif diff --git a/userland/libc/include/sys/socket.h b/userland/libc/include/sys/socket.h index c4f10e2..7a2cc23 100644 --- a/userland/libc/include/sys/socket.h +++ b/userland/libc/include/sys/socket.h @@ -7,3 +7,4 @@ size_t recvfrom(int socket, void *buffer, size_t length, int flags, struct sockaddr *address, socklen_t *address_len); size_t sendto(int socket, const void *message, size_t length, int flags, const struct sockaddr *dest_addr, socklen_t dest_len); +int listen(int socket, int backlog); diff --git a/userland/libc/include/sys/stat.h b/userland/libc/include/sys/stat.h deleted file mode 100644 index 178d014..0000000 --- a/userland/libc/include/sys/stat.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef STAT_H -#define STAT_H -#include -#include - -struct stat { - dev_t st_dev; // Device ID of device containing file. - ino_t st_ino; // File serial number. - mode_t st_mode; // Mode of file (see below). - nlink_t st_nlink; // Number of hard links to the file. - uid_t st_uid; // User ID of file. - gid_t st_gid; // Group ID of file. - dev_t st_rdev; // Device ID (if file is character or block special). - off_t st_size; // For regular files, the file size in bytes. - // For symbolic links, the length in bytes of the - // pathname contained in the symbolic link. - // For a shared memory object, the length in bytes. - // For a typed memory object, the length in bytes. - // For other file types, the use of this field is - // unspecified. - struct timespec st_atime; // Last data access timestamp. - struct timespec st_mtime; // Last data modification timestamp. - struct timespec st_ctime; // Last file status change timestamp. - blksize_t st_blksize; // A file system-specific preferred I/O block size - // for this object. In some file system types, this - // may vary from file to file. - blkcnt_t st_blocks; // Number of blocks allocated for this object. -}; -int stat(const char *path, struct stat *buf); -int mkdir(const char *path, mode_t mode); -#endif diff --git a/userland/libc/include/sys/types.h b/userland/libc/include/sys/types.h deleted file mode 100644 index 48c57f9..0000000 --- a/userland/libc/include/sys/types.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef TYPES_H -#define TYPES_H -typedef unsigned int ino_t; - -typedef int mode_t; - -typedef int nlink_t; -typedef int uid_t; -typedef int gid_t; -typedef int id_t; - -typedef int blkcnt_t; -typedef int off_t; - -typedef int dev_t; -typedef unsigned int fsblkcnt_t; -typedef unsigned int fsfilcnt_t; -typedef unsigned int ino_t; -//typedef unsigned int size_t; - -typedef int blksize_t; -typedef int pid_t; -typedef int ssize_t; - -//typedef int clock_t; -typedef int time_t; -typedef unsigned int suseconds_t; -#endif diff --git a/userland/libc/include/syscall.h b/userland/libc/include/syscall.h index 135c669..c09eafb 100644 --- a/userland/libc/include/syscall.h +++ b/userland/libc/include/syscall.h @@ -55,8 +55,6 @@ extern int errno; return c; \ } -typedef int mode_t; - typedef struct SYS_OPEN_PARAMS { const char *file; int flags; -- cgit v1.2.3