amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-04-22 09:22:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cater for 'broken' long lines in config files

Browse source 
Allow for long line continuation in config files with a backslash.  Thanks to Mike Loseke for the patch
This commit is contained in:
Duncan Ferguson 2009-11-24 09:27:34 +00:00
parent ac1b4697cf
commit 214f5a6a71
3 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -4,6 +4,8 @@
- Thanks to Kristian Lyngstol for the patch
* Account for multiple host definitions within ssh configuration file
- Thanks to anonymous for the patch
* Allow for long line continuation in config files with a backslash
- Thanks to Mike Loseke for the patch
2009-09-24 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.27

1
THANKS
View file

@ -31,5 +31,6 @@ Gerfried Fuchs
Stanislas Rouvelin
Sami Kerola
Kristian Lyngstol
Mike Loseke
$Id$

48
src/cssh.pl
View file

@ -278,13 +278,20 @@ sub parse_config_file($) {
return if ( !-e $config_file || !-r $config_file );
open( CFG, $config_file ) or die("Couldnt open $config_file: $!");
while (<CFG>) {
next if ( /^\s*$/ || /^#/ ); # ignore blank lines & commented lines
s/#.*//; # remove comments from remaining lines
s/\s*$//; # remove trailing whitespace
chomp();
my $l;
while ( defined( $l = <CFG> ) ) {
next
if ( $l =~ /^\s*$/ || $l =~ /^#/ )
; # ignore blank lines & commented lines
$l =~ s/#.*//; # remove comments from remaining lines
$l =~ s/\s*$//; # remove trailing whitespace
chomp $l;
if ( $l =~ s/\\\s*$// ) {
$l .= <CFG>;
redo unless eof(CFG);
}
next unless m/\s*(\S+)\s*=\s*(.*)\s*/;
next unless $l =~ m/\s*(\S+)\s*=\s*(.*)\s*/;
my ( $key, $value ) = ( $1, $2 );
$config{$key} = $value;
logmsg( 3, "$key=$value" );
@ -609,11 +616,17 @@ sub get_clusters() {
if ( -f $cluster_file ) {
logmsg( 2, "Loading clusters in from $cluster_file" );
open( CLUSTERS, $cluster_file ) || die("Couldnt read $cluster_file");
while (<CLUSTERS>) {
my $l;
while ( defined( $l = <CLUSTERS> ) ) {
next
if ( /^\s*$/ || /^#/ ); # ignore blank lines & commented lines
chomp();
my @line = split(/\s/);
if ( $l =~ /^\s*$/ || $l =~ /^#/ )
; # ignore blank lines & commented lines
chomp $l;
if ( $l =~ s/\\\s*$// ) {
$l .= <CLUSTER>;
redo unless eof(CLUSTERS);
}
my @line = split( /\s/, $l );
#s/^([\w-]+)\s*//; # remote first word and stick into $1
@ -623,7 +636,7 @@ sub get_clusters() {
join( " ", @line[ 1 .. $#line ] )
);
$clusters{ $line[0] } = join( " ", @line[ 1 .. $#line ] )
; # Now bung in rest of line
; # Now bung in rest of line
}
close(CLUSTERS);
}
@ -665,11 +678,16 @@ sub get_clusters() {
logmsg( 2, "Loading clusters in from '$file'" );
open( CLUSTERS, $file ) || die("Couldnt read '$file': $!\n");
while (<CLUSTERS>) {
next if ( /^\s*$/ || /^#/ );
chomp;
my $l;
while ( defined( $l = <CLUSTERS> ) ) {
next if ( $l =~ /^\s*$/ || $l =~ /^#/ );
chomp $l;
if ( $l =~ s/\\\s*$// ) {
$l .= <CLUSTER>;
redo unless eof(CLUSTERS);
}
my @line = split(/\s/);
my @line = split( /\s/, $l );
logmsg(
3,
"cluster $line[0] = ",