s4
changeset 657:5b5c64023cf5
Keyword sanitization and variable cleanup
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Mon, 11 May 2020 18:37:28 +0900 |
parents | ad6b57bd6a20 |
children | ef138b0c44a5 |
files | s4-funcs.sh |
diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Mon May 11 18:09:41 2020 +0900 1.2 +++ b/s4-funcs.sh Mon May 11 18:37:28 2020 +0900 1.3 @@ -2204,9 +2204,8 @@ 1.4 convert -geometry $thumbxy $imgdir/$deficon $dir/$deficon 1.5 fi 1.6 if [ -n "$2" ]; then 1.7 - ptn=`echo $2 | tr -d '\n'` 1.8 - cond1="(nick like '%${ptn}%' or b.name like '%${ptn}%')" 1.9 - kwd=$2 1.10 + kwd=`echo $2 | tr -d '";\n' | tr -d "'"` 1.11 + cond1="(nick like '%${kwd}%' or b.name like '%${kwd}%')" 1.12 fi 1.13 tag=`getpar tag` tag2=`getpar tag2` 1.14 if [ x"$tag" = x"NULL" ]; then