Apply patch from Dan Wallis

Update THANKS file
Update and correct typos in ChangeLog

clusterssh/ChangeLog

@@ -1,6 +1,10 @@
 ??? Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.24-1
 
 * Do not attempt to re-resolve IP addresses
+* Apply patch from Dan Wallis
+- Add '-C <file>' command to load in specific config file
+- Typo correct in pod
+- Cope with random/strange config files better
 
 2008-01-23 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.23-1
 
@@ -26,7 +30,7 @@
 
 2007-11-26 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.20-1
 
-* Move source repository frmo CVS to SVN on sourceforge
+* Move source repository from CVS to SVN on sourceforge
 * Remove last digit of version number since not required with SVN
 * Add in host menu option to close inactive windows
 * Apply bugfixes suppled by Tony Mancill
@@ -37,7 +41,7 @@
 * Slight rewording of man page
 * Add in option to use telnet as comms command (use 'ctel' to invoke script)
 * Run through perltidy -b -i=2
-* Appy patches frmo Klaus Ethgen
+* Appy patches from Klaus Ethgen
 - Client dies when cannot write to pipe
 - Sleeping and flushing in window manager to allow time to draw windows
 - Fix pipe reading to not use undefined values

clusterssh/THANKS

@@ -19,5 +19,11 @@ Olivier Beyssac
 Rob Dawson
 Steve Roome
 D. Dumont
+Dan Wallis
+Jima
+Harald Weidner
+Klaus Ethgen
+Nicolas Simonds
+Peter Palfrader
 
 $Id$

clusterssh/src/cssh.pl

@@ -85,7 +85,7 @@ use Net::hostent;
 my $scriptname = $0;
 $scriptname =~ s!.*/!!;    # get the script name, minus the path
 
-my $options = 'dDv?hHuqQgGist:T:c:l:o:e:';    # Command line options list
+my $options = 'dDv?hHuqQgGist:T:c:l:o:e:C:';    # Command line options list
 my %options;
 my %config;
 my $debug = 0;
@@ -231,8 +231,7 @@ sub parse_config_file($) {
     s/\s*$//;                       # remove trailing whitespace
     chomp();
 
-    #my ($key, $value) = split(/[ 	]*=[ 	]*/);
-    /(\w+)[   ]*=[  ]*(.*)/;
+    next unless m/\s*(\S+)\s*=\s*(.*)\s*/;
     my ( $key, $value ) = ( $1, $2 );
     $config{$key} = $value;
     logmsg( 3, "$key=$value" );
@@ -345,6 +344,9 @@ sub check_config() {
 sub load_configfile() {
   parse_config_file( $sysconfigdir . '/csshrc' );
   parse_config_file( $ENV{HOME} . '/.csshrc' );
+  if ( $options{C} && -r $options{C} ) {
+    parse_config_file( "$options{C}" );
+  }
   check_config();
 }
 
@@ -2015,6 +2017,10 @@ Enable|Disable window tiling (overriding the config file)
 
 Use supplied file as additional cluster file (see also L<"FILES">)
 
+=item -C <file>
+
+Use supplied file as additional configuration file (see also L<"FILES">)
+
 =item -l $LOGNAME
 
 Specify the default username to use for connections (if different from the
@@ -2321,7 +2327,7 @@ left and then up
 
 B<NOTE:> The key shortcut modifiers must be in the form "Control", "Alt", or 
 "Shift", i.e. with the first letter capitalised and the rest lower case.  Keys
-may also be disabled individually by setting to the work "null".
+may also be disabled individually by setting to the word "null".
 
 =back