# HG changeset patch # User HIROSE Yuuji # Date 1589189848 -32400 # Node ID 5b5c64023cf5bdc1c19df8490c456d3bb244723d # Parent ad6b57bd6a208f936d8c5121ece194a4483966b0 Keyword sanitization and variable cleanup diff -r ad6b57bd6a20 -r 5b5c64023cf5 s4-funcs.sh --- a/s4-funcs.sh Mon May 11 18:09:41 2020 +0900 +++ b/s4-funcs.sh Mon May 11 18:37:28 2020 +0900 @@ -2204,9 +2204,8 @@ convert -geometry $thumbxy $imgdir/$deficon $dir/$deficon fi if [ -n "$2" ]; then - ptn=`echo $2 | tr -d '\n'` - cond1="(nick like '%${ptn}%' or b.name like '%${ptn}%')" - kwd=$2 + kwd=`echo $2 | tr -d '";\n' | tr -d "'"` + cond1="(nick like '%${kwd}%' or b.name like '%${kwd}%')" fi tag=`getpar tag` tag2=`getpar tag2` if [ x"$tag" = x"NULL" ]; then