From b1b8d7a4baa558565d4e441e57d4a9941da9ed3a Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 Mar 2011 10:28:59 +0000
Subject: [PATCH] ptserver: Rationalise usage message

Rather than having 4 copies of the usage message, just have one
with #ifdef switches to disable options that are not available in
that build.

Change-Id: If888a64307b78189fcf617bbe0dc4ca9e55e8d2b
Reviewed-on: http://gerrit.openafs.org/4304
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/ptserver/ptserver.c | 58 ++++++++++-------------------------------
 1 file changed, 14 insertions(+), 44 deletions(-)

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index f4d84343b..d1c789ce8 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -340,62 +340,32 @@ main(int argc, char **argv)
 	}
 	else if (*arg == '-') {
 	    /* hack in help flag support */
-
-#if defined(SUPERGROUPS)
-#ifndef AFS_NT40_ENV
-	    printf("Usage: ptserver [-database <db path>] "
-		   "[-auditlog <log path>] "
-		   "[-audit-interface <file|sysvmq> (default is file)] "
-		   "[-syslog[=FACILITY]] [-d <debug level>] "
-		   "[-p <number of processes>] [-rebuild] "
-		   "[-groupdepth <depth>] "
-		   "[-restricted] [-rxmaxmtu <bytes>] [-rxbind] "
-		   "[-allow-dotted-principals] "
-		   "[-enable_peer_stats] [-enable_process_stats] "
-		   "[-default_access default_user_access default_group_access] "
-		   "[-help]\n");
-#else /* AFS_NT40_ENV */
 	    printf("Usage: ptserver [-database <db path>] "
 		   "[-auditlog <log path>] "
-		   "[-audit-interface <file|sysvmq> (default is file)] "
-		   "[-d <debug level>] "
-		   "[-p <number of processes>] [-rebuild] [-rxbind] "
-		   "[-allow-dotted-principals] "
-		   "[-default_access default_user_access default_group_access] "
-		   "[-restricted] [-rxmaxmtu <bytes>] [-rxbind] "
-		   "[-groupdepth <depth>] " "[-help]\n");
-#endif
-#else
+		   "[-audit-interface <file|sysvmq> (default is file)] ");
 #ifndef AFS_NT40_ENV
-	    printf("Usage: ptserver [-database <db path>] "
-		   "[-auditlog <log path>] "
-		   "[-audit-interface <file|sysvmq> (default is file)] "
-		   "[-d <debug level>] "
-		   "[-syslog[=FACILITY]] "
-		   "[-p <number of processes>] [-rebuild] "
-		   "[-enable_peer_stats] [-enable_process_stats] "
-		   "[-default_access default_user_access default_group_access] "
-		   "[-restricted] [-rxmaxmtu <bytes>] [-rxbind] "
-		   "[-allow-dotted-principals] "
-		   "[-help]\n");
-#else /* AFS_NT40_ENV */
-	    printf("Usage: ptserver [-database <db path>] "
-		   "[-auditlog <log path>] [-d <debug level>] "
-		   "[-default_access default_user_access default_group_access] "
-		   "[-restricted] [-rxmaxmtu <bytes>] [-rxbind] "
-		   "[-allow-dotted-principals] "
-		   "[-p <number of processes>] [-rebuild] " "[-help]\n");
+	    printf("[-syslog[=FACILITY]] ");
 #endif
+	    printf("[-d <debug level>] "
+		   "[-p <number of processes>] [-rebuild] [-rxbind] ");
+#if defined(SUPERGROUPS)
+	    printf("[-groupdepth <depth>] ");
+#endif
+	    printf("[-restricted] [-rxmaxmtu <bytes>] "
+		   "[-allow-dotted-principals] ");
+#ifndef AFS_NT40_ENV
+	    printf("[-enable_peer_stats] [-enable_process_stats] ");
 #endif
+	    printf("[-default_access default_user_access default_group_access] "
+		   "[-help]\n");
+
 	    fflush(stdout);
 
 	    PT_EXIT(1);
 	}
-#if defined(SUPERGROUPS)
 	else {
 	    fprintf(stderr, "Unrecognized arg: '%s' ignored!\n", arg);
 	}
-#endif
     }
 
     if (auditFileName) {
-- 
2.39.5