From 253ff23f9e3a26c9575758fd1849b457c5d4d635 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 22 Mar 2021 14:49:07 +1100 Subject: Use a platform-specific routine for long option usage Related to https://github.com/htop-dev/htop/pull/564 --- linux/Platform.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'linux/Platform.h') diff --git a/linux/Platform.h b/linux/Platform.h index 30544997..18d303d1 100644 --- a/linux/Platform.h +++ b/linux/Platform.h @@ -27,19 +27,6 @@ in the source distribution for its full text. #define PATH_MAX 4096 #endif -#ifdef HAVE_LIBCAP - #define PLATFORM_LONG_OPTIONS \ - {"drop-capabilities", optional_argument, 0, 128}, - #define PLATFORM_LONG_OPTIONS_USAGE \ - " --drop-capabilities[=none|basic|strict] Drop Linux capabilities when running as root\n" \ - " none - do not drop any capabilities\n" \ - " basic (default) - drop all capabilities not needed by htop\n" \ - " strict - drop all capabilities except those needed for core functionality\n" -#else - #define PLATFORM_LONG_OPTIONS - #define PLATFORM_LONG_OPTIONS_USAGE -#endif - extern const ProcessField Platform_defaultFields[]; @@ -95,6 +82,15 @@ static inline void Platform_getRelease(char** string) { *string = Generic_uname(); } +#ifdef HAVE_LIBCAP + #define PLATFORM_LONG_OPTIONS \ + {"drop-capabilities", optional_argument, 0, 128}, +#else + #define PLATFORM_LONG_OPTIONS +#endif + +void Platform_longOptionsUsage(const char* name); + bool Platform_getLongOption(int opt, int argc, char** argv); #endif -- cgit v1.2.3