1
1

* extfs/audio.in: Fix even more quoting issues.

* extfs/hp48.in: Likewise.

	Patch from q# <eth0 o2 pl>.
Этот коммит содержится в:
Roland Illig 2004-10-18 02:20:09 +00:00
родитель e85a083b79
Коммит 3b6db492a3
3 изменённых файлов: 21 добавлений и 14 удалений

Просмотреть файл

@ -1,3 +1,10 @@
2004-10-18 Roland Illig <roland.illig@gmx.de>
* extfs/audio.in: Fix even more quoting issues.
* extfs/hp48.in: Likewise.
Patch from q# <eth0 o2 pl>.
2004-10-18 Roland Illig <roland.illig@gmx.de> 2004-10-18 Roland Illig <roland.illig@gmx.de>
* extfs/uar.in: Improve filename quoting. Add error messages. * extfs/uar.in: Improve filename quoting. Add error messages.

Просмотреть файл

@ -12,7 +12,7 @@ CDDB_SERVER="http://freedb.freedb.org"
CDDB_HANDSHAKE="hello=user+localhost+mc+1.0&proto=1" CDDB_HANDSHAKE="hello=user+localhost+mc+1.0&proto=1"
CDDB_TIMEOUT=20 # in seconds CDDB_TIMEOUT=20 # in seconds
audiofs_list () audiofs_list()
{ {
DATE=`date +"%b %d %H:%M"` DATE=`date +"%b %d %H:%M"`
echo "-r--r--r-- 1 0 0 0 $DATE CDDB" echo "-r--r--r-- 1 0 0 0 $DATE CDDB"
@ -24,7 +24,7 @@ audiofs_list ()
done done
} }
audiofs_copyout () audiofs_copyout()
{ {
if [ "$2" == "CDDB" ]; then if [ "$2" == "CDDB" ]; then
DISCID=`cd-discid "$1" | tr " " "+"` DISCID=`cd-discid "$1" | tr " " "+"`
@ -32,7 +32,7 @@ audiofs_copyout ()
exit 1 exit 1
fi fi
RESPONSE=`wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | tee "$3" | @AWK@ '/^200/ { print $2,$3; }'` RESPONSE=`wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+query+$DISCID&$CDDB_HANDSHAKE" | tee "$3" | @AWK@ '/^200/ { print $2,$3; }'`
wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> $3 wget -q -T $CDDB_TIMEOUT -O - "$CDDB_SERVER/~cddb/cddb.cgi?cmd=cddb+read+$RESPONSE&$CDDB_HANDSHAKE" | grep -v "^#" >> "$3"
else else
TRACK=`echo "$2" | sed 's/track-0*//' | sed 's/\.wav//'` TRACK=`echo "$2" | sed 's/track-0*//' | sed 's/\.wav//'`
cdparanoia -q -d "$1" $TRACK "$3" >/dev/null cdparanoia -q -d "$1" $TRACK "$3" >/dev/null
@ -41,9 +41,9 @@ audiofs_copyout ()
if [ ! -b "$2" ] if [ ! -b "$2" ]
then then
BASE=/dev/cdrom BASE="/dev/cdrom"
else else
BASE=$2 BASE="$2"
fi fi
case "$1" in case "$1" in

Просмотреть файл

@ -26,13 +26,13 @@ KERMIT="kermit -l /dev/ttyS1 -b 9600"
hp48_cmd() hp48_cmd()
{ {
$KERMIT -C "SET EXIT WARNING OFF,REMOTE $*,QUIT" $KERMIT -C "SET EXIT WARNING OFF,REMOTE $@,QUIT"
} }
hp48_cd() hp48_cd()
{ {
(echo SET EXIT WARNING OFF;echo REMOTE HOST HOME (echo SET EXIT WARNING OFF;echo REMOTE HOST HOME
for HP48_DIR in `echo "$*" | tr '/' ' '`;do for HP48_DIR in `echo "$1" | tr '/' ' '`;do
if [ "x$HP48_DIR" != "x." ];then echo REMOTE HOST "$HP48_DIR"; fi if [ "x$HP48_DIR" != "x." ];then echo REMOTE HOST "$HP48_DIR"; fi
done done
echo QUIT)| $KERMIT -B >/dev/null echo QUIT)| $KERMIT -B >/dev/null
@ -79,20 +79,20 @@ hp48_list()
LC_ALL=C LC_ALL=C
export LC_ALL export LC_ALL
case $1 in case "$1" in
list) HP48_CDIR= list) HP48_CDIR=
hp48_cmd HOST HOME >/dev/null hp48_cmd HOST HOME >/dev/null
hp48_list hp48_list
exit 0;; exit 0;;
copyout) copyout)
cd `dirname "$4"` cd "`dirname "$4"`"
hp48_cd `dirname "$3"` hp48_cd "`dirname "$3"`"
$KERMIT -B -g `basename "$3"` -a "$4" >/dev/null $KERMIT -B -g "`basename "$3"`" -a "$4" >/dev/null
exit 0;; exit 0;;
copyin) copyin)
cd `dirname "$4"` cd "`dirname "$4"`"
hp48_cd `dirname "$3"` hp48_cd "`dirname "$3"`"
$KERMIT -B -s "$4" -a `basename "$3"` >/dev/null $KERMIT -B -s "$4" -a "`basename "$3"`" >/dev/null
exit 0;; exit 0;;
esac esac
exit 1 exit 1