From c9b9e4e9bfe9740234b673c88eeb0ba992e8a2b3 Mon Sep 17 00:00:00 2001 From: Uriel Date: Tue, 3 Mar 2009 20:23:00 +0000 Subject: [PATCH] Preserve ifs when calling other functions after temporary altering it. Fixes a couple of minor bugs. Added difs env var that can be used anywhere to restore default ifs. --- apps/blagh/atom.tpl | 2 +- apps/blagh/rss20.tpl | 2 +- bin/werc.rc | 1 + bin/werclib.rc | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/blagh/atom.tpl b/apps/blagh/atom.tpl index b4bcb5e..85e5966 100644 --- a/apps/blagh/atom.tpl +++ b/apps/blagh/atom.tpl @@ -16,7 +16,7 @@ fn statpost { #mdate=`{/bin/date -Rd `{mtime $f|awk '{print $1}' }} # Not used because it is unreliable by=$stat(2) #ifs=() { summary=`{cat $f/index.md | crop_text 1024 ... | $formatter } } - ifs=() { summary=`{cat $f/index.md | $formatter } } + ifs=() { summary=`{cat $f/index.md | ifs=$difs {$formatter} } } } updated = `{/bin/date --rfc-3339'=seconds' |sed 's/ /T/'} %} diff --git a/apps/blagh/rss20.tpl b/apps/blagh/rss20.tpl index c64ef64..38622d1 100644 --- a/apps/blagh/rss20.tpl +++ b/apps/blagh/rss20.tpl @@ -15,7 +15,7 @@ fn statpost { #mdate=`{/bin/date -Rd $stat(1)} # Not used because it is unreliable post_uri=$base_url^`{cleanname `{echo $f | sed -e 's!^'$sitedir'!!'}}^'/' by=$stat(2) - ifs=() { summary=`{cat $f/index.md | $formatter | escape_html} } + ifs=() {summary=`{ cat $f/index.md | ifs=$difs {$formatter | escape_html} }} } %} diff --git a/bin/werc.rc b/bin/werc.rc index bb3d14b..82ba813 100755 --- a/bin/werc.rc +++ b/bin/werc.rc @@ -7,6 +7,7 @@ cd .. forbidden_uri_chars='[^a-zA-Z0-9_+\-\/\.,:]' +difs=$ifs # Used to restore default ifs when needed # Expected input: ls -F style, $sitedir/path/to/files/ # diff --git a/bin/werclib.rc b/bin/werclib.rc index 6659c9e..132e5ff 100644 --- a/bin/werclib.rc +++ b/bin/werclib.rc @@ -45,7 +45,7 @@ fn get_user { get_post_args user_name user_password if(~ $#user_name 0) { - ifs=':' { cu=`{get_cookie werc_user|tr -d $NEW_LINE} } + ifs=':' { cu=`{ifs=$difs {get_cookie werc_user} | tr -d $NEW_LINE} } if(! ~ $#cu 0) { user_name=$cu(1) user_password=$cu(3)