From: Peter A. Bigot <pab@pabigot.com>
Date: Sat, 31 May 2014 21:27:16 +0000 (-0500)
Subject: rrdcached: arrange option flags in order
X-Git-Tag: v1.5.0-rc1~77^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c5277c88549fb45440b7cd87ce7e18b3e10067a;p=thirdparty%2Frrdtool-1.x.git

rrdcached: arrange option flags in order

To make it easier to determine which argument flags are available, the
getopt optstring is sorted into ASCII order.  Checking this against the
documentation indicated several supported flags were not present in the
synopsis.  Also make all flags bold for consistency.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---

diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod
index b46a9455..8ac11a4c 100644
--- a/doc/rrdcached.pod
+++ b/doc/rrdcached.pod
@@ -7,20 +7,23 @@ rrdcached - Data caching daemon for rrdtool
 =head1 SYNOPSIS
 
 B<rrdcached>
-[B<-P>E<nbsp>I<permissions>]
+[B<-a>E<nbsp>I<alloc_size>]
+[B<-b>E<nbsp>I<base_dir>E<nbsp>[B<-B>]]
+[B<-F>]
+[B<-f>E<nbsp>I<timeout>]
+[B<-g>]
+[B<-j>E<nbsp>I<journal_dir>]
+[B<-L>]
 [B<-l>E<nbsp>I<address>]
+[B<-m>E<nbsp>I<mode>]
+[B<-O>]
+[B<-P>E<nbsp>I<permissions>]
+[B<-p>E<nbsp>I<pid_file>]
+[B<-R>]
 [B<-s>E<nbsp>I<group>]
+[B<-t>E<nbsp>I<write_threads>]
 [B<-w>E<nbsp>I<timeout>]
 [B<-z>E<nbsp>I<delay>]
-[B<-f>E<nbsp>I<timeout>]
-[B<-p>E<nbsp>I<pid_file>]
-[B<-t>E<nbsp>I<write_threads>]
-[B<-j>E<nbsp>I<journal_dir>]
-[-F]
-[-g]
-[B<-b>E<nbsp>I<base_dir>E<nbsp>[B<-B>]]
-[B<-a>E<nbsp>I<alloc_size>]
-[-O]
 
 =head1 DESCRIPTION
 
diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 546e2920..06e7da50 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -3434,7 +3434,7 @@ static int read_options (int argc, char **argv) /* {{{ */
   default_socket.socket_group = (gid_t)-1;
   default_socket.socket_permissions = (mode_t)-1;
 
-  while ((option = getopt(argc, argv, "OgLl:s:m:P:f:w:z:t:BRb:p:Fj:a:h?")) != -1)
+  while ((option = getopt(argc, argv, "?a:Bb:Ff:ghj:Ll:m:OP:p:Rs:t:w:z:")) != -1)
   {
     switch (option)
     {
@@ -3762,29 +3762,30 @@ static int read_options (int argc, char **argv) /* {{{ */
             "Usage: rrdcached [options]\n"
             "\n"
             "Valid options are:\n"
+            "  -a <size>     Memory allocation chunk size. Default is 1.\n"
+            "  -B            Restrict file access to paths within -b <dir>\n"
+            "  -b <dir>      Base directory to change to.\n"
+            "  -F            Always flush all updates at shutdown\n"
+            "  -f <seconds>  Interval in which to flush dead data.\n"
+            "  -g            Do not fork and run in the foreground.\n"
+            "  -j <dir>      Directory in which to create the journal files.\n"
+            "  -L            Open sockets on all INET interfaces using default port.\n"
             "  -l <address>  Socket address to listen to.\n"
             "                Default: "RRDCACHED_DEFAULT_ADDRESS"\n"
+            "  -m <mode>     File permissions (octal) of all following UNIX "
+                            "sockets\n"
+            "  -O            Do not allow CREATE commands to overwrite existing\n"
+            "                files, even if asked to.\n"
             "  -P <perms>    Sets the permissions to assign to all following "
                             "sockets\n"
-            "  -w <seconds>  Interval in which to write data.\n"
-            "  -z <delay>    Delay writes up to <delay> seconds to spread load\n"
-            "  -t <threads>  Number of write threads.\n"
-            "  -f <seconds>  Interval in which to flush dead data.\n"
             "  -p <file>     Location of the PID-file.\n"
-            "  -b <dir>      Base directory to change to.\n"
-            "  -B            Restrict file access to paths within -b <dir>\n"
             "  -R            Allow recursive directory creation within -b <dir>\n"
-            "  -g            Do not fork and run in the foreground.\n"
-            "  -j <dir>      Directory in which to create the journal files.\n"
-            "  -F            Always flush all updates at shutdown\n"
             "  -s <id|name>  Group owner of all following UNIX sockets\n"
             "                (the socket will also have read/write permissions "
                             "for that group)\n"
-            "  -m <mode>     File permissions (octal) of all following UNIX "
-                            "sockets\n"
-            "  -a <size>     Memory allocation chunk size. Default is 1.\n"
-            "  -O            Do not allow CREATE commands to overwrite existing\n"
-            "                files, even if asked to.\n"
+            "  -t <threads>  Number of write threads.\n"
+            "  -w <seconds>  Interval in which to write data.\n"
+            "  -z <delay>    Delay writes up to <delay> seconds to spread load\n"
             "\n"
             "For more information and a detailed description of all options "
             "please refer\n"