From 45ba75a9a48f61b65e4487fa706dc764a85198b9 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Thu, 28 May 2020 23:11:24 +0200 Subject: idevicesyslog: Add command line switch --no-colors to disable colored output --- docs/idevicesyslog.1 | 3 +++ tools/idevicesyslog.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/idevicesyslog.1 b/docs/idevicesyslog.1 index fce1ff5..b7bc04f 100644 --- a/docs/idevicesyslog.1 +++ b/docs/idevicesyslog.1 @@ -25,6 +25,9 @@ enable communication debugging .TP .B \-h, \-\-help prints usage information +.TP +.B \-\-no\-colors +disable colored output .SH FILTER OPTIONS .TP diff --git a/tools/idevicesyslog.c b/tools/idevicesyslog.c index 5d5a639..bd692cd 100644 --- a/tools/idevicesyslog.c +++ b/tools/idevicesyslog.c @@ -526,6 +526,7 @@ static void print_usage(int argc, char **argv, int is_error) " -x, --exit exit when device disconnects\n" \ " -h, --help prints usage information\n" \ " -d, --debug enable communication debugging\n" \ + " --no-colors disable colored output\n" \ "\n" \ "FILTER OPTIONS:\n" \ " -m, --match STRING only print messages that contain STRING\n" \ @@ -553,6 +554,7 @@ int main(int argc, char *argv[]) COLOR_RESET = csbi.wAttributes; } #endif + int no_colors = 0; int include_filter = 0; int exclude_filter = 0; int include_kernel = 0; @@ -573,6 +575,7 @@ int main(int argc, char *argv[]) { "kernel", no_argument, NULL, 'k' }, { "no-kernel", no_argument, NULL, 'K' }, { "quiet-list", no_argument, NULL, 1 }, + { "no-colors", no_argument, NULL, 2 }, { NULL, 0, NULL, 0} }; @@ -682,6 +685,9 @@ int main(int argc, char *argv[]) printf("%s\n", QUIET_FILTER); return 0; } + case 2: + no_colors = 1; + break; default: print_usage(argc, argv, 1); return 2; @@ -733,7 +739,7 @@ int main(int argc, char *argv[]) argc -= optind; argv += optind; - if (isatty(1)) { + if (!no_colors && isatty(1)) { use_colors = 1; } -- cgit v1.1-32-gdbae