Loading...
--- Libc/Libc-1725.40.4/include/_stdlib.h
+++ Libc/Libc-1669.40.2/include/_stdlib.h
@@ -58,13 +58,9 @@
#ifndef _STDLIB_H_
#define _STDLIB_H_
-#define _LIBC_COUNT__MB_LEN_MAX _LIBC_UNSAFE_INDEXABLE
-#define _LIBC_COUNT__PATH_MAX _LIBC_UNSAFE_INDEXABLE
-
#include <Availability.h>
#include <sys/cdefs.h>
-#include <_bounds.h>
#include <_types.h>
#if !defined(_ANSI_SOURCE)
#ifndef UNIFDEF_DRIVERKIT
@@ -72,19 +68,6 @@
#endif /* UNIFDEF_DRIVERKIT */
#if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
#include <alloca.h>
-#if defined(__LIBC_STAGED_BOUNDS_SAFETY_ATTRIBUTES) && __has_ptrcheck
-
-/* required for bounds annotations, but brings in unexpected names and may
- * need adoption work from clients */
-#include <limits.h> /* for MB_LEN_MAX */
-#include <sys/syslimits.h> /* for PATH_MAX */
-
-#undef _LIBC_COUNT__MB_LEN_MAX
-#undef _LIBC_COUNT__PATH_MAX
-#define _LIBC_COUNT__MB_LEN_MAX _LIBC_COUNT(MB_LEN_MAX)
-#define _LIBC_COUNT__PATH_MAX _LIBC_COUNT_OR_NULL(PATH_MAX)
-
-#endif /* defined(__LIBC_STAGED_BOUNDS_SAFETY_ATTRIBUTES) && __has_ptrcheck */
#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
#endif /* !_ANSI_SOURCE */
@@ -99,8 +82,6 @@
#include <sys/_types/_wchar_t.h>
-_LIBC_SINGLE_BY_DEFAULT()
-
typedef struct {
int quot; /* quotient */
int rem; /* remainder */
@@ -127,23 +108,18 @@
#define RAND_MAX 0x7fffffff
+// When _USE_EXTENDED_LOCALES_ is enabled (by including xlocale.h),
+// MB_CUR_MAX is defined by xlocale.h.
+#if !defined(MB_CUR_MAX) && !defined(_USE_EXTENDED_LOCALES_)
#if __has_feature(modules)
// When clang modules are enabled, there can only be one definition of
// MB_CUR_MAX, and that needs to be the same one used by xlocale.h.
#include <_mb_cur_max.h>
-#else /* !__has_feature(modules) */
-#ifndef MB_CUR_MAX
-#ifdef _USE_EXTENDED_LOCALES_
-#define MB_CUR_MAX (___mb_cur_max())
-#ifndef MB_CUR_MAX_L
-#define MB_CUR_MAX_L(x) (___mb_cur_max_l(x))
-#endif /* !MB_CUR_MAX_L */
-#else /* !_USE_EXTENDED_LOCALES_ */
+#else
extern int __mb_cur_max;
#define MB_CUR_MAX __mb_cur_max
-#endif /* _USE_EXTENDED_LOCALES_ */
-#endif /* MB_CUR_MAX */
#endif /* __has_feature(modules) */
+#endif /* !MB_CUR_MAX && !_USE_EXTENDED_LOCALES_ */
#ifndef UNIFDEF_DRIVERKIT
#include <malloc/_malloc.h>
@@ -166,7 +142,7 @@
long long
atoll(const char *);
#endif /* !__DARWIN_NO_LONG_LONG */
-void *bsearch(const void *_LIBC_SIZE(__width) __key, const void *_LIBC_SIZE(__width * __nel) __base, size_t __nel,
+void *bsearch(const void *__key, const void *__base, size_t __nel,
size_t __width, int (* _Nonnull __compar)(const void *, const void *));
#ifndef UNIFDEF_DRIVERKIT
/* calloc is now declared in _malloc.h */
@@ -175,7 +151,7 @@
#ifndef UNIFDEF_DRIVERKIT
void exit(int) __dead2;
/* free is now declared in _malloc.h */
-char *_LIBC_CSTR getenv(const char *);
+char *getenv(const char *);
#endif /* UNIFDEF_DRIVERKIT */
long labs(long) __pure2;
ldiv_t ldiv(long, long) __pure2;
@@ -187,13 +163,13 @@
#ifndef UNIFDEF_DRIVERKIT
/* malloc is now declared in _malloc.h */
#endif /* UNIFDEF_DRIVERKIT */
-int mblen(const char *_LIBC_COUNT(__n) __s, size_t __n);
-size_t mbstowcs(wchar_t * __restrict _LIBC_COUNT(__n), const char * __restrict, size_t __n);
-int mbtowc(wchar_t * __restrict, const char * __restrict _LIBC_COUNT(__n), size_t __n);
+int mblen(const char *__s, size_t __n);
+size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
+int mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
#ifndef UNIFDEF_DRIVERKIT
/* posix_memalign is now declared in _malloc.h */
#endif /* UNIFDEF_DRIVERKIT */
-void qsort(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+void qsort(void *__base, size_t __nel, size_t __width,
int (* _Nonnull __compar)(const void *, const void *));
#ifndef UNIFDEF_DRIVERKIT
#if (__DARWIN_C_LEVEL >= __DARWIN_C_FULL) || \
@@ -204,20 +180,20 @@
/* realloc is now declared in _malloc.h */
void srand(unsigned) __swift_unavailable("Use arc4random instead.");
#endif /* UNIFDEF_DRIVERKIT */
-double strtod(const char *, char *_LIBC_CSTR *) __DARWIN_ALIAS(strtod);
-float strtof(const char *, char *_LIBC_CSTR *) __DARWIN_ALIAS(strtof);
-long strtol(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
+double strtod(const char *, char **) __DARWIN_ALIAS(strtod);
+float strtof(const char *, char **) __DARWIN_ALIAS(strtof);
+long strtol(const char *__str, char **__endptr, int __base);
long double
- strtold(const char *, char *_LIBC_CSTR *);
+ strtold(const char *, char **);
#if !__DARWIN_NO_LONG_LONG
long long
- strtoll(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
+ strtoll(const char *__str, char **__endptr, int __base);
#endif /* !__DARWIN_NO_LONG_LONG */
unsigned long
- strtoul(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
+ strtoul(const char *__str, char **__endptr, int __base);
#if !__DARWIN_NO_LONG_LONG
unsigned long long
- strtoull(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
+ strtoull(const char *__str, char **__endptr, int __base);
#endif /* !__DARWIN_NO_LONG_LONG */
#ifndef UNIFDEF_DRIVERKIT
//Begin-Libc
@@ -236,26 +212,24 @@
#endif /* UNIFDEF_DRIVERKIT */
-size_t wcstombs(char * __restrict _LIBC_COUNT(__n), const wchar_t * __restrict, size_t __n);
-int wctomb(char *_LIBC_COUNT__MB_LEN_MAX, wchar_t);
+size_t wcstombs(char * __restrict, const wchar_t * __restrict, size_t);
+int wctomb(char *, wchar_t);
#ifndef UNIFDEF_DRIVERKIT
#ifndef _ANSI_SOURCE
void _Exit(int) __dead2;
long a64l(const char *);
double drand48(void);
-char *_LIBC_CSTR ecvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
+char *ecvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
double erand48(unsigned short[3]);
-char *_LIBC_CSTR fcvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
-char *_LIBC_CSTR gcvt(double, int, char *_LIBC_UNSAFE_INDEXABLE) _LIBC_PTRCHECK_REPLACED(snprintf); /* LEGACY */
-int getsubopt(char *_LIBC_CSTR *, char *_LIBC_CSTR const *_LIBC_NULL_TERMINATED, char *_LIBC_CSTR *);
+char *fcvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
+char *gcvt(double, int, char *); /* LEGACY */
+int getsubopt(char **, char * const *, char **);
int grantpt(int);
#if __DARWIN_UNIX03
-char *_LIBC_UNSAFE_INDEXABLE
- initstate(unsigned, char *_LIBC_COUNT(__size), size_t __size); /* no __DARWIN_ALIAS needed */
+char *initstate(unsigned, char *, size_t); /* no __DARWIN_ALIAS needed */
#else /* !__DARWIN_UNIX03 */
-char *_LIBC_UNSAFE_INDEXABLE
- initstate(unsigned long, char *_LIBC_COUNT(__size), long __size);
+char *initstate(unsigned long, char *, long);
#endif /* __DARWIN_UNIX03 */
long jrand48(unsigned short[3]) __swift_unavailable("Use arc4random instead.");
char *l64a(long);
@@ -264,24 +238,24 @@
#if !defined(_POSIX_C_SOURCE)
__deprecated_msg("This function is provided for compatibility reasons only. Due to security concerns inherent in the design of mktemp(3), it is highly recommended that you use mkstemp(3) instead.")
#endif
-char *_LIBC_CSTR mktemp(char *_LIBC_CSTR);
-int mkstemp(char *_LIBC_CSTR);
+char *mktemp(char *);
+int mkstemp(char *);
long mrand48(void) __swift_unavailable("Use arc4random instead.");
long nrand48(unsigned short[3]) __swift_unavailable("Use arc4random instead.");
int posix_openpt(int);
-char *_LIBC_CSTR ptsname(int);
+char *ptsname(int);
#if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-int ptsname_r(int fildes, char *_LIBC_COUNT(buflen) buffer, size_t buflen) __API_AVAILABLE(macos(10.13.4), ios(11.3), tvos(11.3), watchos(4.3));
+int ptsname_r(int fildes, char *buffer, size_t buflen) __API_AVAILABLE(macos(10.13.4), ios(11.3), tvos(11.3), watchos(4.3));
#endif
//Begin-Libc
#ifndef LIBC_ALIAS_PUTENV
//End-Libc
-int putenv(char *_LIBC_CSTR) __DARWIN_ALIAS(putenv);
+int putenv(char *) __DARWIN_ALIAS(putenv);
//Begin-Libc
#else /* LIBC_ALIAS_PUTENV */
-int putenv(char *_LIBC_CSTR) LIBC_ALIAS(putenv);
+int putenv(char *) LIBC_ALIAS(putenv);
#endif /* !LIBC_ALIAS_PUTENV */
//End-Libc
long random(void) __swift_unavailable("Use arc4random instead.");
@@ -289,25 +263,26 @@
//Begin-Libc
#ifdef __LIBC__
#ifndef LIBC_ALIAS_REALPATH
-char *_LIBC_CSTR realpath(const char * __restrict, char * __restrict _LIBC_COUNT__PATH_MAX) __DARWIN_EXTSN(realpath);
+char *realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
#else /* LIBC_ALIAS_REALPATH */
#ifdef VARIANT_DARWINEXTSN
-char *_LIBC_CSTR realpath(const char * __restrict, char * __restrict _LIBC_COUNT__PATH_MAX) LIBC_EXTSN(realpath);
+char *realpath(const char * __restrict, char * __restrict) LIBC_EXTSN(realpath);
#else /* !VARIANT_DARWINEXTSN */
-char *_LIBC_CSTR realpath(const char * __restrict, char * __restrict _LIBC_COUNT__PATH_MAX) LIBC_ALIAS(realpath);
+char *realpath(const char * __restrict, char * __restrict) LIBC_ALIAS(realpath);
#endif /* VARIANT_DARWINEXTSN */
#endif /* !LIBC_ALIAS_REALPATH */
#else /* !__LIBC__ */
//End-Libc
#if (__DARWIN_UNIX03 && !defined(_POSIX_C_SOURCE)) || defined(_DARWIN_C_SOURCE) || defined(_DARWIN_BETTER_REALPATH)
-char *_LIBC_CSTR realpath(const char * __restrict, char * __restrict _LIBC_COUNT__PATH_MAX) __DARWIN_EXTSN(realpath);
+char *realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
#else /* (!__DARWIN_UNIX03 || _POSIX_C_SOURCE) && !_DARWIN_C_SOURCE && !_DARWIN_BETTER_REALPATH */
-char *_LIBC_CSTR realpath(const char * __restrict, char * __restrict _LIBC_COUNT__PATH_MAX) __DARWIN_ALIAS(realpath);
+char *realpath(const char * __restrict, char * __restrict) __DARWIN_ALIAS(realpath);
#endif /* (__DARWIN_UNIX03 && _POSIX_C_SOURCE) || _DARWIN_C_SOURCE || _DARWIN_BETTER_REALPATH */
//Begin-Libc
#endif /* __LIBC__ */
//End-Libc
-unsigned short *_LIBC_COUNT(3) seed48(unsigned short[3]);
+unsigned short
+ *seed48(unsigned short[3]);
//Begin-Libc
#ifndef LIBC_ALIAS_SETENV
//End-Libc
@@ -330,7 +305,7 @@
#else /* !__DARWIN_UNIX03 */
int setkey(const char *);
#endif /* __DARWIN_UNIX03 */
-char *_LIBC_UNSAFE_INDEXABLE setstate(const char *_LIBC_UNSAFE_INDEXABLE);
+char *setstate(const char *);
void srand48(long);
#if __DARWIN_UNIX03
void srandom(unsigned);
@@ -366,13 +341,13 @@
__BEGIN_DECLS
uint32_t arc4random(void);
#ifndef UNIFDEF_DRIVERKIT
-void arc4random_addrandom(unsigned char *_LIBC_COUNT(__datlen) /*dat*/, int __datlen)
+void arc4random_addrandom(unsigned char * /*dat*/, int /*datlen*/)
__OSX_DEPRECATED(10.0, 10.12, "use arc4random_stir")
__IOS_DEPRECATED(2.0, 10.0, "use arc4random_stir")
__TVOS_DEPRECATED(2.0, 10.0, "use arc4random_stir")
__WATCHOS_DEPRECATED(1.0, 3.0, "use arc4random_stir");
#endif /* UNIFDEF_DRIVERKIT */
-void arc4random_buf(void *_LIBC_SIZE(__nbytes) __buf, size_t __nbytes) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
+void arc4random_buf(void * __buf, size_t __nbytes) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
void arc4random_stir(void);
uint32_t
arc4random_uniform(uint32_t __upper_bound) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
@@ -388,29 +363,29 @@
#define __bsearch_noescape
#endif
#endif /* __BLOCKS__ */
-void *bsearch_b(const void *_LIBC_SIZE(__width) __key, const void *_LIBC_SIZE(__width * __nel) __base, size_t __nel,
+void *bsearch_b(const void *__key, const void *__base, size_t __nel,
size_t __width, int (^ _Nonnull __compar)(const void *, const void *) __bsearch_noescape)
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* __BLOCKS__ */
#ifndef UNIFDEF_DRIVERKIT
/* getcap(3) functions */
-char *_LIBC_CSTR cgetcap(char *_LIBC_CSTR, const char *, int);
+char *cgetcap(char *, const char *, int);
int cgetclose(void);
-int cgetent(char *_LIBC_CSTR *, char *_LIBC_CSTR *_LIBC_NULL_TERMINATED, const char *);
-int cgetfirst(char *_LIBC_CSTR *, char *_LIBC_CSTR *_LIBC_NULL_TERMINATED);
+int cgetent(char **, char **, const char *);
+int cgetfirst(char **, char **);
int cgetmatch(const char *, const char *);
-int cgetnext(char *_LIBC_CSTR *, char *_LIBC_CSTR *_LIBC_NULL_TERMINATED);
-int cgetnum(char *_LIBC_CSTR, const char *, long *);
+int cgetnext(char **, char **);
+int cgetnum(char *, const char *, long *);
int cgetset(const char *);
-int cgetstr(char *_LIBC_CSTR, const char *, char *_LIBC_CSTR *);
-int cgetustr(char *_LIBC_CSTR, const char *, char *_LIBC_CSTR *);
+int cgetstr(char *, const char *, char **);
+int cgetustr(char *, const char *, char **);
int daemon(int, int) __DARWIN_1050(daemon) __OSX_AVAILABLE_BUT_DEPRECATED_MSG(__MAC_10_0, __MAC_10_5, __IPHONE_2_0, __IPHONE_2_0, "Use posix_spawn APIs instead.") __WATCHOS_PROHIBITED __TVOS_PROHIBITED;
-char *_LIBC_CSTR devname(dev_t, mode_t);
-char *_LIBC_CSTR devname_r(dev_t, mode_t, char *_LIBC_COUNT(len) buf, int len);
-char *_LIBC_CSTR getbsize(int *, long *);
-int getloadavg(double [_LIBC_COUNT(__nelem)], int __nelem);
+char *devname(dev_t, mode_t);
+char *devname_r(dev_t, mode_t, char *buf, int len);
+char *getbsize(int *, long *);
+int getloadavg(double [], int);
const char
*getprogname(void);
void setprogname(const char *);
@@ -424,62 +399,62 @@
#endif
#endif /* __BLOCKS__ */
-int heapsort(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+int heapsort(void *__base, size_t __nel, size_t __width,
int (* _Nonnull __compar)(const void *, const void *));
#ifdef __BLOCKS__
-int heapsort_b(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+int heapsort_b(void *__base, size_t __nel, size_t __width,
int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* __BLOCKS__ */
-int mergesort(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+int mergesort(void *__base, size_t __nel, size_t __width,
int (* _Nonnull __compar)(const void *, const void *));
#ifdef __BLOCKS__
-int mergesort_b(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+int mergesort_b(void *__base, size_t __nel, size_t __width,
int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* __BLOCKS__ */
#ifndef UNIFDEF_DRIVERKIT
-void psort(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+void psort(void *__base, size_t __nel, size_t __width,
int (* _Nonnull __compar)(const void *, const void *))
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#ifdef __BLOCKS__
-void psort_b(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+void psort_b(void *__base, size_t __nel, size_t __width,
int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* __BLOCKS__ */
-void psort_r(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width, void *,
+void psort_r(void *__base, size_t __nel, size_t __width, void *,
int (* _Nonnull __compar)(void *, const void *, const void *))
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* UNIFDEF_DRIVERKIT */
#ifdef __BLOCKS__
-void qsort_b(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width,
+void qsort_b(void *__base, size_t __nel, size_t __width,
int (^ _Nonnull __compar)(const void *, const void *) __sort_noescape)
__OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
#endif /* __BLOCKS__ */
-void qsort_r(void *_LIBC_SIZE(__nel * __width) __base, size_t __nel, size_t __width, void *,
+void qsort_r(void *__base, size_t __nel, size_t __width, void *,
int (* _Nonnull __compar)(void *, const void *, const void *));
-int radixsort(const unsigned char *_LIBC_UNSAFE_INDEXABLE *_LIBC_COUNT(__nel) __base, int __nel, const unsigned char *_LIBC_COUNT_OR_NULL(256) __table,
+int radixsort(const unsigned char **__base, int __nel, const unsigned char *__table,
unsigned __endbyte);
int rpmatch(const char *)
__API_AVAILABLE(macos(10.15), ios(13.0), tvos(13.0), watchos(6.0));
-int sradixsort(const unsigned char *_LIBC_UNSAFE_INDEXABLE *_LIBC_COUNT(__nel) __base, int __nel, const unsigned char *_LIBC_COUNT_OR_NULL(256) __table,
+int sradixsort(const unsigned char **__base, int __nel, const unsigned char *__table,
unsigned __endbyte);
#ifndef UNIFDEF_DRIVERKIT
void sranddev(void);
void srandomdev(void);
/* reallocf is now declared in _malloc.h */
long long
- strtonum(const char *__numstr, long long __minval, long long __maxval, const char *_LIBC_CSTR *__errstrp)
+ strtonum(const char *__numstr, long long __minval, long long __maxval, const char **__errstrp)
__API_AVAILABLE(macos(10.16), ios(14.0), tvos(14.0), watchos(7.0));
#endif /* UNIFDEF_DRIVERKIT */
#if !__DARWIN_NO_LONG_LONG
long long
- strtoq(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
+ strtoq(const char *__str, char **__endptr, int __base);
unsigned long long
- strtouq(const char *__str, char *_LIBC_CSTR *__endptr, int __base);
-#endif /* !__DARWIN_NO_LONG_LONG */
-#ifndef UNIFDEF_DRIVERKIT
-extern char *_LIBC_CSTR suboptarg; /* getsubopt(3) external variable */
+ strtouq(const char *__str, char **__endptr, int __base);
+#endif /* !__DARWIN_NO_LONG_LONG */
+#ifndef UNIFDEF_DRIVERKIT
+extern char *suboptarg; /* getsubopt(3) external variable */
/* valloc is now declared in _malloc.h */
#endif /* UNIFDEF_DRIVERKIT */
__END_DECLS