From d6bd6bb441d55182a02e92eceb650cea6df837d8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 22 Jun 2009 16:00:05 -0700
Subject: [PATCH] add a function to show help

---
 scripts/commandline.inc | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 8da42873a2..a245b2f163 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -65,6 +65,28 @@ $parser = new Console_Getopt();
 
 list($options, $args) = $parser->getopt($argv, $shortoptions, $longoptions);
 
+function show_help()
+{
+    global $helptext;
+
+    $_default_help_text = <<<END_OF_DEFAULT
+General options:
+
+    -q --quiet           Quiet (little output)
+    -v --verbose         Verbose (lots of output)
+    -c --conf=<filename> Use <filename> as config file
+    -s --server=<name>   Use <name> as server name
+    -p --path=<path>     Use <path> as path name
+    -h --help            Show this message and quit.
+
+END_OF_DEFAULT;
+        if (isset($helptext)) {
+            print $helptext;
+        }
+        print $_default_help_text;
+        exit(0);
+}
+
 foreach ($options as $option) {
 
     switch ($option[0]) {
@@ -85,22 +107,7 @@ foreach ($options as $option) {
 
      case '--help':
      case '-h':
-        $_default_help_text = <<<END_OF_DEFAULT
-General options:
-
-    -q --quiet           Quiet (little output)
-    -v --verbose         Verbose (lots of output)
-    -c --conf=<filename> Use <filename> as config file
-    -s --server=<name>   Use <name> as server name
-    -p --path=<path>     Use <path> as path name
-    -h --help            Show this message and quit.
-
-END_OF_DEFAULT;
-        if (isset($helptext)) {
-            print $helptext;
-        }
-        print $_default_help_text;
-        exit(0);
+        show_help();
     }
 }