From: Lunaixsky Date: Mon, 5 May 2025 14:10:48 +0000 (+0100) Subject: renamed and cleaned up export header files to match linux convention X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/commitdiff_plain/refs/heads/eme/usr-header-gen?hp=084eac3d5fa7deeab2296cf20653f4f7b3f75cd0 renamed and cleaned up export header files to match linux convention --- diff --git a/lunaix-os/hal/term/term.c b/lunaix-os/hal/term/term.c index a71f93c..59b7ebe 100644 --- a/lunaix-os/hal/term/term.c +++ b/lunaix-os/hal/term/term.c @@ -7,7 +7,7 @@ #include #include -#include +#include LOG_MODULE("term"); diff --git a/lunaix-os/includes/hal/term.h b/lunaix-os/includes/hal/term.h index be7abd0..07acec9 100644 --- a/lunaix-os/includes/hal/term.h +++ b/lunaix-os/includes/hal/term.h @@ -4,8 +4,8 @@ #include #include #include -#include +#include #include struct term; diff --git a/lunaix-os/includes/lunaix/foptions.h b/lunaix-os/includes/lunaix/foptions.h index 38b055a..3ed7592 100644 --- a/lunaix-os/includes/lunaix/foptions.h +++ b/lunaix-os/includes/lunaix/foptions.h @@ -1,6 +1,6 @@ #ifndef __LUNAIX_FOPTIONS_H #define __LUNAIX_FOPTIONS_H -#include +#include #endif /* __LUNAIX_FOPTIONS_H */ diff --git a/lunaix-os/includes/lunaix/fs/api.h b/lunaix-os/includes/lunaix/fs/api.h index e9c1437..81aaa56 100644 --- a/lunaix-os/includes/lunaix/fs/api.h +++ b/lunaix-os/includes/lunaix/fs/api.h @@ -2,11 +2,11 @@ #define __LUNAIX_FSAPI_H #include -#include #include #include -#include +#include +#include struct fsapi_vsb_ops { diff --git a/lunaix-os/includes/lunaix/ioctl.h b/lunaix-os/includes/lunaix/ioctl.h index ed7c4f7..0b8f0ac 100644 --- a/lunaix-os/includes/lunaix/ioctl.h +++ b/lunaix-os/includes/lunaix/ioctl.h @@ -1,6 +1,6 @@ #ifndef __LUNAIX_IOCTL_H #define __LUNAIX_IOCTL_H -#include +#include #endif /* __LUNAIX_IOCTL_H */ diff --git a/lunaix-os/includes/lunaix/mm/mm.h b/lunaix-os/includes/lunaix/mm/mm.h index abb18cf..742ee1d 100644 --- a/lunaix-os/includes/lunaix/mm/mm.h +++ b/lunaix-os/includes/lunaix/mm/mm.h @@ -6,7 +6,7 @@ #include -#include +#include /** * @brief 私有区域，该区域中的页无法进行任何形式的共享。 diff --git a/lunaix-os/includes/lunaix/process.h b/lunaix-os/includes/lunaix/process.h index 868a9fc..a9f307c 100644 --- a/lunaix-os/includes/lunaix/process.h +++ b/lunaix-os/includes/lunaix/process.h @@ -15,6 +15,8 @@ #include #include +#include + #include diff --git a/lunaix-os/includes/lunaix/signal.h b/lunaix-os/includes/lunaix/signal.h index 556823b..6372325 100644 --- a/lunaix-os/includes/lunaix/signal.h +++ b/lunaix-os/includes/lunaix/signal.h @@ -2,7 +2,7 @@ #define __LUNAIX_SIGNAL_H #include -#include +#include #define _SIG_NUM 16 diff --git a/lunaix-os/includes/lunaix/types.h b/lunaix-os/includes/lunaix/types.h index 6ce5fcf..c7b09e8 100644 --- a/lunaix-os/includes/lunaix/types.h +++ b/lunaix-os/includes/lunaix/types.h @@ -1,33 +1,39 @@ #ifndef __LUNAIX_TYPES_H #define __LUNAIX_TYPES_H +#include #include #include -#include #include -// TODO: WTERMSIG - -// TODO: replace the integer type with these. To make thing more portable. +#undef NULL +#define NULL (void*)0 -typedef unsigned char u8_t; -typedef unsigned short u16_t; -typedef unsigned int u32_t; -typedef unsigned long ptr_t; -typedef unsigned long reg_t; +typedef unsigned char u8_t; +typedef unsigned short u16_t; +typedef unsigned int u32_t; #ifndef CONFIG_ARCH_BITS_64 -typedef unsigned long long u64_t; +typedef unsigned long long u64_t; #else -typedef unsigned long u64_t; +typedef unsigned long u64_t; #endif -typedef int pid_t; -typedef signed long ssize_t; +typedef __lunaix_pid_t pid_t; +typedef __lunaix_tid_t tid_t; +typedef __lunaix_uid_t uid_t; +typedef __lunaix_gid_t gid_t; +typedef __lunaix_size_t size_t; +typedef __lunaix_ssize_t ssize_t; +typedef __lunaix_size_t off_t; +typedef __lunaix_ino_t ino_t; -typedef unsigned int cpu_t; +typedef unsigned long ptr_t; +typedef unsigned long reg_t; +typedef unsigned int cpu_t; +typedef u64_t lba_t; -typedef u64_t lba_t; +typedef __lunaix_dev_t dev_t; #define true 1 #define false 0 diff --git a/lunaix-os/includes/usr/headers b/lunaix-os/includes/usr/headers index 1a4af01..5e33d5a 100644 --- a/lunaix-os/includes/usr/headers +++ b/lunaix-os/includes/usr/headers @@ -1,14 +1,15 @@ lunaix/fstypes.h lunaix/status.h -lunaix/fcntl_defs.h -lunaix/signal_defs.h +lunaix/fcntl.h +lunaix/signal.h lunaix/term.h -lunaix/mann_flags.h -lunaix/dirent_defs.h +lunaix/mman.h +lunaix/dirent.h lunaix/poll.h lunaix/types.h lunaix/serial.h lunaix/device.h -lunaix/ioctl_defs.h +lunaix/ioctl.h lunaix/threads.h lunaix/gfx.h +lunaix/wait.h diff --git a/lunaix-os/includes/usr/lunaix/device.h b/lunaix-os/includes/usr/lunaix/device.h index 9f8d2e0..4e4c419 100644 --- a/lunaix-os/includes/usr/lunaix/device.h +++ b/lunaix-os/includes/usr/lunaix/device.h @@ -1,7 +1,7 @@ -#ifndef __LUNAIX_UDEVICE_H -#define __LUNAIX_UDEVICE_H +#ifndef _LUNAIX_UHDR_UDEVICE_H +#define _LUNAIX_UHDR_UDEVICE_H -#include "ioctl_defs.h" +#include "ioctl.h" struct dev_info { @@ -20,4 +20,4 @@ struct dev_info } dev_name; }; -#endif /* __LUNAIX_UDEVICE_H */ +#endif /* _LUNAIX_UHDR_UDEVICE_H */ diff --git a/lunaix-os/includes/usr/lunaix/dirent_defs.h b/lunaix-os/includes/usr/lunaix/dirent.h similarity index 68% rename from lunaix-os/includes/usr/lunaix/dirent_defs.h rename to lunaix-os/includes/usr/lunaix/dirent.h index 9142a4d..d8342dd 100644 --- a/lunaix-os/includes/usr/lunaix/dirent_defs.h +++ b/lunaix-os/includes/usr/lunaix/dirent.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_SYS_DIRENT_DEFS_H -#define __LUNAIX_SYS_DIRENT_DEFS_H +#ifndef _LUNAIX_UHDR_SYS_DIRENT_DEFS_H +#define _LUNAIX_UHDR_SYS_DIRENT_DEFS_H #define DIRENT_NAME_MAX_LEN 256 @@ -16,4 +16,4 @@ struct lx_dirent char d_name[DIRENT_NAME_MAX_LEN]; }; -#endif /* __LUNAIX_DIRENT_DEFS_H */ +#endif /* _LUNAIX_UHDR_DIRENT_DEFS_H */ diff --git a/lunaix-os/includes/usr/lunaix/fcntl.h b/lunaix-os/includes/usr/lunaix/fcntl.h new file mode 100644 index 0000000..ba88b5b --- /dev/null +++ b/lunaix-os/includes/usr/lunaix/fcntl.h @@ -0,0 +1,68 @@ +#ifndef _LUNAIX_UHDR_SYS_FCNTL_DEFS_H +#define _LUNAIX_UHDR_SYS_FCNTL_DEFS_H + +#include "fstypes.h" +#include "types.h" + +#define FO_CREATE 0x1 +#define FO_APPEND 0x2 +#define FO_DIRECT 0x4 +#define FO_WRONLY 0x8 +#define FO_RDONLY 0x10 +#define FO_RDWR 0x20 +#define FO_TRUNC 0x40 + +#define FO_NOFOLLOW 0x10000 + +#define FSEEK_SET 0x1 +#define FSEEK_CUR 0x2 +#define FSEEK_END 0x3 + +#define O_CREAT FO_CREATE +#define O_APPEND FO_APPEND +#define O_DIRECT FO_DIRECT +#define O_WRONLY FO_WRONLY +#define O_RDONLY FO_RDONLY +#define O_RDWR FO_RDWR +#define O_TRUNC FO_TRUNC + +#define AT_SYMLINK_FOLLOW 0b0000 +#define AT_SYMLINK_NOFOLLOW 0b0001 +#define AT_FDCWD 0b0010 +#define AT_EACCESS 0b0100 + +#define R_OK 0b100100100 +#define W_OK 0b010010010 +#define X_OK 0b001001001 +#define F_OK 0b111111111 + +/* Mount with read-only flag */ +#define MNT_RO (1 << 0) + +/* Mount with block-cache-disabled flag */ +#define MNT_NC (1 << 1) + +typedef unsigned int mode_t; +typedef unsigned int nlink_t; + +struct file_stat +{ + __lunaix_dev_t st_dev; + __lunaix_ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; + __lunaix_uid_t st_uid; + __lunaix_gid_t st_gid; + __lunaix_dev_t st_rdev; + __lunaix_size_t st_size; + __lunaix_size_t st_blksize; + __lunaix_size_t st_blocks; + + unsigned long st_atim; + unsigned long st_ctim; + unsigned long st_mtim; + + __lunaix_size_t st_ioblksize; +}; + +#endif /* _LUNAIX_UHDR_FNCTL_DEFS_H */ diff --git a/lunaix-os/includes/usr/lunaix/fcntl_defs.h b/lunaix-os/includes/usr/lunaix/fcntl_defs.h deleted file mode 100644 index 36af62e..0000000 --- a/lunaix-os/includes/usr/lunaix/fcntl_defs.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef __LUNAIX_SYS_FCNTL_DEFS_H -#define __LUNAIX_SYS_FCNTL_DEFS_H - -#include "fstypes.h" -#include "types.h" - -#define FO_CREATE 0x1 -#define FO_APPEND 0x2 -#define FO_DIRECT 0x4 -#define FO_WRONLY 0x8 -#define FO_RDONLY 0x10 -#define FO_RDWR 0x20 -#define FO_TRUNC 0x40 - -#define FO_NOFOLLOW 0x10000 - -#define FSEEK_SET 0x1 -#define FSEEK_CUR 0x2 -#define FSEEK_END 0x3 - -#define O_CREAT FO_CREATE -#define O_APPEND FO_APPEND -#define O_DIRECT FO_DIRECT -#define O_WRONLY FO_WRONLY -#define O_RDONLY FO_RDONLY -#define O_RDWR FO_RDWR -#define O_TRUNC FO_TRUNC - -#define AT_SYMLINK_FOLLOW 0b0000 -#define AT_SYMLINK_NOFOLLOW 0b0001 -#define AT_FDCWD 0b0010 -#define AT_EACCESS 0b0100 - -#define R_OK 0b100100100 -#define W_OK 0b010010010 -#define X_OK 0b001001001 -#define F_OK 0b111111111 - -/* Mount with read-only flag */ -#define MNT_RO (1 << 0) - -/* Mount with block-cache-disabled flag */ -#define MNT_NC (1 << 1) - -typedef unsigned int mode_t; -typedef unsigned int nlink_t; - -struct file_stat -{ - dev_t st_dev; - ino_t st_ino; - mode_t st_mode; - nlink_t st_nlink; - uid_t st_uid; - gid_t st_gid; - dev_t st_rdev; - off_t st_size; - size_t st_blksize; - size_t st_blocks; - - unsigned long st_atim; - unsigned long st_ctim; - unsigned long st_mtim; - - size_t st_ioblksize; -}; - -#endif /* __LUNAIX_FNCTL_DEFS_H */ diff --git a/lunaix-os/includes/usr/lunaix/fstypes.h b/lunaix-os/includes/usr/lunaix/fstypes.h index 680a822..9bbd428 100644 --- a/lunaix-os/includes/usr/lunaix/fstypes.h +++ b/lunaix-os/includes/usr/lunaix/fstypes.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_FSTYPES_H -#define __LUNAIX_FSTYPES_H +#ifndef _LUNAIX_UHDR_FSTYPES_H +#define _LUNAIX_UHDR_FSTYPES_H /* 7 6 5 4 3 2 1 0 @@ -20,4 +20,4 @@ #define F_PIPE 0b00010000 #define F_SYMLINK 0b00100000 -#endif /* __LUNAIX_FSTYPES_H */ +#endif /* _LUNAIX_UHDR_FSTYPES_H */ diff --git a/lunaix-os/includes/usr/lunaix/gfx.h b/lunaix-os/includes/usr/lunaix/gfx.h index e583be1..6c5e5d8 100644 --- a/lunaix-os/includes/usr/lunaix/gfx.h +++ b/lunaix-os/includes/usr/lunaix/gfx.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_UGFX_H -#define __LUNAIX_UGFX_H +#ifndef _LUNAIX_UHDR_UGFX_H +#define _LUNAIX_UHDR_UGFX_H #define GFX_CMDA(type, cmd_id) (((type) << 8) | ((cmd_id) & 0xf)) @@ -41,4 +41,4 @@ struct gfxa_clut size_t len; }; -#endif /* __LUNAIX_UGFX_H */ +#endif /* _LUNAIX_UHDR_UGFX_H */ diff --git a/lunaix-os/includes/usr/lunaix/ioctl_defs.h b/lunaix-os/includes/usr/lunaix/ioctl.h similarity index 83% rename from lunaix-os/includes/usr/lunaix/ioctl_defs.h rename to lunaix-os/includes/usr/lunaix/ioctl.h index dd5709f..44254b9 100644 --- a/lunaix-os/includes/usr/lunaix/ioctl_defs.h +++ b/lunaix-os/includes/usr/lunaix/ioctl.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_SYS_IOCTL_DEFS_H -#define __LUNAIX_SYS_IOCTL_DEFS_H +#ifndef _LUNAIX_UHDR_SYS_IOCTL_H +#define _LUNAIX_UHDR_SYS_IOCTL_H #define IOREQ(cmd, arg_num) ((((cmd) & 0xffff) << 8) | ((arg_num) & 0xff)) @@ -22,4 +22,4 @@ #define TIMERIO_GETINFO IOREQ(1, 0) -#endif /* __LUNAIX_IOCTL_DEFS_H */ +#endif /* _LUNAIX_UHDR_IOCTL_H */ diff --git a/lunaix-os/includes/usr/lunaix/mann_flags.h b/lunaix-os/includes/usr/lunaix/mman.h similarity index 88% rename from lunaix-os/includes/usr/lunaix/mann_flags.h rename to lunaix-os/includes/usr/lunaix/mman.h index dcd3a34..8f9641d 100644 --- a/lunaix-os/includes/usr/lunaix/mann_flags.h +++ b/lunaix-os/includes/usr/lunaix/mman.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_SYS_MANN_FLAGS_H -#define __LUNAIX_SYS_MANN_FLAGS_H +#ifndef _LUNAIX_UHDR_SYS_MMAN_H +#define _LUNAIX_UHDR_SYS_MMAN_H // POSIX compliant. @@ -40,4 +40,4 @@ struct usr_mmap_param unsigned long offset; }; -#endif /* __LUNAIX_MANN_FLAGS_H */ +#endif /* _LUNAIX_UHDR_MMAN_H */ diff --git a/lunaix-os/includes/usr/lunaix/poll.h b/lunaix-os/includes/usr/lunaix/poll.h index 8fed581..6263156 100644 --- a/lunaix-os/includes/usr/lunaix/poll.h +++ b/lunaix-os/includes/usr/lunaix/poll.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_UPOLL_H -#define __LUNAIX_UPOLL_H +#ifndef _LUNAIX_UHDR_UPOLL_H +#define _LUNAIX_UHDR_UPOLL_H struct poll_info { @@ -25,4 +25,4 @@ struct poll_info #define _POLLEE_ALWAYS 1 #define _POLLEE_RM_ON_ERR (1 << 1) -#endif /* __LUNAIX_UPOLL_H */ +#endif /* _LUNAIX_UHDR_UPOLL_H */ diff --git a/lunaix-os/includes/usr/lunaix/serial.h b/lunaix-os/includes/usr/lunaix/serial.h index 6f73155..ee10002 100644 --- a/lunaix-os/includes/usr/lunaix/serial.h +++ b/lunaix-os/includes/usr/lunaix/serial.h @@ -1,7 +1,7 @@ -#ifndef __LUNAIX_USERIAL_H -#define __LUNAIX_USERIAL_H +#ifndef _LUNAIX_UHDR_USERIAL_H +#define _LUNAIX_UHDR_USERIAL_H -#include "ioctl_defs.h" +#include "ioctl.h" #define SERIO_RXEN IOREQ(1, 0) #define SERIO_RXDA IOREQ(2, 0) @@ -13,4 +13,4 @@ #define SERIO_SETCNTRLMODE IOREQ(6, 0) #define SERIO_SETBRDBASE IOREQ(7, 0) -#endif /* __LUNAIX_USERIAL_H */ +#endif /* _LUNAIX_UHDR_USERIAL_H */ diff --git a/lunaix-os/includes/usr/lunaix/signal_defs.h b/lunaix-os/includes/usr/lunaix/signal.h similarity index 81% rename from lunaix-os/includes/usr/lunaix/signal_defs.h rename to lunaix-os/includes/usr/lunaix/signal.h index 7c8148a..18b28ee 100644 --- a/lunaix-os/includes/usr/lunaix/signal_defs.h +++ b/lunaix-os/includes/usr/lunaix/signal.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_SYS_SIGNAL_DEFS_H -#define __LUNAIX_SYS_SIGNAL_DEFS_H +#ifndef _LUNAIX_UHDR_SYS_SIGNAL_DEFS_H +#define _LUNAIX_UHDR_SYS_SIGNAL_DEFS_H #define SIGALRM 1 #define SIGCHLD 2 @@ -35,4 +35,4 @@ struct siginfo // TODO }; -#endif /* __LUNAIX_SIGNAL_DEFS_H */ +#endif /* _LUNAIX_UHDR_SIGNAL_DEFS_H */ diff --git a/lunaix-os/includes/usr/lunaix/status.h b/lunaix-os/includes/usr/lunaix/status.h index 5ba3438..4965787 100644 --- a/lunaix-os/includes/usr/lunaix/status.h +++ b/lunaix-os/includes/usr/lunaix/status.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_STATUS_H -#define __LUNAIX_STATUS_H +#ifndef _LUNAIX_UHDR_STATUS_H +#define _LUNAIX_UHDR_STATUS_H #define ENOMEM -3 #define EINVAL -6 @@ -32,4 +32,4 @@ #define EPERM -33 #define EACCESS -34 -#endif /* __LUNAIX_STATUS_H */ +#endif /* _LUNAIX_UHDR_STATUS_H */ diff --git a/lunaix-os/includes/usr/lunaix/term.h b/lunaix-os/includes/usr/lunaix/term.h index b1f6c1f..e9d7902 100644 --- a/lunaix-os/includes/usr/lunaix/term.h +++ b/lunaix-os/includes/usr/lunaix/term.h @@ -1,5 +1,5 @@ -#ifndef __LUNAIX_UTERM_H -#define __LUNAIX_UTERM_H +#ifndef _LUNAIX_UHDR_UTERM_H +#define _LUNAIX_UHDR_UTERM_H #define _BRKINT (1) #define _ICRNL (1 << 1) @@ -104,4 +104,4 @@ struct termios speed_t c_baud; }; -#endif /* __LUNAIX_UTERM_H */ +#endif /* _LUNAIX_UHDR_UTERM_H */ diff --git a/lunaix-os/includes/usr/lunaix/threads.h b/lunaix-os/includes/usr/lunaix/threads.h index a20b52f..c70e407 100644 --- a/lunaix-os/includes/usr/lunaix/threads.h +++ b/lunaix-os/includes/usr/lunaix/threads.h @@ -1,11 +1,12 @@ -#ifndef __LUNAIX_USR_THREADS_H -#define __LUNAIX_USR_THREADS_H +#ifndef _LUNAIX_UHDR_USR_THREADS_H +#define _LUNAIX_UHDR_USR_THREADS_H #include "types.h" -struct uthread_param { +struct uthread_param +{ void* th_handler; void* arg1; }; -#endif /* __LUNAIX_USR_THREADS_H */ +#endif /* _LUNAIX_UHDR_USR_THREADS_H */ diff --git a/lunaix-os/includes/usr/lunaix/types.h b/lunaix-os/includes/usr/lunaix/types.h index 3dbddb5..8a3410a 100644 --- a/lunaix-os/includes/usr/lunaix/types.h +++ b/lunaix-os/includes/usr/lunaix/types.h @@ -1,43 +1,19 @@ -#ifndef __LUNAIX_SYS_TYPES_H -#define __LUNAIX_SYS_TYPES_H - -#undef NULL -#define NULL (void*)0 -#define NULLPTR 0 - -#define PEXITTERM 0x100 -#define PEXITSTOP 0x200 -#define PEXITSIG 0x400 - -#define PEXITNUM(flag, code) (flag | (code & 0xff)) - -#define WNOHANG 1 -#define WUNTRACED 2 -#define WEXITSTATUS(wstatus) ((wstatus & 0xff)) -#define WIFSTOPPED(wstatus) ((wstatus & PEXITSTOP)) -#define WIFEXITED(wstatus) \ - ((wstatus & PEXITTERM) && ((char)WEXITSTATUS(wstatus) >= 0)) - -#define WIFSIGNALED(wstatus) ((wstatus & PEXITSIG)) - -typedef signed long ssize_t; - -typedef int pid_t; -typedef int tid_t; -typedef int uid_t; -typedef int gid_t; - -typedef __SIZE_TYPE__ size_t; - -typedef __SIZE_TYPE__ off_t; - -typedef unsigned int ino_t; - -typedef struct dev_t +#ifndef _LUNAIX_UHDR_SYS_TYPES_H +#define _LUNAIX_UHDR_SYS_TYPES_H + +typedef int __lunaix_pid_t; +typedef int __lunaix_tid_t; +typedef int __lunaix_uid_t; +typedef int __lunaix_gid_t; +typedef unsigned long __lunaix_size_t; +typedef signed long __lunaix_ssize_t; +typedef unsigned int __lunaix_ino_t; + +typedef struct { unsigned int meta; unsigned int unique; unsigned int index; -} dev_t; +} __lunaix_dev_t; -#endif /* __LUNAIX_TYPES_H */ +#endif /* _LUNAIX_UHDR_TYPES_H */ diff --git a/lunaix-os/includes/usr/lunaix/wait.h b/lunaix-os/includes/usr/lunaix/wait.h new file mode 100644 index 0000000..222923b --- /dev/null +++ b/lunaix-os/includes/usr/lunaix/wait.h @@ -0,0 +1,19 @@ +#ifndef _LUNAIX_UHDR_WAIT_H +#define _LUNAIX_UHDR_WAIT_H + +#define PEXITTERM 0x100 +#define PEXITSTOP 0x200 +#define PEXITSIG 0x400 + +#define WNOHANG 1 +#define WUNTRACED 2 + +#define PEXITNUM(flag, code) (flag | (code & 0xff)) +#define WEXITSTATUS(wstatus) ((wstatus & 0xff)) +#define WIFSTOPPED(wstatus) ((wstatus & PEXITSTOP)) +#define WIFSIGNALED(wstatus) ((wstatus & PEXITSIG)) + +#define WIFEXITED(wstatus) \ + ((wstatus & PEXITTERM) && ((char)WEXITSTATUS(wstatus) >= 0)) + +#endif /* _LUNAIX_UHDR_WAIT_H */ diff --git a/lunaix-os/kernel/device/devfs.c b/lunaix-os/kernel/device/devfs.c index 969c828..f8a20a1 100644 --- a/lunaix-os/kernel/device/devfs.c +++ b/lunaix-os/kernel/device/devfs.c @@ -3,7 +3,7 @@ #include #include -#include +#include extern struct v_inode_ops devfs_inode_ops; extern struct v_file_ops devfs_file_ops; diff --git a/lunaix-os/kernel/fs/iso9660/directory.c b/lunaix-os/kernel/fs/iso9660/directory.c index b022d42..a4dcb10 100644 --- a/lunaix-os/kernel/fs/iso9660/directory.c +++ b/lunaix-os/kernel/fs/iso9660/directory.c @@ -6,7 +6,7 @@ #include -#include +#include extern struct cake_pile* drec_cache_pile; diff --git a/lunaix-os/kernel/fs/path_walk.c b/lunaix-os/kernel/fs/path_walk.c index 246e903..df0942b 100644 --- a/lunaix-os/kernel/fs/path_walk.c +++ b/lunaix-os/kernel/fs/path_walk.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/lunaix-os/kernel/fs/vfs.c b/lunaix-os/kernel/fs/vfs.c index 2402cc5..8bcb644 100644 --- a/lunaix-os/kernel/fs/vfs.c +++ b/lunaix-os/kernel/fs/vfs.c @@ -55,7 +55,7 @@ #include -#include +#include #define INODE_ACCESSED 0 #define INODE_MODIFY 1 diff --git a/lunaix-os/kernel/mm/mmap.c b/lunaix-os/kernel/mm/mmap.c index 493d26c..ac23bd6 100644 --- a/lunaix-os/kernel/mm/mmap.c +++ b/lunaix-os/kernel/mm/mmap.c @@ -7,7 +7,7 @@ #include -#include +#include // any size beyond this is bullshit #define BS_SIZE (KERNEL_RESIDENT - USR_MMAP) diff --git a/lunaix-os/kernel/process/taskfs.c b/lunaix-os/kernel/process/taskfs.c index 2015aec..8ab3d65 100644 --- a/lunaix-os/kernel/process/taskfs.c +++ b/lunaix-os/kernel/process/taskfs.c @@ -8,7 +8,7 @@ #include #include -#include +#include #define COUNTER_MASK ((1 << 16) - 1) diff --git a/lunaix-os/usr/init/init.c b/lunaix-os/usr/init/init.c index 804b8f8..67a73f9 100644 --- a/lunaix-os/usr/init/init.c +++ b/lunaix-os/usr/init/init.c @@ -1,11 +1,13 @@ #include #include -#include -#include +#include +#include #include #include #include +#include + #define must_mount(src, target, fs, opts) \ do { \ int err = 0; \ diff --git a/lunaix-os/usr/libc/includes/dirent.h b/lunaix-os/usr/libc/includes/dirent.h index 5007d28..4c5bd3b 100644 --- a/lunaix-os/usr/libc/includes/dirent.h +++ b/lunaix-os/usr/libc/includes/dirent.h @@ -1,7 +1,7 @@ #ifndef __LUNALIBC_SYS_DIRENT_H #define __LUNALIBC_SYS_DIRENT_H -#include +#include typedef struct { diff --git a/lunaix-os/usr/libc/includes/fcntl.h b/lunaix-os/usr/libc/includes/fcntl.h index b818307..d527c9c 100644 --- a/lunaix-os/usr/libc/includes/fcntl.h +++ b/lunaix-os/usr/libc/includes/fcntl.h @@ -1,8 +1,8 @@ #ifndef __LUNALIBC_SYS_FCNTL_H #define __LUNALIBC_SYS_FCNTL_H -#include -#include +#include +#include extern int open(const char* path, int flags); diff --git a/lunaix-os/usr/libc/includes/lunaix/syscall.h b/lunaix-os/usr/libc/includes/lunaix/syscall.h deleted file mode 100644 index eb622e1..0000000 --- a/lunaix-os/usr/libc/includes/lunaix/syscall.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __LUNALIBC_OSDEPS_SYSCALL_H -#define __LUNALIBC_OSDEPS_SYSCALL_H - -#include - -extern unsigned long -do_lunaix_syscall(unsigned long call_id, ...); - -#endif /* __LUNALIBC_OSDEPS_SYSCALL_H */ diff --git a/lunaix-os/usr/libc/includes/signal.h b/lunaix-os/usr/libc/includes/signal.h index 742e5e8..fbf8c7c 100644 --- a/lunaix-os/usr/libc/includes/signal.h +++ b/lunaix-os/usr/libc/includes/signal.h @@ -1,8 +1,8 @@ #ifndef __LUNALIBC_SYS_SIGNAL_H #define __LUNALIBC_SYS_SIGNAL_H -#include -#include +#include +#include extern sighandler_t signal(int signum, sighandler_t handler); diff --git a/lunaix-os/usr/libc/includes/lunaix/ioctl.h b/lunaix-os/usr/libc/includes/sys/ioctl.h similarity index 80% rename from lunaix-os/usr/libc/includes/lunaix/ioctl.h rename to lunaix-os/usr/libc/includes/sys/ioctl.h index 34963cc..70a621d 100644 --- a/lunaix-os/usr/libc/includes/lunaix/ioctl.h +++ b/lunaix-os/usr/libc/includes/sys/ioctl.h @@ -1,7 +1,7 @@ #ifndef __LUNALIBC_SYS_IOCTL_H #define __LUNALIBC_SYS_IOCTL_H -#include +#include int ioctl(int fd, int req, ...); diff --git a/lunaix-os/usr/libc/includes/lunaix/lunaix.h b/lunaix-os/usr/libc/includes/sys/lunaix.h similarity index 69% rename from lunaix-os/usr/libc/includes/lunaix/lunaix.h rename to lunaix-os/usr/libc/includes/sys/lunaix.h index 6782969..6500436 100644 --- a/lunaix-os/usr/libc/includes/lunaix/lunaix.h +++ b/lunaix-os/usr/libc/includes/sys/lunaix.h @@ -1,18 +1,12 @@ #ifndef __LUNALIBC_SYS_LUNAIX_H #define __LUNALIBC_SYS_LUNAIX_H -#include +#include #include void yield(); -pid_t -wait(int* status); - -pid_t -waitpid(pid_t pid, int* status, int flags); - void syslog(int level, const char* fmt, ...); diff --git a/lunaix-os/usr/libc/includes/lunaix/mann.h b/lunaix-os/usr/libc/includes/sys/mman.h similarity index 80% rename from lunaix-os/usr/libc/includes/lunaix/mann.h rename to lunaix-os/usr/libc/includes/sys/mman.h index 2e7f12f..0ddf765 100644 --- a/lunaix-os/usr/libc/includes/lunaix/mann.h +++ b/lunaix-os/usr/libc/includes/sys/mman.h @@ -2,8 +2,8 @@ #define __LUNALIBC_SYS_MANN_H #include -#include -#include +#include +#include void* mmap(void* addr, size_t length, int proct, int flags, int fd, off_t offset); diff --git a/lunaix-os/usr/libc/includes/lunaix/mount.h b/lunaix-os/usr/libc/includes/sys/mount.h similarity index 92% rename from lunaix-os/usr/libc/includes/lunaix/mount.h rename to lunaix-os/usr/libc/includes/sys/mount.h index db90f10..156810a 100644 --- a/lunaix-os/usr/libc/includes/lunaix/mount.h +++ b/lunaix-os/usr/libc/includes/sys/mount.h @@ -1,7 +1,7 @@ #ifndef __LUNALIBC_SYS_MOUNT_H #define __LUNALIBC_SYS_MOUNT_H -#include +#include extern int mount(const char* source, const char* target, const char* fstype, int flags); diff --git a/lunaix-os/usr/libc/includes/sys/types.h b/lunaix-os/usr/libc/includes/sys/types.h new file mode 100644 index 0000000..34c629d --- /dev/null +++ b/lunaix-os/usr/libc/includes/sys/types.h @@ -0,0 +1,17 @@ +#ifndef __LUNAIX_TYPES_H +#define __LUNAIX_TYPES_H + +#include + +typedef __lunaix_pid_t pid_t; +typedef __lunaix_tid_t tid_t; +typedef __lunaix_uid_t uid_t; +typedef __lunaix_gid_t gid_t; +typedef __lunaix_size_t size_t; +typedef __lunaix_ssize_t ssize_t; +typedef __lunaix_size_t off_t; +typedef __lunaix_ino_t ino_t; + +typedef __lunaix_dev_t dev_t; + +#endif /* __LUNAIX_TYPES_H */ diff --git a/lunaix-os/usr/libc/includes/sys/wait.h b/lunaix-os/usr/libc/includes/sys/wait.h new file mode 100644 index 0000000..23f3447 --- /dev/null +++ b/lunaix-os/usr/libc/includes/sys/wait.h @@ -0,0 +1,13 @@ +#ifndef __LUNAIX_WAIT_H +#define __LUNAIX_WAIT_H + +#include +#include + +pid_t +wait(int* status); + +pid_t +waitpid(pid_t pid, int* status, int flags); + +#endif /* __LUNAIX_WAIT_H */ diff --git a/lunaix-os/usr/libc/includes/unistd.h b/lunaix-os/usr/libc/includes/unistd.h index d42b575..355197c 100644 --- a/lunaix-os/usr/libc/includes/unistd.h +++ b/lunaix-os/usr/libc/includes/unistd.h @@ -1,7 +1,7 @@ #ifndef __LUNALIBC_SYS_UNISTD_H #define __LUNALIBC_SYS_UNISTD_H -#include +#include #include extern const char** environ; diff --git a/lunaix-os/usr/libc/src/posix/dirent.c b/lunaix-os/usr/libc/src/posix/dirent.c index c9e1636..ff261d0 100644 --- a/lunaix-os/usr/libc/src/posix/dirent.c +++ b/lunaix-os/usr/libc/src/posix/dirent.c @@ -1,5 +1,5 @@ #include -#include +#include int sys_readdir(int fd, struct lx_dirent* dirent) diff --git a/lunaix-os/usr/libc/src/posix/ioctl.c b/lunaix-os/usr/libc/src/posix/ioctl.c index 1eb5062..3585a05 100644 --- a/lunaix-os/usr/libc/src/posix/ioctl.c +++ b/lunaix-os/usr/libc/src/posix/ioctl.c @@ -1,5 +1,5 @@ #include -#include +#include #include int __attribute__((noinline)) diff --git a/lunaix-os/usr/libc/src/posix/lunaix.c b/lunaix-os/usr/libc/src/posix/lunaix.c index 7558ef7..deba101 100644 --- a/lunaix-os/usr/libc/src/posix/lunaix.c +++ b/lunaix-os/usr/libc/src/posix/lunaix.c @@ -1,5 +1,5 @@ #include -#include +#include #include void diff --git a/lunaix-os/usr/libc/src/posix/mann.c b/lunaix-os/usr/libc/src/posix/mann.c index b7756fa..1481c12 100644 --- a/lunaix-os/usr/libc/src/posix/mann.c +++ b/lunaix-os/usr/libc/src/posix/mann.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include void* mmap(void* addr, size_t length, int proct, int flags, int fd, off_t offset) diff --git a/lunaix-os/usr/libc/src/posix/signal.c b/lunaix-os/usr/libc/src/posix/signal.c index 25b8101..17a83fe 100644 --- a/lunaix-os/usr/libc/src/posix/signal.c +++ b/lunaix-os/usr/libc/src/posix/signal.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include int sigpending(sigset_t *set) diff --git a/lunaix-os/usr/libc/src/posix/unistd.c b/lunaix-os/usr/libc/src/posix/unistd.c index e3cd16c..b6234ed 100644 --- a/lunaix-os/usr/libc/src/posix/unistd.c +++ b/lunaix-os/usr/libc/src/posix/unistd.c @@ -1,5 +1,5 @@ #include -#include +#include pid_t fork() diff --git a/lunaix-os/usr/libc/src/termios.c b/lunaix-os/usr/libc/src/termios.c index 52c97e4..6c20ece 100644 --- a/lunaix-os/usr/libc/src/termios.c +++ b/lunaix-os/usr/libc/src/termios.c @@ -1,5 +1,5 @@ #include -#include +#include int tcgetattr(int fd, struct termios* termios_p) diff --git a/lunaix-os/usr/maze.c b/lunaix-os/usr/maze.c index 748b814..e9a5211 100644 --- a/lunaix-os/usr/maze.c +++ b/lunaix-os/usr/maze.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/lunaix-os/usr/sh/sh.c b/lunaix-os/usr/sh/sh.c index 764404b..c18b5ed 100644 --- a/lunaix-os/usr/sh/sh.c +++ b/lunaix-os/usr/sh/sh.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/lunaix-os/usr/signal_demo.c b/lunaix-os/usr/signal_demo.c index 352d0de..532b9b9 100644 --- a/lunaix-os/usr/signal_demo.c +++ b/lunaix-os/usr/signal_demo.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/lunaix-os/usr/stat.c b/lunaix-os/usr/stat.c index 1bd79f3..3e782e9 100644 --- a/lunaix-os/usr/stat.c +++ b/lunaix-os/usr/stat.c @@ -2,6 +2,7 @@ #include #include #include +#include static char buf[256]; diff --git a/lunaix-os/usr/testp.c b/lunaix-os/usr/testp.c index ee33fe6..c7d4c38 100644 --- a/lunaix-os/usr/testp.c +++ b/lunaix-os/usr/testp.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include