Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of compiler warning about iconv()'s second parameter.
[rsync/rsync.git]
/
testsuite
/
rsync.fns
diff --git
a/testsuite/rsync.fns
b/testsuite/rsync.fns
index
115ae6b
..
b7795ce
100644
(file)
--- a/
testsuite/rsync.fns
+++ b/
testsuite/rsync.fns
@@
-56,6
+56,8
@@
filter_outfile() {
-e '/^done$/d' \
-e '/ --whole-file$/d' \
-e '/^total: /d' \
-e '/^done$/d' \
-e '/ --whole-file$/d' \
-e '/^total: /d' \
+ -e '/^client charset: /d' \
+ -e '/^server charset: /d' \
-e '/^$/,$d' \
<"$outfile" >"$outfile.new"
mv "$outfile.new" "$outfile"
-e '/^$/,$d' \
<"$outfile" >"$outfile.new"
mv "$outfile.new" "$outfile"
@@
-66,7
+68,7
@@
printmsg() {
}
rsync_ls_lR() {
}
rsync_ls_lR() {
- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
$TLS_ARGS
}
check_perms() {
}
check_perms() {
@@
-145,16
+147,16
@@
hands_setup() {
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
makepath() {
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
makepath() {
- echo " makepath $1"
-
p="$1
"
- (
+ for p in "${@}"; do
+
(echo " makepath $p
"
+
# Absolut Unix.
if echo $p | grep '^/' >/dev/null
then
cd /
fi
# Absolut Unix.
if echo $p | grep '^/' >/dev/null
then
cd /
fi
- # This will break if $
1
contains a space.
+ # This will break if $
p
contains a space.
for c in `echo $p | tr '/' ' '`
do
if [ -d "$c" ] || mkdir "$c"
for c in `echo $p | tr '/' ' '`
do
if [ -d "$c" ] || mkdir "$c"
@@
-163,8
+165,8
@@
makepath() {
else
echo "failed to create $c" >&2; return $?
fi
else
echo "failed to create $c" >&2; return $?
fi
- done
- )
+ done
)
+ done
}
}
@@
-231,7
+233,7
@@
build_rsyncd_conf() {
pid file = $pidfile
use chroot = no
pid file = $pidfile
use chroot = no
-hosts allow = localhost 127.0.0.1 $hostname
+hosts allow = localhost 127.0.0.1
10.0.1.2
$hostname
log file = $logfile
log format = %i %h [%a] %m (%u) %l %f%L
transfer logging = yes
log file = $logfile
log format = %i %h [%a] %m (%u) %l %f%L
transfer logging = yes