Mercurial > hgrepos > hgweb.cgi > s4
diff s4-blog.sh @ 81:ddc8a4c0b8d9
All macro-expanding by m4 bypassed via syscmd or spaste
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Mon, 03 Aug 2015 09:34:43 +0900 |
parents | 39e69daa2071 |
children | 82e215e75468 |
line wrap: on
line diff
--- a/s4-blog.sh Sun Aug 02 17:05:08 2015 +0900 +++ b/s4-blog.sh Mon Aug 03 09:34:43 2015 +0900 @@ -452,13 +452,16 @@ return fi fi - m4 -D_TITLE_="${guide}新規話題作成" \ - -D_FORMHEAD_="序文は簡単に詳しくはコメントに" \ - -D_DUMPHEAD_="これまでの蓄積" \ - -D_FORM_="`genform $formdir/blog.def`" \ - -D_DUMPTABLE_="`listblog $listing`" \ - $layout/html.m4.html \ - $layout/form+dump-whead.m4.html + echo "${guide}新規話題作成" > $tmpd/title.$$ + listblog $listing > $tmpd/listblog.$$ + genform $formdir/blog.def \ + | m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" \ + -D_FORMHEAD_="序文は簡単に詳しくはコメントに" \ + -D_DUMPHEAD_="これまでの蓄積" \ + -D_FORM_="syscmd(\`cat')" \ + -D_DUMPTABLE_="spaste(\`$tmpd/listblog.$$')" \ + $layout/html.m4.html \ + $layout/form+dump-whead.m4.html } blog_reply() { @@ -497,9 +500,11 @@ fi fi def=$formdir/article.def + echo "$title" > $tmpd/title.$$ + echo "$subtitle" > $tmpd/subtitle.$$ blog_showentry blog $rowid \ - | m4 -D_TITLE_="$title" -D_BODYCLASS_=general \ - -D_FORMHEAD_="$subtitle" -D_FORM_="" \ + | m4 -D_TITLE_="spaste(\`$tmpd/title.$$')" -D_BODYCLASS_=general \ + -D_FORMHEAD_="spaste(\`$tmpd/subtitle.$$')" -D_FORM_="" \ -D_DUMPTABLE_="syscmd(cat)" -D_DUMPHEAD_="" \ $layout/html.m4.html $layout/form+dump-whead.m4.html }