s4: s4-funcs.sh comparison

comparison s4-funcs.sh @ 326:d19e85a72a29

Allow spaces and special characters in filenames(tentative).

author	HIROSE Yuuji <yuuji@gentei.org>
date	Fri, 21 Oct 2016 16:22:12 +0859
parents	18be0c210dc8
children	5e56160ad1f5

comparison

equal deleted inserted replaced

-:b5185c66aacc
+:d19e85a72a29
 	   val=`query "select val from $cond and type like 'file:%' order by rowid;"`
 err gvb1-sql: "select count(val) from $cond;"
 	   vcount=`query "select count(val) from $cond;"`
 	   echo $vcount > $td/$c.count
 	   i=0
-err gvbid: i=$i vcount=$vcount
+## err gvbid: i=$i vcount=$vcount
 	   while [ $i -lt $vcount ]; do
 	     slice="order by rowid limit 1 offset $i"
 	     i=$((i+1))
 	     fn=$c.$i
 err td=$td, fn=$fn, type=$type, val="[$val]"
 	     case $type in
 	       file:*)
 		 #file=$td/$val
-		 file=$td/`query "select val from $cond $slice;"`
+		 r_f=`query "select rowid||'//'||val from $cond $slice;"`
+		 f_rid=${r_f%%//*}
+		 file=$td/${r_f##*//}
 		 # FOR SPEED: Skip file generation if imgcache exists
-		 [ -s $file -a -s $td/$fn.rowid -a -s $file.rowid ] && continue
+		 [ -s "$file" -a -s "$td/$fn.rowid" -a -s "$file.rowid" ] \
+		     && [ x"$f_rid" = x"`cat $td/$fn.rowid`" ] \
+		     && continue
 		 # err gvbid-get="select quote(bin) from $cond $slice;"
-		 sq $db<<EOF | unhexize > $file
+## err output: "fn=[$fn] file=[$file]"
-.output $td/$fn.rowid
+		 sq $db<<EOF | unhexize > "$file"
+.output '$td/$fn.rowid'
 select rowid from $cond $slice;
-.output $td/$fn
+.output '$td/$fn'
 select val from $cond $slice;
-.output $file.content-type
+.output '$td/${fn}.content-type'
 select substr(type, 6) from $cond $slice;
 .output stdout
 select quote(bin) from $cond $slice;
 EOF
 		 ## err gvbid-get2: "`ls -lF $file`"
 		 ## err i=$i - file=$file rowid=`cat $td/$fn.rowid`
-		 cp $td/$fn.rowid $file.rowid 2>&3 # for convenience
+		 cp "$td/$fn.rowid" "$file.rowid" 2>&3 # for convenience
-		 cp $file $file.orig 2>&3
+		 cp "$file" "$file.orig" 2>&3
-		 ls -lh $file | awk '{print $5"B"}'|sed 's/BB/B/' > $file.size
+		 ls -lh "$file" |
-		 case $type in
+		     awk '{print $5"B"}'|sed 's/BB/B/' > "$file.size"
-		   *:[Ii]mage*) mogrify -geometry $thumbxy $file ;;
+		 case "$type" in
+		   *:[Ii]mage*) mogrify -geometry $thumbxy "$file" ;;
 		   ### ここのアイコンを増やしたい
 		   *|*:[Aa]pplication*)
 		     convert -geometry $thumbxy $imgdir/file-icon.png \
-			     png:- > $file
+			     png:- > "$file"
 		     ;;
 		 esac
 		 ;;
 	       *)
 		 sq $db<<EOF
 	   case $type in
 	     file:*)
 	       echo "$val" \
 		   | while read fn; do
 		       file=$td/$fn
-		       if [ ! -s $file ]; then
+		       if [ ! -s "$file" ]; then
 			## sq $db "select quote(bin) from $cond and val=\"$fn\"" \
 			 query "select quote(bin) from $cond and val=\"$fn\";" \
-			     | unhexize > $file
+			     | unhexize > "$file"
-			 echo ${type#file:} > $file.content-type
+			 ##@@## -- echo ${type#file:} > "$file.content-type"
-# err TTTTTTTTTTTTTTTT: $type
 			 case $type in
-			   *:[Ii]mage*) mogrify -geometry $thumbxy $file ;;
+			   *:[Ii]mage*) mogrify -geometry $thumbxy "$file" ;;
 			   *:[Aa]pplication*)
 			     convert -geometry $thumbxy $imgdir/file-icon.png \
 				     png:- > $file ;;
 			 esac
 		       fi
 	hexdump -ve '1/1 "%.2x"'
 }
 hexize="hexize_hd"
 fi
 fi
-cat $1 | $hexize | tr -d '\n'
+cat "$@" | $hexize | tr -d '\n'
 }
 unhexize() {
 if [ -z "$unhex" ]; then
 if type xxd >/dev/null 2>&1; then
 unhex="xxd -p -r"
 # avoided by creating scripts in a file where its parent directory is
 # world writable...:)
 unhex="perl -n $tmpd/unhex.pl"
 fi
 fi
-cat $1 | $unhex
+cat "$@" | $unhex
 #  cat $1 | tee /tmp/uh.in| $unhex | tee /tmp/uh.out
 }
 percenthex() {
-hexize $1 | sed 's/\(..\)/%\1/g'
+hexize "$@" | sed 's/\(..\)/%\1/g'
 }
 htmlescape() {
 sed -e 's/\&/\&amp;/g' -e 's/"/\&quot;/g' -e "s/'/\&apos;/g" \
 -e "s/</\&lt;/g; s/>/\&gt;/g"
 }
 case $conf in
 */password)
 type=encoded ### val=`echo $val|encode`
 ;;
 */image*|*/document*)
-type=`file --mime-type $val`
+type=`file --mime-type - < "$val" | cut -d' ' -f2`
-bin="X'`hexize $val`'"
+bin="X'`hexize "$val"`'"
 ;;
 esac
 pkey=`echo "$tconfs"|grep "${t0}/.*=p"|sed 1q`
 pkey=${pkey#/*/}		# cut $tbl/
 pkey=${pkey%=p/*}		# cut =p/... -> primary key
 	v="`echo ${us#*=}|unhexize|sed -e 's/\"/\"\"/g'`"
 # err k=$k v=$v
 	case "$k" in
 	  *:filename)
 	    type='file'; k=${k%:filename}
-(echo k=$k; ls -lF $tmpd/$v; file --mime-type $tmpd/$v) 1>&3
+	    # DO NOT ALLOW Space and '|' in file names
-	    case `file --mime-type $tmpd/$v|cut -d' ' -f2` in
+	    newv=`echo "$v"|sed 's/[ \|]/X/g'`
+	    if [ x"$v" != x"$newv" ]; then
+	    fi
+# (echo k=$k v="[$v]"; ls -lF "$tmpd/$v"; file --mime-type "$tmpd/$v") 1>&3
+	    case `file --mime-type - < "$tmpd/$v"|cut -d' ' -f2` in
 	      [Ii]mage/x-xcf)
-		bzip2 $tmpd/$v
+		bzip2 "$tmpd/$v"
 		v=${v}.bz2
 		;;
 	      [Ii]mage/x-*|*/vnd.*)	;;
 	      [Ii]mage/*)
-		mogrify -resize $maximagexy'>' $tmpd/$v
+		mogrify -resize $maximagexy'>' "$tmpd/$v"
 		;;
 	    esac
 	    ;;
 	  *)
 	    type='string'
 ## b is much smaller than a
 cat $tmpf | unhexize \
 	| tee $fifo \
 	| convert -define ${fmt}:size=${iconxy_M}x${iconxy_M} \
 		  -resize ${iconxy_M}x${iconxy_M}'>' - pnm:- \
-	| convert - $cacheimg_M &
+	| convert - "$cacheimg_M" &
 cat $fifo | convert -define ${fmt}:size=${iconxy_S}x${iconxy_S} \
 			-resize ${iconxy_S}x${iconxy_S}'>' - pnm:- \
-	| convert - $cacheimg_S &
+	| convert - "$cacheimg_S" &
 printf '%s' "<img src=\"data:${filetype},"
 cat $tmpf | sed 's/\(..\)/%\1/g'
 echo '">'
 echo "$sum" > $sumfile
 fi
 done
 echo '</div>'
 }
 iconhref() (
 # $1=icon-file, $2=Href $3=title $4...=anchor
-data=`percenthex $1`
+data=`percenthex "$1"`
-ct=`file --mime-type $1|cut -d' ' -f2`
+ct=`file --mime-type - < "$1"|cut -d' ' -f2`
 err iconhref: \$1=$1 \$2=$2 \$3="$@"
 href=$2; title=$3; shift 3
 echo "<a href=\"$href\"><img title=\"$title\" src=\"data:$ct,$data\">$@</a>"
 )
 iconhref2() (
 		image|document|binary)
 		  file=$tmpd/`getparfilename $v`
 		  err type=file=$file
 		  [ -z "$file" ] && continue
 		  bn=`sqlquotestr "${file##*/}"`
-		  bin="X'"$(hexize $file)"'"
+		  bin="X'"$(hexize "$file")"'"
-		  ct=`file --mime-type $file|cut -d' ' -f2`
+		  ct=`file --mime-type - < "$file" |cut -d' ' -f2`
 		  type=\"file:$ct\"
 		  newsql="update $tb2 set val=$bn, type=$type, bin=$bin"
 		  cachedir=`getcachedir "$tbl/$rowid"`
 		  err getcache tbl/rowid=$tbl/$rowid, rm -r $cachedir
-		  rm -r $cachedir
+		  rm -rf $cachedir
 		  ;;
 		*)
 		  newsql="update $tb2 set val=(select val from par where var \
 like '$col.%.$st_rowid')"
 		  ;;
 err partype$col=`getpartype $col "$limit"`
 case $ptype in
 	  file) file=$tmpd/`getparfilename $col "$limit"`
 err parfile-$col=$file
 	        [ -z "$file" ] && continue
-	        bin="X'"$(hexize $file)"'"
+	        bin="X'"$(hexize "$file")"'"
-	        ct=`file --mime-type $file|cut -d' ' -f2`
+	        ct=`file --mime-type - < "$file"|cut -d' ' -f2`
 	        type=\"file:$ct\" ;;
 	  "*"*) continue ;;	# foreign table
 	  *)    type=\"string\" ;;
 	esac
 	case `gettbl_coltype $tbl/$col` in
 if [ -n "$rowid" ]; then
 # err genform2a: Seeking for "$2.$name, type=$type"
 rawval=`getvalbyid $2 $name $rowid $td`
 val=`echo "$rawval"|htmlescape`
 err genform3a: getvalbyid $2 $name $rowid $td
-err genform3b: val="[$val]"
+err genform3b: val="[$val]" type="$type"
 fi
 if [ -n "$GF_VIEWONLY" ]; then
 is_hidden "$2" "$name" && continue
 fi
 case "$type" in
 	fi
 	form="$fh$form</select>"
 	;;
 [Ii][Mm][Aa][Gg][Ee]|[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt]|[Bb]inary)
 	if [ -s $td/$name.count ]; then
+err Calling cgi_multi_file: "nae=[$name] td=[$td] args=[$args]"
 	  form=`cgi_multi_file $name $td "$args"`
 	  if [ -n "$val" ]; then
 	    hrfb="$myname?showattc+$2_m"
 	    val=$(echo "$rawval" \
 		       | while read fn; do
-			   data=`percenthex $td/$fn`
+			   data=`percenthex "$td/$fn"`
 			   #ct=`cat $td/$fn.content-type`
-			   ct=`file --mime-type $td/$fn|cut -d' ' -f2`
+			   ct=`file --mime-type - < "$td/$fn"|cut -d' ' -f2`
-			   ri=`cat $td/$fn.rowid`
+			   ri=`cat "$td/$fn.rowid"`
-## err fn=$fn, name=$name, ri=$ri; ls -lF $td 1>&3
+err fn=$fn, name=$name, ri=$ri; ls -lF "$td/" 1>&3
 			   #imgsrc="<img src=\"data:$ct,$data\">"
 			   #echo "<a href=\"$hrfb+$ri\">$imgsrc</a><br>"
-			   iconhref $td/$fn "$hrfb+$ri" ""
+			   iconhref "$td/$fn" "$hrfb+$ri" ""
 			 done)
 	  fi
 	else
 	  form="<input type=\"file\" name=\"$name\" $args>"
 	  if [ -n "$val" ]; then
-	    imgs=$(echo "$val"\
+	    imgs=$(echo "$rawval"\
 			|while read fn;do
-			   data=`percenthex $td/$fn`
+			   data=`percenthex "$td/$fn"`
 			   echo "<img src=\"data:image/png,$data\">$fn<br>"
 			 done)
 	    form=$form"<br>$imgs"
 	    val=$imgs	# 2015-06-15
 	  else
 # tmpfiles=$tmpfiles"${tmpfiles+ }$idir"
 bin=$idir/$myname-$$.bin
 sql="select quote(bin) from $1 where rowid='$2';"
 err showattc: sql: $sql
 sq $db "$sql" | unhexize > $bin
-tv=`query "select type,val from $1 where rowid='$2';"`
+tv=`query "select type||'//'||val from $1 where rowid='$2';"`
-type=${tv%\|*} fn=${tv#*\|}
+type=${tv%//*} fn=${tv#*//}
 err tv=$tv type=$type fn=$fn, tp2=${tv%\|*}
 ct=${type#file:}
 case $ct in			# all text/* changed to text/plain
 text/*)
 charset=`nkf -g $bin|cut -d' ' -f1`

Mercurial > hgrepos > hgweb.cgi > s4

comparison s4-funcs.sh @ 326:d19e85a72a29