diff options
| author | Damien Miller <djm@mindrot.org> | 2024-01-08 14:45:14 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-01-08 14:45:14 +1100 |
| commit | 9ea0a4524ae3276546248a926b6641b2fbc8421b (patch) | |
| tree | 33a841a884e9cb3c4c7c4b68988ce39cbb16905e | |
| parent | a72833d00788ef91100c643536ac08ada46440e1 (diff) | |
unbreak fuzzers for clang16
getopt() needs a throw() attribute to compile, so supply one when compiling
things with C++
| -rw-r--r-- | openbsd-compat/getopt.h | 12 | ||||
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h index 65c8bc7f..b050fa83 100644 --- a/openbsd-compat/getopt.h +++ b/openbsd-compat/getopt.h @@ -33,6 +33,14 @@ #ifndef _GETOPT_H_ #define _GETOPT_H_ +#ifndef __THROW +# if defined __cplusplus +# define __THROW throw() +# else +# define __THROW +# endif +#endif + /* * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions */ @@ -63,8 +71,8 @@ int getopt_long_only(int, char * const *, const char *, #ifndef _GETOPT_DEFINED_ #define _GETOPT_DEFINED_ -int getopt(int, char * const *, const char *); -int getsubopt(char **, char * const *, char **); +int getopt(int, char * const *, const char *) __THROW; +int getsubopt(char **, char * const *, char **) __THROW; extern char *optarg; /* getopt(3) external variables */ extern int opterr; diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 78faea96..0823d6a8 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -48,6 +48,14 @@ #include "blf.h" #include "fnmatch.h" +#ifndef __THROW +# if defined __cplusplus +# define __THROW throw() +# else +# define __THROW +# endif +#endif + #if defined(HAVE_LOGIN_CAP) && !defined(HAVE_LOGIN_GETPWCLASS) # include <login_cap.h> # define login_getpwclass(pw) login_getclass(pw->pw_class) @@ -187,7 +195,7 @@ int getgrouplist(const char *, gid_t, gid_t *, int *); #endif #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET) -int BSDgetopt(int argc, char * const *argv, const char *opts); +int BSDgetopt(int argc, char * const *argv, const char *opts) __THROW; #include "openbsd-compat/getopt.h" #endif |