commit: f8287200aec0ca33ef07fafcdd5aef0aa6eb1306 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 10:15:57 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 28 10:18:34 2023 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f8287200
*: IWYU fixes Separate from the first commit as this one was done programmatically with dev-util/include-what-you-use. Signed-off-by: Sam James <sam <AT> gentoo.org> dumpelf.c | 13 +++++++++++++ paxelf.c | 13 +++++++++++++ paxelf.h | 2 ++ paxinc.c | 7 +++++++ paxinc.h | 10 +++++++++- paxldso.c | 17 +++++++++++++++++ paxldso.h | 2 ++ paxmacho.c | 12 ++++++++++++ paxmacho.h | 2 ++ pspax.c | 21 ++++++++++++++++++++- scanelf.c | 22 ++++++++++++++++++++++ scanmacho.c | 19 +++++++++++++++++++ security.c | 13 +++++++++++++ xfuncs.c | 6 ++++++ 14 files changed, 157 insertions(+), 2 deletions(-) diff --git a/dumpelf.c b/dumpelf.c index 4742a50..baa6358 100644 --- a/dumpelf.c +++ b/dumpelf.c @@ -8,7 +8,20 @@ const char argv0[] = "dumpelf"; +#include <getopt.h> +#include <inttypes.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + #include "paxinc.h" +#include "elf.h" +#include "pax_utils_version.h" +#include "porting.h" +#include "security.h" /* prototypes */ static void dump_ehdr(const elfobj *elf, const void *ehdr); diff --git a/paxelf.c b/paxelf.c index 331f1b4..0268fa4 100644 --- a/paxelf.c +++ b/paxelf.c @@ -6,7 +6,20 @@ * Copyright 2005-2012 Mike Frysinger - <[email protected]> */ +#include <fcntl.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <unistd.h> + #include "paxinc.h" +#include "elf.h" +#include "paxelf.h" +#include "porting.h" +#include "xfuncs.h" /* * Setup a bunch of helper functions to translate diff --git a/paxelf.h b/paxelf.h index ac41a64..31ef298 100644 --- a/paxelf.h +++ b/paxelf.h @@ -16,6 +16,8 @@ #include <stdio.h> #include <sys/types.h> +#include "elf.h" + typedef struct { const void *phdr; const void *shdr; diff --git a/paxinc.c b/paxinc.c index 64a3069..7dfd4ca 100644 --- a/paxinc.c +++ b/paxinc.c @@ -11,6 +11,13 @@ #define IN_paxinc #include "paxinc.h" +#include <alloca.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <unistd.h> + +#include "xfuncs.h" + char do_reverse_endian; /* some of this ar code was taken from busybox */ diff --git a/paxinc.h b/paxinc.h index 3dd163a..7eb6802 100644 --- a/paxinc.h +++ b/paxinc.h @@ -11,6 +11,15 @@ #ifndef _PAX_INC_H #define _PAX_INC_H +#include <byteswap.h> +#include <errno.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <stdint.h> + #include "porting.h" #include "xfuncs.h" #include "security.h" @@ -35,7 +44,6 @@ #include "elf.h" #include "paxelf.h" #include "paxldso.h" - /* Mach-O love */ #include "macho.h" #include "paxmacho.h" diff --git a/paxldso.c b/paxldso.c index ce7facd..acab364 100644 --- a/paxldso.c +++ b/paxldso.c @@ -6,7 +6,24 @@ * Copyright 2004-2016 Mike Frysinger - <[email protected]> */ +#include <ctype.h> +#include <fcntl.h> +#include <features.h> +#include <glob.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <unistd.h> + #include "paxinc.h" +#include "elf.h" +#include "paxelf.h" +#include "paxldso.h" +#include "xfuncs.h" /* * ld.so.cache logic diff --git a/paxldso.h b/paxldso.h index fd9f344..1e95851 100644 --- a/paxldso.h +++ b/paxldso.h @@ -9,6 +9,8 @@ #ifndef _PAX_LDSO_H #define _PAX_LDSO_H +#include <features.h> + #include "paxelf.h" #include "porting.h" #include "xfuncs.h" diff --git a/paxmacho.c b/paxmacho.c index 74f02da..fcdff4b 100644 --- a/paxmacho.c +++ b/paxmacho.c @@ -7,7 +7,19 @@ * 2008-2021 Fabian Groffen - <[email protected]> */ +#include <byteswap.h> +#include <fcntl.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <unistd.h> + #include "paxinc.h" +#include "macho.h" +#include "paxmacho.h" +#include "xfuncs.h" /* lil' static string pool */ static const char STR_BE[] = "BE"; diff --git a/paxmacho.h b/paxmacho.h index c32ccbb..b109af5 100644 --- a/paxmacho.h +++ b/paxmacho.h @@ -13,6 +13,8 @@ #define _PAX_MACHO_H #include <stddef.h> +#include <byteswap.h> +#include <stdint.h> #include "macho.h" diff --git a/pspax.c b/pspax.c index 6094882..1e75494 100644 --- a/pspax.c +++ b/pspax.c @@ -14,12 +14,31 @@ const char argv0[] = "pspax"; -#include "paxinc.h" #include <grp.h> +#include <ctype.h> +#include <dirent.h> +#include <fcntl.h> +#include <getopt.h> +#include <pwd.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <sys/stat.h> +#include <unistd.h> + +#include "paxinc.h" +#include "elf.h" +#include "pax_utils_version.h" +#include "paxelf.h" +#include "security.h" #ifdef WANT_SYSCAP # undef _POSIX_SOURCE # include <sys/capability.h> + # define WRAP_SYSCAP(x) x #else # define WRAP_SYSCAP(x) diff --git a/scanelf.c b/scanelf.c index 50497b2..ee990c9 100644 --- a/scanelf.c +++ b/scanelf.c @@ -8,7 +8,29 @@ const char argv0[] = "scanelf"; +#include <ctype.h> +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <fnmatch.h> +#include <getopt.h> +#include <inttypes.h> +#include <regex.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <unistd.h> + #include "paxinc.h" +#include "elf.h" +#include "pax_utils_version.h" +#include "paxldso.h" +#include "porting.h" +#include "security.h" +#include "xfuncs.h" #define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') diff --git a/scanmacho.c b/scanmacho.c index e2aa485..fa1eee1 100644 --- a/scanmacho.c +++ b/scanmacho.c @@ -11,7 +11,26 @@ const char argv0[] = "scanmacho"; +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <getopt.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <unistd.h> + #include "paxinc.h" +#include "macho.h" +#include "pax_utils_version.h" +#include "paxmacho.h" +#include "porting.h" +#include "security.h" +#include "xfuncs.h" #define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') diff --git a/security.c b/security.c index 19bf78f..f1a34df 100644 --- a/security.c +++ b/security.c @@ -5,8 +5,21 @@ * Copyright 2015 Mike Frysinger - <[email protected]> */ +#include <errno.h> + +#ifdef WANT_SECCOMP +#include <linux/seccomp.h> +#include <linux/securebits.h> +#endif + +#include <sched.h> +#include <stdbool.h> +#include <sys/prctl.h> +#include <unistd.h> + #include "paxinc.h" #include "seccomp-bpf.h" +#include "security.h" #ifdef __linux__ diff --git a/xfuncs.c b/xfuncs.c index cd73dfa..e912fb0 100644 --- a/xfuncs.c +++ b/xfuncs.c @@ -6,7 +6,13 @@ * Copyright 2004-2012 Mike Frysinger - <[email protected]> */ +#include <errno.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> + #include "paxinc.h" +#include "xfuncs.h" char *xstrdup(const char *s) {
