@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2008 Sourcefire, Inc.

  *

  *  Author: aCaB <acab@clamav.net>

@@ -122,10 +122,17 @@ int main(int argc, char **argv) {

     }

     if(optget(opts, "help")->enabled) {

-	printf("Usage: %s [-c <config-file>]\n\n", argv[0]);

+    printf("\n");

+    printf("                       Clam AntiVirus: Milter Mail Scanner %s\n", get_version());

+    printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

+    printf("           (C) 2009-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+	printf("    %s [-c <config-file>]\n\n", argv[0]);

+    printf("\n");

 	printf("    --help                   -h       Show this help\n");

-	printf("    --version                -V       Show version and exit\n");

-	printf("    --config-file <file>     -c       Read configuration from file\n\n");

+	printf("    --version                -V       Show version\n");

+	printf("    --config-file <file>     -c       Read configuration from file\n");

+    printf("\n");

 	optfree(opts);

 	return 0;

     }

@@ -1,7 +1,7 @@

 /*

  *  ClamAV bytecode handler tool.

  *

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2009-2012 Sourcefire, Inc.

  *

  *  Authors: Török Edvin

@@ -48,12 +48,13 @@

 static void help(void)

 {

     printf("\n");

-    printf("           Clam AntiVirus: Bytecode Testing Tool %s\n",

-	   get_version());

+    printf("                       Clam AntiVirus: Bytecode Testing Tool %s\n", get_version());

     printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2009-2015 Cisco Systems, Inc.\n\n");

-    printf("clambc <file> [function] [param1 ...]\n\n");

-    printf("    --help                 -h         Show help\n");

+    printf("           (C) 2009-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+    printf("    clambc <file> [function] [param1 ...]\n");

+    printf("\n");

+    printf("    --help                 -h         Show this help\n");

     printf("    --version              -V         Show version\n");

     printf("    --debug                           Show debug\n");

     printf("    --force-interpreter    -f         Force using the interpreter instead of the JIT\n");

@@ -61,10 +62,11 @@ static void help(void)

     printf("    --info                 -i         Print information about bytecode\n");

     printf("    --printsrc             -p         Print bytecode source\n");

     printf("    --printbcir            -c         Print IR of bytecode signature\n");

+    printf("    --input                -c         Input file to run the bytecode on\n");

     printf("    --trace <level>        -T         Set bytecode trace level 0..7 (default 7)\n");

     printf("    --no-trace-showsource  -s         Don't show source line during tracing\n");

     printf("    --statistics=bytecode             Collect and print bytecode execution statistics\n");

-    printf("    file                              file to test\n");

+    printf("    file                              File to test\n");

     printf("\n");

     return;

 }

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2009-2013 Sourcefire, Inc.

  *  Author: Tomasz Kojm <tkojm@clamav.net>

  *

@@ -200,11 +200,11 @@ static int printconf(const char *name)

 static void help(void)

 {

     printf("\n");

-    printf("           Clam AntiVirus: Configuration Tool %s\n", get_version());

+    printf("                       Clam AntiVirus: Configuration Tool %s\n", get_version());

     printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2009-2015 Cisco Systems, Inc.\n\n");

-

-    printf("    --help                 -h         Show help\n");

+    printf("           (C) 2009-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+    printf("    --help                 -h         Show this help\n");

     printf("    --version              -V         Show version\n");

     printf("    --config-dir=DIR       -c DIR     Read configuration files from DIR\n");

     printf("    --non-default          -n         Only display non-default settings\n");

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2009 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm

@@ -82,14 +82,19 @@ int is_valid_hostid(void);

 static void help(void)

 {

     printf("\n");

-    printf("                      Clam AntiVirus Daemon %s\n", get_version());

+    printf("                      Clam AntiVirus: Daemon %s\n", get_version());

     printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2007-2017 Cisco Systems, Inc.\n\n");

-

-    printf("    --help                   -h             Show this help.\n");

-    printf("    --version                -V             Show version number.\n");

-    printf("    --debug                                 Enable debug mode.\n");

-    printf("    --config-file=FILE       -c FILE        Read configuration from FILE.\n\n");

+    printf("           (C) 2007-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+    printf("    clamd [options]\n");

+    printf("\n");

+    printf("    --help                   -h             Show this help\n");

+    printf("    --version                -V             Show version number\n");

+    printf("    --debug                                 Enable debug mode\n");

+    printf("    --config-file=FILE       -c FILE        Read configuration from FILE\n");

+    printf("\n");

+    printf("Pass in - as the filename for stdin.\n");

+    printf("\n");

 }

 static struct optstruct *opts;

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2009 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm, aCaB

@@ -179,15 +179,16 @@ int main(int argc, char **argv)

 void help(void)

 {

-

     mprintf_stdout = 1;

     mprintf("\n");

-    mprintf("                       ClamAV Daemon Client %s\n", get_version());

-    printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2007-2017 Cisco Systems, Inc.\n\n");

-

-    mprintf("    --help              -h             Show help\n");

+    mprintf("                      Clam AntiVirus: Daemon Client %s\n", get_version());

+    mprintf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

+    mprintf("           (C) 2007-2018 Cisco Systems, Inc.\n");

+    mprintf("\n");

+    mprintf("    clamdscan [options] [file/directory/-]\n");

+    mprintf("\n");

+    mprintf("    --help              -h             Show this help\n");

     mprintf("    --version           -V             Print version number and exit\n");

     mprintf("    --verbose           -v             Be verbose\n");

     mprintf("    --quiet                            Be quiet, only output error messages\n");

@@ -1233,16 +1233,18 @@ static void sigint(int a)

 static void help(void)

 {

     printf("\n");

-    printf("           Clam AntiVirus: Monitoring Tool %s\n", get_version());

+    printf("                       Clam AntiVirus: Monitoring Tool %s\n", get_version());

     printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2008-2017 Cisco Systems, Inc.\n\n");

-    printf("clamdtop [-hVc] [host[:port] /path/to/clamd.socket ...]\n\n");

-    printf("    --help                 -h         Show help\n");

+    printf("           (C) 2008-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+    printf("    clamdtop [-hVc] [host[:port] /path/to/clamd.socket ...]\n");

+    printf("\n");

+    printf("    --help                 -h         Show this help\n");

     printf("    --version              -V         Show version\n");

     printf("    --config-file=FILE     -c FILE    Read clamd's configuration files from FILE\n");

-    printf("    --defaultcolors	       -d	  Use default terminal colors\n");

-    printf("	host[:port]			  Connect to clamd on host at port (default 3310)\n");

-    printf("    /path/to/clamd.socket		  Connect to clamd over a local socket\n");

+    printf("    --defaultcolors	       -d         Use default terminal colors\n");

+    printf("    host[:port]                       Connect to clamd on host at port (default 3310)\n");

+    printf("    /path/to/clamd.socket             Connect to clamd over a local socket\n");

     printf("\n");

     return;

 }

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015, 2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2017-2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007-2012 Sourcefire, Inc.

  *

  *  Authors: Tomasz Kojm

@@ -197,15 +197,16 @@ int main(int argc, char **argv)

 void help(void)

 {

-

     mprintf_stdout = 1;

     mprintf("\n");

-    mprintf("                       Clam AntiVirus Scanner %s\n", get_version());

+    mprintf("                       Clam AntiVirus: Scanner %s\n", get_version());

     printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf("           (C) 2007-2017 Cisco Systems, Inc.\n\n");

-

-    mprintf("    --help                -h             Print this help screen\n");

+    printf("           (C) 2007-2018 Cisco Systems, Inc.\n");

+    mprintf("\n");

+    mprintf("    clamscan [options] [file/directory/-]\n");

+    mprintf("\n");

+    mprintf("    --help                -h             Show this help\n");

     mprintf("    --version             -V             Print version number\n");

     mprintf("    --verbose             -v             Be verbose\n");

     mprintf("    --archive-verbose     -a             Show filenames inside scanned archives\n");

@@ -219,8 +220,9 @@ void help(void)

     mprintf("\n");

     mprintf("    --tempdir=DIRECTORY                  Create temporary files in DIRECTORY\n");

     mprintf("    --leave-temps[=yes/no(*)]            Do not remove temporary files\n");

-    mprintf("    --database=FILE/DIR   -d FILE/DIR    Load virus database from FILE or load\n");

-    mprintf("                                         all supported db files from DIR\n");

+    mprintf("    --gen-json[=yes/no(*)]               Generate JSON description of scanned file(s). JSON will be printed and also-\n");

+    mprintf("                                         dropped to the temp directory if --leave-temps is enabled.\n");

+    mprintf("    --database=FILE/DIR   -d FILE/DIR    Load virus database from FILE or load all supported db files from DIR\n");

     mprintf("    --official-db-only[=yes/no(*)]       Only load official signatures\n");

     mprintf("    --log=FILE            -l FILE        Save scan report to FILE\n");

     mprintf("    --recursive[=yes/no(*)]  -r          Scan subdirectories recursively\n");

@@ -252,11 +254,11 @@ void help(void)

     mprintf("    --phishing-sigs[=yes(*)/no]          Signature-based phishing detection\n");

     mprintf("    --phishing-scan-urls[=yes(*)/no]     URL-based phishing detection\n");

     mprintf("    --heuristic-scan-precedence[=yes/no(*)] Stop scanning as soon as a heuristic match is found\n");

-    mprintf("    --phishing-ssl[=yes/no(*)]           Always block SSL mismatches in URLs (phishing module)\n");

-    mprintf("    --phishing-cloak[=yes/no(*)]         Always block cloaked URLs (phishing module)\n");

-    mprintf("    --partition-intersection[=yes/no(*)] Detect partition intersections in raw disk images using heuristics.\n");

+    mprintf("    --phishing-ssl[=yes/no(*)]           Always block (flag) SSL mismatches in URLs (phishing module)\n");

+    mprintf("    --phishing-cloak[=yes/no(*)]         Always block (flag) cloaked URLs (phishing module)\n");

+    mprintf("    --partition-intersection[=yes/no(*)] Detect partition intersections in raw disk images using heuristics\n");

     mprintf("    --algorithmic-detection[=yes(*)/no]  Algorithmic detection\n");

-    mprintf("    --normalize[=yes(*)/no]              Normalize html, script, and text files. Use normalize=no for yara compatibility.\n");

+    mprintf("    --normalize[=yes(*)/no]              Normalize html, script, and text files. Use normalize=no for yara compatibility\n");

     mprintf("    --scan-pe[=yes(*)/no]                Scan PE files\n");

     mprintf("    --scan-elf[=yes(*)/no]               Scan ELF files\n");

     mprintf("    --scan-ole2[=yes(*)/no]              Scan OLE2 containers\n");

@@ -267,8 +269,9 @@ void help(void)

     mprintf("    --scan-hwp3[=yes(*)/no]              Scan HWP3 files\n");

     mprintf("    --scan-archive[=yes(*)/no]           Scan archive files (supported by libclamav)\n");

     mprintf("    --detect-broken[=yes/no(*)]          Try to detect broken executable files\n");

-    mprintf("    --block-encrypted[=yes/no(*)]        Block encrypted archives\n");

-    mprintf("    --block-macros[=yes/no(*)]           Block OLE2 files with VBA macros\n");

+    mprintf("    --block-encrypted[=yes/no(*)]        Block (flag) encrypted archives\n");

+    mprintf("    --block-macros[=yes/no(*)]           Block (flag) OLE2 files with VBA macros\n");

+    mprintf("    --block-max[=yes/no(*)]              Block (flag) files that exceed max file size, max scan size, or max recursion limit\n");

     mprintf("    --nocerts                            Disable authenticode certificate chain verification in PE files\n");

     mprintf("    --dumpcerts                          Dump authenticode certificate chain in PE files\n");

     mprintf("\n");

@@ -292,6 +295,8 @@ void help(void)

 #endif /* HAVE_PCRE */

     mprintf("    --disable-cache                      Disable caching and cache checks for hash sums of scanned files.\n");

     mprintf("\n");

+    mprintf("Pass in - as the filename for stdin.\n");

+    mprintf("\n");

     mprintf("(*) Default scan settings\n");

     mprintf("(**) Certain files (e.g. documents, archives, etc.) may in turn contain other\n");

     mprintf("   files inside. The above options ensure safe processing of this kind of data.\n\n");

@@ -29,16 +29,22 @@ typedef struct _write_data {

 void usage(char *name)

 {

-    fprintf(stderr, "USAGE: %s -hHinpVv?\n", name);

-    fprintf(stderr, "OPTIONS:\n");

-    fprintf(stderr, "    -e [EMAIL]\tYour email address (required)\n");

-    fprintf(stderr, "    -h or -?\tShow the help text\n");

-    fprintf(stderr, "    -n [FILE]\tSubmit a false negative (FN)\n");

-    fprintf(stderr, "    -N [NAME]\tYour name contained in quotation marks (required)\n");

-    fprintf(stderr, "    -p [FILE]\tSubmit a false positive (FP)\n");

-    fprintf(stderr, "    -V [NAME] \tDetected virus name(required with -p)\n");

-    fprintf(stderr, "    -v\t\tShow version number and exit\n");

-    fprintf(stderr, "You must specify -n or -p. Both are mutually exclusive. Pass in - as the filename for stdin.\n");

+    printf("\n");

+    printf("                       Clam AntiVirus: Monitoring Tool %s\n", get_version());

+    printf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

+    printf("           (C) 2008-2018 Cisco Systems, Inc.\n");

+    printf("\n");

+    printf("    %s -hHinpVv?\n", name);

+    printf("\n");

+    printf("    -h or -?                  Show this help\n");

+    printf("    -v                        Show version\n");

+    printf("    -e [EMAIL]                Your email address (required)\n");

+    printf("    -n [FILE/-]               Submit a false negative (FN)\n");

+    printf("    -N [NAME]                 Your name contained in quotation marks (required)\n");

+    printf("    -p [FILE/-]               Submit a false positive (FP)\n");

+    printf("    -V [VIRUS]                Detected virus name (required with -p)\n");

+    printf("\n");

+    printf("You must specify -n or -p. Both are mutually exclusive. Pass in - as the filename for stdin.\n\n");

     exit(0);

 }

@@ -1,4 +1,4 @@

-.TH "clamav-milter.conf" "5" "February 12, 2007" "ClamAV @VERSION@" "Clam AntiVirus"

+.TH "clamav-milter.conf" "5" "Feb 25, 2009" "ClamAV @VERSION@" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 \fBclamav-milter.conf\fR \- Configuration file for clamav-milter

@@ -52,4 +52,4 @@ By The ClamAV Team: http://www.clamav.net/about.html#credits

 .LP

 (C) 2009-2013 Sourcefire, Inc.

 .LP

-(C) 2014 Cisco Systems, Inc. All Rights Reserved

+(C) 2014-2018 Cisco Systems, Inc. All Rights Reserved

@@ -51,6 +51,9 @@ Create temporary files in DIRECTORY. Directory must be writable for the '@CLAMAV

 \fB\-\-leave\-temps\fR

 Do not remove temporary files.

 .TP 

+\fB\-\-gen\-json\fR

+Generate JSON description of scanned file(s). JSON will be printed and also dropped to the temp directory if --leave-temps is enabled.

+.TP 

 \fB\-d FILE/DIR, \-\-database=FILE/DIR\fR

 Load virus database from FILE or load all virus database files from DIR.

 .TP 

@@ -33,6 +33,9 @@ Don't print and log warnings.

 \fB\-\-stdout\fR

 Write all messages to stdout.

 .TP 

+\fB\-\-show\-progress\fR

+Show download progress percentage.

+.TP 

 \fB\-\-config\-file=FILE

 Read configuration from FILE.

 .TP

@@ -145,67 +145,41 @@ help (void)

 {

     mprintf_stdout = 1;

-    mprintf 

-        ("\n");

-    mprintf 

-        ("                   Clam AntiVirus: freshclam  %s\n", get_version ());

-    printf 

-        ("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

-    printf 

-        ("           (C) 2007-2017 Cisco Systems, Inc.\n\n");

-    mprintf 

-        ("    --help               -h              show help\n");

-    mprintf

-        ("    --version            -V              print version number and exit\n");

-    mprintf 

-        ("    --verbose            -v              be verbose\n");

-    mprintf

-        ("    --debug                              enable debug messages\n");

-    mprintf

-        ("    --quiet                              only output error messages\n");

-    mprintf

-        ("    --no-warnings                        don't print and log warnings\n");

-    mprintf

-        ("    --stdout                             write to stdout instead of stderr\n");

-    mprintf

-        ("    --show-progress                      show download progress percentage\n");

-    mprintf 

-        ("\n");

-    mprintf

-        ("    --config-file=FILE                   read configuration from FILE.\n");

-    mprintf 

-        ("    --log=FILE           -l FILE         log into FILE\n");

+    mprintf("\n");

+    mprintf("                      Clam AntiVirus: Database Updater %s\n", get_version());

+    mprintf("           By The ClamAV Team: http://www.clamav.net/about.html#credits\n");

+    mprintf("           (C) 2007-2018 Cisco Systems, Inc.\n");

+    mprintf("\n");

+    mprintf("    freshclam [options]\n");

+    mprintf("\n");

+    mprintf("    --help               -h              Show this help\n");

+    mprintf("    --version            -V              Print version number and exit\n");

+    mprintf("    --verbose            -v              Be verbose\n");

+    mprintf("    --debug                              Enable debug messages\n");

+    mprintf("    --quiet                              Only output error messages\n");

+    mprintf("    --no-warnings                        Don't print and log warnings\n");

+    mprintf("    --stdout                             Write to stdout instead of stderr\n");

+    mprintf("    --show-progress                      Show download progress percentage\n");

+    mprintf("\n");

+    mprintf("    --config-file=FILE                   Read configuration from FILE.\n");

+    mprintf("    --log=FILE           -l FILE         Log into FILE\n");

 #ifndef _WIN32

-    mprintf 

-        ("    --daemon             -d              run in daemon mode\n");

-    mprintf

-        ("    --pid=FILE           -p FILE         save daemon's pid in FILE\n");

-    mprintf 

-        ("    --user=USER          -u USER         run as USER\n");

+    mprintf("    --daemon             -d              Run in daemon mode\n");

+    mprintf("    --pid=FILE           -p FILE         Save daemon's pid in FILE\n");

+    mprintf("    --user=USER          -u USER         Run as USER\n");

 #endif

-    mprintf

-        ("    --no-dns                             force old non-DNS verification method\n");

-    mprintf

-        ("    --checks=#n          -c #n           number of checks per day, 1 <= n <= 50\n");

-    mprintf

-        ("    --datadir=DIRECTORY                  download new databases into DIRECTORY\n");

+    mprintf("    --no-dns                             Force old non-DNS verification method\n");

+    mprintf("    --checks=#n          -c #n           Number of checks per day, 1 <= n <= 50\n");

+    mprintf("    --datadir=DIRECTORY                  Download new databases into DIRECTORY\n");

 #ifdef BUILD_CLAMD

-    mprintf

-        ("    --daemon-notify[=/path/clamd.conf]   send RELOAD command to clamd\n");

+    mprintf("    --daemon-notify[=/path/clamd.conf]   Send RELOAD command to clamd\n");

 #endif

-    mprintf

-        ("    --local-address=IP   -a IP           bind to IP for HTTP downloads\n");

-    mprintf

-        ("    --on-update-execute=COMMAND          execute COMMAND after successful update\n");

-    mprintf

-        ("    --on-error-execute=COMMAND           execute COMMAND if errors occurred\n");

-    mprintf

-        ("    --on-outdated-execute=COMMAND        execute COMMAND when software is outdated\n");

-    mprintf

-        ("    --list-mirrors                       print mirrors from mirrors.dat\n");

-    mprintf

-        ("    --update-db=DBNAME                   only update database DBNAME\n");

-

+    mprintf("    --local-address=IP   -a IP           Bind to IP for HTTP downloads\n");

+    mprintf("    --on-update-execute=COMMAND          Execute COMMAND after successful update\n");

+    mprintf("    --on-error-execute=COMMAND           Execute COMMAND if errors occurred\n");

+    mprintf("    --on-outdated-execute=COMMAND        Execute COMMAND when software is outdated\n");

+    mprintf("    --list-mirrors                       Print mirrors from mirrors.dat\n");

+    mprintf("    --update-db=DBNAME                   Only update database DBNAME\n");

     mprintf ("\n");

 }

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *  Copyright (C) 2015, 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

  *  Copyright (C) 2007 - 2013 Sourcefire, Inc.

  *  Copyright (C) 2002 - 2007 Tomasz Kojm <tkojm@clamav.net>

  *  CDIFF code (C) 2006 Sensory Networks, Inc.

@@ -3508,32 +3508,34 @@ static int dumpcerts(const struct optstruct *opts)

 static void help(void)

 {

     mprintf("\n");

-    mprintf("Clam AntiVirus: Signature Tool (sigtool)  %s\n", get_version());

-    mprintf("       By The ClamAV Team: http://www.clamav.net/team\n");

-    mprintf("       (C) 2007-2017 Cisco Systems, Inc.\n\n");

-

-    mprintf("    --help                 -h              show help\n");

-    mprintf("    --version              -V              print version number and exit\n");

-    mprintf("    --quiet                                be quiet, output only error messages\n");

-    mprintf("    --debug                                enable debug messages\n");

-    mprintf("    --stdout                               write to stdout instead of stderr\n");

-    mprintf("    --hex-dump                             convert data from stdin to a hex\n");

+    mprintf("                      Clam AntiVirus: Signature Tool %s\n", get_version());

+    mprintf("           By The ClamAV Team: http://www.clamav.net/team\n");

+    mprintf("           (C) 2007-2018 Cisco Systems, Inc.\n");

+    mprintf("\n");

+    mprintf("    sigtool [options]\n");

+    mprintf("\n");

+    mprintf("    --help                 -h              Show this help\n");

+    mprintf("    --version              -V              Print version number and exit\n");

+    mprintf("    --quiet                                Be quiet, output only error messages\n");

+    mprintf("    --debug                                Enable debug messages\n");

+    mprintf("    --stdout                               Write to stdout instead of stderr\n");

+    mprintf("    --hex-dump                             Convert data from stdin to a hex\n");

     mprintf("                                           string and print it on stdout\n");

-    mprintf("    --md5 [FILES]                          generate MD5 checksum from stdin\n");

+    mprintf("    --md5 [FILES]                          Generate MD5 checksum from stdin\n");

     mprintf("                                           or MD5 sigs for FILES\n");

-    mprintf("    --sha1 [FILES]                         generate SHA1 checksum from stdin\n");

+    mprintf("    --sha1 [FILES]                         Generate SHA1 checksum from stdin\n");

     mprintf("                                           or SHA1 sigs for FILES\n");

-    mprintf("    --sha256 [FILES]                       generate SHA256 checksum from stdin\n");

+    mprintf("    --sha256 [FILES]                       Generate SHA256 checksum from stdin\n");

     mprintf("                                           or SHA256 sigs for FILES\n");

-    mprintf("    --mdb [FILES]                          generate .mdb (section hash) sigs\n");

-    mprintf("    --imp [FILES]                          generate .imp (import table hash) sigs\n");

-    mprintf("    --html-normalise=FILE                  create normalised parts of HTML file\n");

-    mprintf("    --ascii-normalise=FILE                 create normalised text file from ascii source\n");

-    mprintf("    --utf16-decode=FILE                    decode UTF16 encoded files\n");

-    mprintf("    --info=FILE            -i FILE         print database information\n");

-    mprintf("    --build=NAME [cvd] -b NAME             build a CVD file\n");

+    mprintf("    --mdb [FILES]                          Generate .mdb (section hash) sigs\n");

+    mprintf("    --imp [FILES]                          Generate .imp (import table hash) sigs\n");

+    mprintf("    --html-normalise=FILE                  Create normalised parts of HTML file\n");

+    mprintf("    --ascii-normalise=FILE                 Create normalised text file from ascii source\n");

+    mprintf("    --utf16-decode=FILE                    Decode UTF16 encoded files\n");

+    mprintf("    --info=FILE            -i FILE         Print database information\n");

+    mprintf("    --build=NAME [cvd] -b NAME             Build a CVD file\n");

     mprintf("    --max-bad-sigs=NUMBER                  Maximum number of mismatched signatures\n");

-    mprintf("                                           when building a CVD. Default: 3000\n");

+    mprintf("                                           When building a CVD. Default: 3000\n");

     mprintf("    --flevel=FLEVEL                        Specify a custom flevel.\n");

     mprintf("                                           Default: %u\n", cl_retflevel());

     mprintf("    --cvd-version=NUMBER                   Specify the version number to use for\n");