From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Mon, 16 Jul 2012 11:53:06 +0000 (+0200)
Subject: Update the usage note included in the source code
X-Git-Tag: v2.3.3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb9b619d8e2f03c8f11b1c4df70afc4194c12dd2;p=thirdparty%2Fsarg.git

Update the usage note included in the source code

The usage notice is displayed with sarg --help.

The first column is wider. The argument that's still too long is wrapped on
the next line.

The donation request is removed as I don't know if it still possible to
make a donation and, if it is possible, I don't know where that money goes.
---

diff --git a/usage.c b/usage.c
index 4e6ca73..084f712 100644
--- a/usage.c
+++ b/usage.c
@@ -30,38 +30,39 @@
 void usage(const char *prog)
 {
 	printf(_("Usage: %s [options...]\n"), prog);
-	puts  (_("     -a NAME|IP  Create report for host name or IP address"));
+	puts  (_("     -a NAME|IP    Create report for host name or IP address"));
 	//puts  (_("     -b Useragent log"));
-	puts  (_("     -c FILE     Exclude connected hosts from the report"));
-	puts  (_("     --convert   Convert the access.log file to a legible date"));
-	puts  (_("     --css       Output the internal CSS"));
-	puts  (_("     -d DATE     Date range to include in the report: from-until dd/mm/yyyy-dd/mm/yyyy"));
-	puts  (_("     -e MAIL     Email address to send reports to (stdout for console)"));
-	printf(_("     -f FILE     Config file to read (default is %s/sarg.conf)\n"),SYSCONFDIR);
-	puts  (_("     -g FMT      Date format [e=Europe -> dd/mm/yyyy, u=USA -> mm/dd/yyyy]"));
-	puts  (_("     -h          This help"));
-	puts  (_("     --help      This help"));
-	puts  (_("     -i          Reports by user and IP address"));
-	puts  (_("     --keeplogs  Keep every previously generated report"));
-	puts  (_("     -l FILE     Input log"));
-	puts  (_("     --lastlog   Set the number of previous reports to keep"));
-	puts  (_("     -m          Advanced process messages"));
-	puts  (_("     -n          Resolve IP addresses using RDNS"));
-	puts  (_("     -o DIR      Report output directory"));
-	puts  (_("     -p          Use Ip Address instead of userid (reports)"));
-	puts  (_("     -P PREFIX   Prepend a prefix to the splitted file names"));
-	puts  (_("     -s SITE     Limit report to accessed site [eg. www.microsoft.com]"));
-	puts  (_("     --split     Split the log file by date in -d parameter"));
-	puts  (_("     --splitprefix PREFIX Prepend a prefix to the splitted file names"));
-	puts  (_("     -t TIME     Limit report to time range [HH:MM or HH:MM-HH:MM]"));
-	puts  (_("     -u USER     Report only that user's activity"));
-	puts  (_("     -w DIR      Temporary directory"));
-	puts  (_("     -x          Debug messages"));
-	puts  (_("     -z          Process messages"));
+	puts  (_("     -c FILE        Exclude connected hosts from the report"));
+	puts  (_("     --convert      Convert the access.log file to a legible date"));
+	puts  (_("     --css          Output the internal CSS"));
+	puts  (_("     -d DATE        Date range to include in the report: from-until dd/mm/yyyy-dd/mm/yyyy"));
+	puts  (_("     -e MAIL        Email address to send reports to (stdout for console)"));
+	printf(_("     -f FILE        Config file to read (default is %s/sarg.conf)\n"),SYSCONFDIR);
+	puts  (_("     -g FMT         Date format [e=Europe -> dd/mm/yyyy, u=USA -> mm/dd/yyyy]"));
+	puts  (_("     -h             This help"));
+	puts  (_("     --help         This help"));
+	puts  (_("     -i             Reports by user and IP address"));
+	puts  (_("     --keeplogs     Keep every previously generated report"));
+	puts  (_("     -l FILE        Input log"));
+	puts  (_("     --lastlog      Set the number of previous reports to keep"));
+	puts  (_("     -m             Advanced process messages"));
+	puts  (_("     -n             Resolve IP addresses using RDNS"));
+	puts  (_("     -o DIR         Report output directory"));
+	puts  (_("     -p             Use Ip Address instead of userid (reports)"));
+	puts  (_("     -P PREFIX      Prepend a prefix to the splitted file names"));
+	puts  (_("     -s SITE        Limit report to accessed site [eg. www.microsoft.com]"));
+	puts  (_("     --split        Split the log file by date in -d parameter"));
+	puts  (_("     --splitprefix PREFIX\n"
+	         "                    Prepend a prefix to the splitted file names"));
+	puts  (_("     -t TIME        Limit report to time range [HH:MM or HH:MM-HH:MM]"));
+	puts  (_("     -u USER        Report only that user's activity"));
+	puts  (_("     -w DIR         Temporary directory"));
+	puts  (_("     -x             Debug messages"));
+	puts  (_("     -z             Process messages"));
 	printf("\n\t%s-%s\n",PGM,VERSION);
 	puts  ("\thttp://sarg.sourceforge.net");
-	puts  (_("\n\tPlease donate to the sarg project:"));
-	puts  ("\t\thttp://sarg.sourceforge.net/donations.php\n");
+	/*puts  (_("\n\tPlease donate to the sarg project:"));
+	puts  ("\t\thttp://sarg.sourceforge.net/donations.php\n");*/
 
 	return;
 }