From 748f22c12ce64ab28fb4a37f9067437b70b8e16e Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Fri, 8 Jan 2010 01:44:50 +0100 Subject: [PATCH] INI parser fix: allow for greedy whitespace chompage --- bin/psyconf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bin/psyconf b/bin/psyconf index 33f0a18..d10d57a 100755 --- a/bin/psyconf +++ b/bin/psyconf @@ -82,10 +82,7 @@ sub say { next if /^;/; next if /^\s*$/; $f = $1, next if /^\[(\w+)\]\s*$/; - # Room name 'ornia ' is not permitted. - # isn't this stripping trailing whitespace properly? - # should it read \S.+\S ? or at least .+\S ? - $c{"$f$1"} = $2, next if /^(\w+)\s*=\s*(.+)\s*$/; + $c{"$f$1"} = $2, next if /^(\w+)\s*=\s*(.+?)\s*$/; die "cannot parse line $. in $conf:\n\t$_\n"; } close C;