posix: changes required after removal of zephyr/posix include prefix

This change removes the requirement to have `<zephyr/posix/...>` prefixing
all standard POSIX includes in Zephyr.

The main reason that it was required was due to conflicts between C
library time.h, signal.h and the fact that Zephyr posix headers were being
somewhat ad-hoc mixed with libc posix headers.

Now, any (even partially) POSIX-conformant C libraries are expected to
provide their own types, constants, and headers, and Zephyr's
implementation uses those definitions.

If any definitions are missing, we define them on a per-libc basis. This
can also be done out-of-tree, which allows for implementors to take
advantage of the `CONFIG_TC_PROVIDES_POSIX..` options.

Signed-off-by: Chris Friedt <[email protected]>

Author: cfriedt

include/zephyr/posix/aio.h

@@ -7,23 +7,60 @@
 #ifndef ZEPHYR_INCLUDE_ZEPHYR_POSIX_AIO_H_
 #define ZEPHYR_INCLUDE_ZEPHYR_POSIX_AIO_H_
 
+/* size_t must be defined by the libc stddef.h */
+#include <stddef.h>
+#include <stdint.h>
 #include <signal.h>
-#include <sys/types.h>
-#include <time.h>
 
 #include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if !defined(_OFF_T_DECLARED) && !defined(__off_t_defined)
+typedef long off_t;
+#define _OFF_T_DECLARED
+#define __off_t_defined
+#endif
+
+#ifndef __SIZE_TYPE__
+#define __SIZE_TYPE__ unsigned long
+#endif
+
+#if !defined(_SSIZE_T_DECLARED) && !defined(__ssize_t_defined)
+#define unsigned signed /* parasoft-suppress MISRAC2012-RULE_20_4-a MISRAC2012-RULE_20_4-b */
+typedef __SIZE_TYPE__ ssize_t;
+#undef unsigned
+#define _SSIZE_T_DECLARED
+#define __ssize_t_defined
+#endif
+
+/* time_t must be defined by the libc time.h */
+#include <time.h>
+
+#if __STDC_VERSION__ >= 201112L
+/* struct timespec must be defined in the libc time.h */
+#else
+#if !defined(_TIMESPEC_DECLARED) && !defined(__timespec_defined)
+struct timespec {
+	time_t tv_sec;
+	long tv_nsec;
+};
+#define _TIMESPEC_DECLARED
+#define __timespec_defined
+#endif
+#endif
+
 struct aiocb {
 	int aio_fildes;
 	off_t aio_offset;
 	volatile void *aio_buf;
 	size_t aio_nbytes;
 	int aio_reqprio;
+#if defined(_POSIX_REALTIME_SIGNALS) || defined(__DOXYGEN__)
 	struct sigevent aio_sigevent;
+#endif /* defined(_POSIX_REALTIME_SIGNALS) || defined(__DOXYGEN__) */
 	int aio_lio_opcode;
 };
 

include/zephyr/posix/dirent.h

@@ -8,13 +8,29 @@
 #ifndef ZEPHYR_INCLUDE_POSIX_DIRENT_H_
 #define ZEPHYR_INCLUDE_POSIX_DIRENT_H_
 
-#include <sys/dirent.h>
+#include <limits.h>
+
 #include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if !defined(NAME_MAX) && defined(_XOPEN_SOURCE)
+#define NAME_MAX _XOPEN_NAME_MAX
+#endif
+
+#if !defined(NAME_MAX) && defined(_POSIX_C_SOURCE)
+#define NAME_MAX _POSIX_NAME_MAX
+#endif
+
+typedef void DIR;
+
+struct dirent {
+	unsigned int d_ino;
+	char d_name[NAME_MAX + 1];
+};
+
 #if (_POSIX_C_SOURCE >= 200809L) || (_XOPEN_SOURCE >= 700)
 int alphasort(const struct dirent **d1, const struct dirent **d2);
 #endif

include/zephyr/posix/fnmatch.h

@@ -1,59 +1,31 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-/*    $NetBSD: fnmatch.h,v 1.12.50.1 2011/02/08 16:18:55 bouyer Exp $    */
-
-/*-
- * Copyright (c) 1992, 1993
- *    The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+/*
+ * Copyright The Zephyr Project Contributors
  *
- *    @(#)fnmatch.h    8.1 (Berkeley) 6/2/93
+ * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _FNMATCH_H_
-#define _FNMATCH_H_
-
-#define FNM_NOMATCH 1 /* Match failed. */
-#define FNM_NOSYS   2 /* Function not implemented. */
-#define FNM_NORES   3 /* Out of resources */
-
-#define FNM_NOESCAPE	0x01 /* Disable backslash escaping. */
-#define FNM_PATHNAME	0x02 /* Slash must be matched by slash. */
-#define FNM_PERIOD	0x04 /* Period must be matched by period. */
-#define FNM_CASEFOLD	0x08 /* Pattern is matched case-insensitive */
-#define FNM_LEADING_DIR 0x10 /* Ignore /<tail> after Imatch. */
+#ifndef ZEPHYR_INCLUDE_POSIX_FNMATCH_H_
+#define ZEPHYR_INCLUDE_POSIX_FNMATCH_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int fnmatch(const char *, const char *, int);
+#define FNM_NOMATCH  1
+#define FNM_NOESCAPE 0x01
+#define FNM_PATHNAME 0x02
+#define FNM_PERIOD   0x04
+#if defined(__GNU_SOURCE)
+#define FNM_LEADING_DIR 0x08
+#endif
+#define FNM_CASEFOLD   0x10
+#define FNM_EXTMATCH   0x20
+#define FNM_IGNORECASE FNM_CASEFOLD
+
+int fnmatch(const char *pattern, const char *string, int flags);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* !_FNMATCH_H_ */
+#endif /* ZEPHYR_INCLUDE_POSIX_FNMATCH_H_ */

include/zephyr/posix/mqueue.h

@@ -10,11 +10,6 @@
 #include <time.h>
 #include <signal.h>
 
-#include <zephyr/kernel.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <posix_types.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif

include/zephyr/posix/posix_features.h

@@ -36,130 +36,30 @@
  * POSIX System Interfaces
  */
 
-#define _POSIX_VERSION 200809L
-
 #define _POSIX_CHOWN_RESTRICTED (0)
 #define _POSIX_NO_TRUNC         (0)
 #define _POSIX_VDISABLE         ('\0')
 
 /* #define _POSIX_ADVISORY_INFO (-1L) */
 
-#ifdef CONFIG_POSIX_ASYNCHRONOUS_IO
-#define _POSIX_ASYNCHRONOUS_IO _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_BARRIERS
-#define _POSIX_BARRIERS _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_FSYNC
-#define _POSIX_FSYNC _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_NET_IPV6
-#define _POSIX_IPV6 _POSIX_VERSION
-#endif
-
 /* #define _POSIX_JOB_CONTROL (-1L) */
 
-#ifdef CONFIG_POSIX_MAPPED_FILES
-#define _POSIX_MAPPED_FILES _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_MEMLOCK
-#define _POSIX_MEMLOCK _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_MEMLOCK_RANGE
-#define _POSIX_MEMLOCK_RANGE _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_MEMORY_PROTECTION
-#define _POSIX_MEMORY_PROTECTION _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_MESSAGE_PASSING
-#define _POSIX_MESSAGE_PASSING _POSIX_VERSION
-#endif
-
 /* #define _POSIX_PRIORITIZED_IO (-1L) */
 
-#ifdef CONFIG_POSIX_PRIORITY_SCHEDULING
-#define _POSIX_PRIORITY_SCHEDULING _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_NET_SOCKETS_PACKET
-#define _POSIX_RAW_SOCKETS _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_RW_LOCKS
-#define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION
-#endif
-
 /* #define _POSIX_REGEXP (-1L) */
 /* #define _POSIX_SAVED_IDS (-1L) */
 
-#ifdef CONFIG_POSIX_SEMAPHORES
-#define _POSIX_SEMAPHORES _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_SHARED_MEMORY_OBJECTS
-#define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION
-#endif
-
 /* #define _POSIX_SHELL (-1L) */
 /* #define _POSIX_SPAWN (-1L) */
 
-#ifdef CONFIG_POSIX_SPIN_LOCKS
-#define _POSIX_SPIN_LOCKS _POSIX_VERSION
-#endif
-
 /* #define _POSIX_SPORADIC_SERVER (-1L) */
 
-#ifdef CONFIG_POSIX_SYNCHRONIZED_IO
-#define _POSIX_SYNCHRONIZED_IO _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_ATTR_STACKADDR
-#define _POSIX_THREAD_ATTR_STACKADDR _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_ATTR_STACKSIZE
-#define _POSIX_THREAD_ATTR_STACKSIZE _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_CPUTIME
-#define _POSIX_THREAD_CPUTIME _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_PRIO_INHERIT
-#define _POSIX_THREAD_PRIO_INHERIT _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_PRIO_PROTECT
-#define _POSIX_THREAD_PRIO_PROTECT _POSIX_VERSION
-#endif
-
-#ifdef CONFIG_POSIX_THREAD_PRIORITY_SCHEDULING
-#define _POSIX_THREAD_PRIORITY_SCHEDULING _POSIX_VERSION
-#endif
-
 /* #define _POSIX_THREAD_PROCESS_SHARED (-1L) */
 /* #define _POSIX_THREAD_ROBUST_PRIO_INHERIT (-1L) */
 /* #define _POSIX_THREAD_ROBUST_PRIO_PROTECT (-1L) */
 
 /* #define _POSIX_THREAD_SPORADIC_SERVER (-1L) */
 
-#ifdef CONFIG_POSIX_THREADS
-#ifndef _POSIX_THREADS
-#define _POSIX_THREADS _POSIX_VERSION
-#endif
-#endif
-
-#ifdef CONFIG_POSIX_TIMEOUTS
-#define _POSIX_TIMEOUTS _POSIX_VERSION
-#endif
-
 /* #define _POSIX_TRACE (-1L) */
 /* #define _POSIX_TRACE_EVENT_FILTER (-1L) */
 /* #define _POSIX_TRACE_INHERIT (-1L) */
@@ -185,8 +85,6 @@
 /*
  * POSIX2 Options
  */
-/* #define _POSIX2_VERSION (-1) */
-#define _POSIX2_C_BIND _POSIX_VERSION
 /* #define _POSIX2_C_DEV (-1) */
 /* #define _POSIX2_CHAR_TERM (-1L) */
 /* #define _POSIX2_FORT_DEV (-1L) */
@@ -204,7 +102,6 @@
 /*
  * X/Open System Interfaces
  */
-#define _XOPEN_VERSION 700
 /* #define _XOPEN_CRYPT (-1L) */
 /* #define _XOPEN_ENH_I18N (-1L) */
 #if defined(CONFIG_XSI_REALTIME) ||                                                                \
@@ -217,10 +114,6 @@
 /* #define _XOPEN_REALTIME_THREADS (-1L) */
 /* #define _XOPEN_SHM (-1L) */
 
-#ifdef CONFIG_XOPEN_STREAMS
-#define _XOPEN_STREAMS _XOPEN_VERSION
-#endif
-
 /* #define _XOPEN_UNIX (-1L) */
 /* #define _XOPEN_UUCP (-1L) */
 

include/zephyr/posix/posix_limits.h

@@ -122,6 +122,9 @@
 #define POSIX_REC_XFER_ALIGN     (4)
 #define SYMLINK_MAX              _POSIX_SYMLINK_MAX
 
+/* Other invariant values */
+#define GETENTROPY_MAX (256)
+
 /* clang-format on */
 
 #endif

include/zephyr/posix/posix_signal.h

@@ -132,6 +132,7 @@ struct sigevent {
 
 /* SIGRTMIN and SIGRTMAX defined above */
 
+/* slightly out of order w.r.t. the specification */
 #if !defined(_SIGINFO_T_DECLARED) && !defined(__siginfo_t_defined)
 typedef struct {
 	void *si_addr;
@@ -197,6 +198,17 @@ typedef struct {
 #define __mcontext_defined
 #endif
 
+/* slightly out of order w.r.t. the specification */
+#if !defined(_STACK_T_DECLARED) && !defined(__stack_t_defined)
+typedef struct {
+	void *ss_sp;
+	size_t ss_size;
+	int ss_flags;
+} stack_t;
+#define _STACK_T_DECLARED
+#define __stack_t_defined
+#endif
+
 #if !defined(_UCONTEXT_T_DECLARED) && !defined(__ucontext_t_defined)
 typedef struct {
 	struct ucontext *uc_link;
@@ -208,16 +220,6 @@ typedef struct {
 #define __ucontext_defined
 #endif
 
-#if !defined(_STACK_T_DECLARED) && !defined(__stack_t_defined)
-typedef struct {
-	void *ss_sp;
-	size_t ss_size;
-	int ss_flags;
-} stack_t;
-#define _STACK_T_DECLARED
-#define __stack_t_defined
-#endif
-
 #endif /* defined(_POSIX_REALTIME_SIGNALS) || defined(__DOXYGEN__) */
 
 /* Siginfo codes are defined below */