From 61b4642af41d61e71c37315675ce549a88f40c6e Mon Sep 17 00:00:00 2001 From: Roland Illig Date: Sun, 17 Oct 2004 19:33:55 +0000 Subject: [PATCH] * extfs/hp48.in: Fix quoting issues. From Leonard den Ottolander. --- vfs/ChangeLog | 6 ++++++ vfs/extfs/hp48.in | 45 +++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 91e81baa8..ee93d0366 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,9 @@ +2004-10-17 Roland Illig + + * extfs/hp48.in: Fix quoting issues. + + From Leonard den Ottolander. + 2004-10-17 Andrew V. Samoilov * undelfs.c (undelfs_open): Use g_try_malloc() instead diff --git a/vfs/extfs/hp48.in b/vfs/extfs/hp48.in index 6fbab6857..77e246c32 100644 --- a/vfs/extfs/hp48.in +++ b/vfs/extfs/hp48.in @@ -32,40 +32,41 @@ $KERMIT -C "SET EXIT WARNING OFF,REMOTE $*,QUIT" hp48_cd() { (echo SET EXIT WARNING OFF;echo REMOTE HOST HOME -for HP48_DIR in `echo $*|tr '/' ' '`;do - if [ "$HP48_DIR" != "." ];then echo REMOTE HOST $HP48_DIR;fi +for HP48_DIR in `echo "$*" | tr '/' ' '`;do + if [ "x$HP48_DIR" != "x." ];then echo REMOTE HOST "$HP48_DIR"; fi done echo QUIT)| $KERMIT -B >/dev/null } hp48_retdir() { -echo $1 +echo "$1" } hp48_retsize() { -printf "%d" $2 2>/dev/null +printf "%d" "$2" 2>/dev/null } hp48_parser() { HP48_DIRS= -read INPUT -while [ "$INPUT" != "EOF" ] +read -r INPUT +while [ "x$INPUT" != "xEOF" ] do - case `echo $INPUT | $AWK '{if (int($2)) if ($3=="Directory") print "dir";else print "file"}'` in - dir) HP48_DIRS="$HP48_DIRS `hp48_retdir $INPUT`" - printf "drwxr-xr-x 1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize $INPUT` "`date +\"%b %d %Y %k:%M"`" "$HP48_CDIR/`hp48_retdir $INPUT`";; - file) printf "-rw-r--r-- 1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize $INPUT` "`date +"%b %d %Y %k:%M"`" "$HP48_CDIR/`hp48_retdir $INPUT`";; + case `echo "$INPUT" | $AWK '{if (int($2)) if ($3 == "Directory") print "dir";else print "file"}'` in + dir) HP48_DIRS="$HP48_DIRS `hp48_retdir \"$INPUT\"`" + printf "drwxr-xr-x 1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize "$INPUT"` "`date +\"%b %d %Y %k:%M\"`" "$HP48_CDIR/`hp48_retdir \"$INPUT\"`";; + file) printf "-rw-r--r-- 1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize "$INPUT"` "`date +\"%b %d %Y %k:%M\"`" "$HP48_CDIR/`hp48_retdir \"$INPUT\"`";; esac - read INPUT + read -r INPUT done -for HP48_DIR in $HP48_DIRS;do - HP48_PDIR=$HP48_CDIR - HP48_CDIR=$HP48_CDIR/$HP48_DIR; hp48_cmd HOST $HP48_DIR >/dev/null - hp48_list - HP48_CDIR=$HP48_PDIR; hp48_cmd HOST UPDIR >/dev/null +for HP48_DIR in $HP48_DIRS; +do + HP48_PDIR="$HP48_CDIR" + HP48_CDIR="$HP48_CDIR/$HP48_DIR"; hp48_cmd HOST "$HP48_DIR" >/dev/null + hp48_list + HP48_CDIR="$HP48_PDIR"; hp48_cmd HOST UPDIR >/dev/null done } @@ -84,14 +85,14 @@ list) HP48_CDIR= hp48_list exit 0;; copyout) - cd `dirname $4` - hp48_cd `dirname $3` - $KERMIT -B -g `basename $3` -a $4 >/dev/null + cd `dirname "$4"` + hp48_cd `dirname "$3"` + $KERMIT -B -g `basename "$3"` -a "$4" >/dev/null exit 0;; copyin) - cd `dirname $4` - hp48_cd `dirname $3` - $KERMIT -B -s $4 -a `basename $3` >/dev/null + cd `dirname "$4"` + hp48_cd `dirname "$3"` + $KERMIT -B -s "$4" -a `basename "$3"` >/dev/null exit 0;; esac exit 1