From ae43f59996adc59f42723a2f2a5cca6b41d03b7d Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 23 Feb 2007 16:24:17 +0000 Subject: [PATCH] * genini (get): Only quote $val when specific keys. Change embedded quotes to apostophes. --- ChangeLog | 5 +++++ genini | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9319e78..048eccb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-23 Christopher Faylor + + * genini (get): Only quote $val when specific keys. Change embedded + quotes to apostophes. + 2007-02-23 Christopher Faylor Servaas Goossens diff --git a/genini b/genini index fe0ad9b..ac366a7 100755 --- a/genini +++ b/genini @@ -84,7 +84,9 @@ sub get { my $key = shift; my $val = shift; - if (substr($val, 0, 1) eq '"') { + if (substr($val, 0, 1) ne '"') { + $val = '"'. $val . '"' if $key eq 'ldesc' || $key eq 'sdesc'; + } else { while (length($val) == 1 || $val !~ /"$/os) { $_ = <$FH>; length or last; @@ -93,9 +95,7 @@ sub get { $val .= "\n" . $_; } } - if (($key eq 'ldesc' || $key eq 'sdesc') and $val !~ /"/o) { - $pkg{$pname}{$what}{$key} = '"' . $val . '"'; - } + $val =~ s/(.)"(.)/$1'$2/mog; return $val; } @@ -105,7 +105,7 @@ sub parse { my $what; $main::curfile = $f; $. = 0; - open(F, '<', $f) or die "$0: couldn't open $f - $!\n"; + open(\*F, '<', $f) or die "$0: couldn't open $f - $!\n"; while () { chomp; s/#.*$//o; -- 2.43.7