From 7117946c2a12b5036ad262c011dc067dc877750c Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Thu, 7 Jul 2011 21:13:07 +0000
Subject: [PATCH] Merged revisions 3653 via svnmerge from
 https://vlnb@scst.svn.sourceforge.net/svnroot/scst/trunk

........
  r3653 | bvassche | 2011-07-03 05:36:33 -0400 (Sun, 03 Jul 2011) | 1 line

  scstadmin: Add command-line options -h and --help
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3665 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scstadmin | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 88d3f3659..0c3870922 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -13,6 +13,8 @@ sub usage
 $Version
 
 Usage:
+     -h, -help, --help       : Show this information.
+
 General Operations
      -config <config>        : Configure SCST given the specified <file>.
      -check_config <file>    : Checks the saved configuration <file>.
@@ -291,6 +293,7 @@ sub getArgs {
 	my $to;
 	my $device;
 
+	my $show_usage;
 	my $nonkey;
 	my $force;
 
@@ -364,10 +367,15 @@ sub getArgs {
 			    'to=s'		=> \$to,
 			    'device=s'		=> \$device,
 
+			    'h'			=> \$show_usage,
+			    'help'		=> \$show_usage,
+
 			    'nonkey'		=> \$nonkey,
 			    'noprompt'		=> \$_NOPROMPT_,
 			    'force'		=> \$force,
-			    'debug'             => \$_DEBUG_)) {
+			    'debug'             => \$_DEBUG_) ||
+	    defined($show_usage))
+	{
 		usage();
 	}