Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

main: Disable debug output by default

Browse Source 
Instead use '-d' command line option.  This option uses an optional
argument.  Without an argument, '*' is assumed.  Otherwise you can
specify a glob string to match.  Any debug output that matches the glob
string will be printed.  e.g.:

src/iwd -d '*eap*'
This commit is contained in:
Denis Kenzior 2018-05-19 18:29:28 -05:00
parent d54a8e56d3
commit 2aba2f3ba9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.c
View File

@ -60,6 +60,7 @@ static const char *nophys;
static const char *config_dir; static const char *config_dir;
static const char *plugins; static const char *plugins;
static const char *noplugins; static const char *noplugins;
static const char *debugopt;
static bool terminating; static bool terminating;
static void main_loop_quit(struct l_timeout *timeout, void *user_data) static void main_loop_quit(struct l_timeout *timeout, void *user_data)
@ -111,6 +112,7 @@ static void usage(void)
"\t-c, --config Configuration directory to use\n" "\t-c, --config Configuration directory to use\n"
"\t-l, --plugin Plugins to include\n" "\t-l, --plugin Plugins to include\n"
"\t-L, --noplugin Plugins to exclude\n" "\t-L, --noplugin Plugins to exclude\n"
"\t-d, --debug Enable debug output\n"
"\t-h, --help Show help options\n"); "\t-h, --help Show help options\n");
} }
@ -124,6 +126,7 @@ static const struct option main_options[] = {
{ "config", required_argument, NULL, 'c' }, { "config", required_argument, NULL, 'c' },
{ "plugin", required_argument, NULL, 'l' }, { "plugin", required_argument, NULL, 'l' },
{ "noplugin", required_argument, NULL, 'L' }, { "noplugin", required_argument, NULL, 'L' },
{ "debug", optional_argument, NULL, 'd' },
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ } { }
}; };
@ -312,7 +315,7 @@ int main(int argc, char *argv[])
for (;;) { for (;;) {
int opt; int opt;
opt = getopt_long(argc, argv, "Bi:I:p:P:c:vh", opt = getopt_long(argc, argv, "Bi:I:p:P:c:vd::h",
main_options, NULL); main_options, NULL);
if (opt < 0) if (opt < 0)
break; break;
@ -345,6 +348,14 @@ int main(int argc, char *argv[])
case 'L': case 'L':
noplugins = optarg; noplugins = optarg;
break; break;
case 'd':
if (optarg)
debugopt = optarg;
else if (argv[optind] && argv[optind][0] != '-')
debugopt = argv[optind++];
else
debugopt = "*";
break;
case 'h': case 'h':
usage(); usage();
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -372,7 +383,8 @@ int main(int argc, char *argv[])
signal = l_signal_create(&mask, signal_handler, NULL, NULL); signal = l_signal_create(&mask, signal_handler, NULL, NULL);
l_debug_enable("*"); if (debugopt)
l_debug_enable(debugopt);
#ifdef __GLIBC__ #ifdef __GLIBC__
__iwd_backtrace_init(); __iwd_backtrace_init();