From 87cd3bcd69d7ada1163a06a48307cd67d2ea216f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 7 Jun 2017 12:24:52 +0200 Subject: src: display default directory for file inclusion in -h/--help If no explicit relative or absolute path is enforced by the user, nft relies on either -I/--includepath or the default include directory that is set at compile time. Given most of our users will rely on packaged versions of nft, provide a way to display the location of this default includepath directory. Signed-off-by: Pablo Neira Ayuso --- doc/nft.xml | 5 +++++ src/main.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/nft.xml b/doc/nft.xml index f93baa03..faf0ffde 100644 --- a/doc/nft.xml +++ b/doc/nft.xml @@ -212,6 +212,11 @@ vi:ts=4 sw=4 current working directory (ie. relative path) or / for file location expressed as an absolute path. + + If -I/--includepath is not specified, then nft relies on the default directory + that is specified at compile time. You can retrieve this default directory via + -h/--help option. + If the filename parameter is a directory, then all files in the directory are loaded in alphabetical order. diff --git a/src/main.c b/src/main.c index 6dae817a..5089ff24 100644 --- a/src/main.c +++ b/src/main.c @@ -125,12 +125,12 @@ static void show_help(const char *name) " -s, --stateless Omit stateful information of ruleset.\n" " -N Translate IP addresses to names.\n" " -a, --handle Output rule handle.\n" -" -I, --includepath Add to the paths searched for include files.\n" +" -I, --includepath Add to the paths searched for include files. Default is: %s\n" #ifdef DEBUG " --debug Specify debugging level (scanner, parser, eval, netlink, mnl, proto-ctx, segtree, all)\n" #endif "\n", - name); + name, DEFAULT_INCLUDE_PATH); } #ifdef DEBUG -- cgit v1.2.3