Fixed bugs, incorporated Bombich Software changes

Makefile

@@ -2,6 +2,10 @@ all:
 	cd util && make
 clean:
 	cd util && make clean
+realclean:
+	-umount /Volumes/Src
+	-umount /Volumes/Dst
+	-rm -f Src.sparseimage Dst.sparseimage
 #
 # Developer targets.  To use this:
 # 1. Change ./VERSION to reflect the release version

autopilot

@@ -9,10 +9,11 @@ echo "We're now going to create two disk images, create some files on one,"
 echo "copy them to the other, and find out what metadata was preserved."
 echo
 
-set -ex
+set -x
 
 make
 ./bbouncer create-vol Src
 ./bbouncer create-vol Dst
 ./bbouncer create /Volumes/Src
 ./bbouncer copy -d /Volumes/Src /Volumes/Dst
+#./bbouncer copy -c 16-rsync-fink -t 00-basic-permissions -d /Volumes/Src /Volumes/Dst

bbouncer

@@ -110,10 +110,10 @@ read-copiers () {
 }
 
 create-vol () {
-    hdiutil create -size 40m -fs 'Journaled HFS+' \
+    hdiutil create -size 130m -fs 'Journaled HFS+' \
             -volname $1 -type SPARSE ./$1
     hdiutil attach -owners on ./$1.sparseimage
-    /usr/bin/which -s fsaclctl && sudo fsaclctl -p /Volumes/$1 -e
+    /usr/bin/which fsaclctl > /dev/null && sudo fsaclctl -p /Volumes/$1 -e
     touch /Volumes/$1/bbouncer-vol
 }
 
@@ -217,6 +217,8 @@ copy () {
     echo
     for c in $copiers; do
         cnice=${c:3}
+        echo
+        echo "--------------------------------------------"
         printf "Copying with: %${printWidth}s ... " "$cnice"
         mkdir $dst/$c
         bash util/copy-runner copiers.d/$c.cp $src $dst/$c
@@ -225,12 +227,11 @@ copy () {
         # Make sure the volume can be cleaned
         touch $dst/$c/bbouncer-vol
         [ "$code" = "0" ] && echo ok \
-            || echo FAIL
-    done
-    for c2 in $copiers; do
+            || echo FAIL/warn\?
+#    done
+#    for c2 in $copiers; do
+        c2=("${c[@]}")    # truly, bash has quoting issues
         cnice=${c2:3}
-        echo
-        echo "------------------ $cnice ------------------"
         if [ -e $dst/$c2/skipped ]; then
             echo "    This copier was skipped"
         else

copiers.d/10-rsync-apple.cp

@@ -7,6 +7,7 @@ flags="-aH -E --rsync-path=$rsync"
 # Should exit with code 0 if the necessary programs exist, 1 otherwise
 can-copy () {
     test -e $rsync
+    false  # hangs on fifo
 }
 
 # Should generate some text on stdout identifying which version of the

copiers.d/60-pax.cp

@@ -11,10 +11,10 @@ can-copy () {
 version () {
     ls -l $pax
     echo
-    echo "command = cd src; sudo $pax -rw $flags . dst"
+    echo "command = cd src; sudo $pax -rw -pe $flags . dst"
 }
 
 backup () {
     cd $1
-    sudo $pax -rw $flags . $2
+    sudo $pax -rw -pe $flags . $2
 }

copiers.d/70-xar-apple.cp

@@ -13,16 +13,16 @@ version () {
     cd src
     sudo $xar -c -f tmpfile . \
         && cd dst \
-        && sudo $xar -x -P -f tmpfile"
+        && sudo $xar -x --keep-setuid -P -f tmpfile"
 }
 
 backup () {
     cd $1
     # xar doesn't work with pipes yet, so we use a tmpfile
-    tmpfile=`mktemp -t bbouncer-xar` || exit 1
+    tmpfile=`mktemp` || exit 1  # Need to use mktemp correctly!
     sudo $xar -c -f $tmpfile . \
         && cd $2 \
-        && sudo $xar -x -P -f $tmpfile
+        && sudo $xar -x --keep-setuid -P -f $tmpfile
     code=$?
     rm -f $tmpfile
     return $code

copiers.d/75-xar-svn.cp

@@ -15,16 +15,16 @@ version () {
     cd src
     sudo $xar -c -f tmpfile . \
         && cd dst \
-        && sudo $xar -x -P -f tmpfile"
+        && sudo $xar -x --keep-setuid -P -f $tmpfile"
 }
 
 backup () {
     cd $1
     # xar doesn't work with pipes yet, so we use a tmpfile
-    tmpfile=`mktemp -t bbouncer-xar` || exit 1
+    tmpfile=`mktemp` || exit 1    # Need to use mktemp correctly!
     sudo $xar -c -f $tmpfile . \
         && cd $2 \
-        && sudo $xar -x -P -f $tmpfile
+        && sudo $xar -x --keep-setuid -P -f $tmpfile
     code=$?
     rm -f $tmpfile
     return $code

tests.d/00-basic-permissions.test

@@ -14,7 +14,16 @@ create () {
 
     touch owned-by-me
     chmod 1777 owned-by-me
+
+    touch owned-by-me-suid
+    chmod u+s owned-by-me-suid
+
+    touch owned-by-me-guid
+    chmod g+s owned-by-me-guid
 
+    touch owned-by-me-sticky
+    chmod o+t owned-by-me-sticky
+
     touch owned-by-root
     sudo chown root:wheel owned-by-root
 
@@ -51,6 +60,9 @@ verify () {
     cd $1
 
     compare ./owned-by-me $2/owned-by-me \
+    && compare ./owned-by-me-suid $2/owned-by-me-suid \
+    && compare ./owned-by-me-guid $2/owned-by-me-guid \
+    && compare ./owned-by-me-sticky $2/owned-by-me-sticky \
     && compare ./owned-by-root $2/owned-by-root \
     && compare ./owned-by-www $2/owned-by-www \
     && compare ./some-dir $2/some-dir

tests.d/20-hardlinks.test

@@ -10,7 +10,10 @@ create () {
     ln ./some-file link1
     ln ./some-file link2
     ln ./link1 link3
-
+
+    touch locked_link_source
+	ln locked_link_source locked_link_target
+	chflags uchg locked_link_source
     # Leopard allows hard links to directories
     # mkdir dir1
     # mkdir dir2
@@ -21,13 +24,14 @@ create () {
 verify () {
     cd $1
     tmpfile=/tmp/hardlinks-test
-    set +e
     #begin-subtests
 
     stat -f "%i" link1 > $tmpfile
     stat -f "%i" link2 >> $tmpfile
     stat -f "%i" link3 >> $tmpfile
-    test "`uniq $tmpfile | wc -l | awk '{print $1}'`" = "1"
+    stat -f "%i%f" locked_link_source >> $tmpfile
+    stat -f "%i%f" locked_link_target >> $tmpfile
+    test "`uniq $tmpfile | wc -l | awk '{print $1}'`" = "2"
     #x1=$?
     #subtest "on files" $x1
 

tests.d/30-resource-forks.test

@@ -5,21 +5,22 @@ max_priority () {
 }
 
 create () {
-    cd $1
-    set -e
-    echo "testing 1 2 3" > some-file
-    echo "Hello world" > some-file/..namedfork/rsrc
+    echo "testing 1 2 3" > $1/some-file
+    xattr-util w com.apple.ResourceFork "Hello world" $1/some-file
 
-    echo "Apple's rsync had issues with resource forks + hardlinks" > hl-rfork1
-    ln hl-rfork1 hl-rfork2
-    echo "Let's see what happens..." > hl-rfork1/..namedfork/rsrc
+    echo "Apple's rsync had issues with resource forks + hardlinks" > $1/hl-rfork1
+    ln $1/hl-rfork1 $1/hl-rfork2
+    xattr-util w com.apple.ResourceFork "Let's see what happens..." $1/hl-rfork1
+
+	# Resource forks > 64MB have to be handled specially
+	echo "big daddy" > $1/large_resource_fork
+    dd if=/dev/random of="$1/large_resource_fork"/..namedfork/rsrc bs=1000000 count=75
 }
 
 compare () {
-    set -e
     # We only test regular files.  Should we test others?
     if [ -f "$1" ]; then
-        cmp "$1/..namedfork/rsrc" "$2/..namedfork/rsrc"
+		cmp "$1"/..namedfork/rsrc "$2"/..namedfork/rsrc
     else
         true
     fi
@@ -36,7 +37,7 @@ verify () {
 
     test -e ./some-file \
         && grep -q '^testing 1 2 3$' ./some-file \
-        && grep -q '^Hello world$' ./some-file/..namedfork/rsrc
+        && compare ./some-file $2/some-file
     x1=$?
     subtest "on files" $x1
 
@@ -49,7 +50,18 @@ verify () {
     x2=$?
     subtest "on hardlinked files" $x2
 
-    alltrue $x1 $x2
+    test_priority=$Important
+    test -e ./large_resource_fork \
+         && compare ./large_resource_fork $2/large_resource_fork
+    x3=$?
+    subtest "with forks > 64MB" $x3
+
+
+    # Truncate this file in the interests of space:
+    rm -f $1/large_resource_fork $1/._large_resource_fork
+    echo got result $x3 for this > $1/large_resource_fork
+
+    alltrue $x1 $x2 $x3
 }
 
 clean () {

tests.d/40-finder-flags.test

@@ -45,7 +45,6 @@ max_priority () {
 
 create () {
     cd $1
-    set -e
 
     touch type-and-creator
     SetFile -c MSWD -t TEXT type-and-creator
@@ -67,6 +66,11 @@ create () {
     touch mucho-flags-file
     SetFile -a ABCDEIMNSTVZ mucho-flags-file
 
+    # Use every flag possible (then lock it)
+    touch mucho-flags-file-locked
+    SetFile -a ABCDEIMNSTVZ mucho-flags-file-locked
+    chflags uchg mucho-flags-file-locked
+
     # All possible on a dir
     mkdir mucho-flags-dir
     SetFile -a CDEIVZ mucho-flags-dir
@@ -75,18 +79,10 @@ create () {
 compare () {
     test "`GetFileInfo -P -a $1`" = "`GetFileInfo -P -a $2`" \
     && test "`GetFileInfo -P -m $1`" = "`GetFileInfo -P -m $2`"
-    x=$?
-    if [ -f "$1" ]; then
-        test "`GetFileInfo -P -t $1`" = "`GetFileInfo -P -t $2`" \
-        && test "`GetFileInfo -P -c $1`" = "`GetFileInfo -P -c $2`"
-        x2=$?
-    elif [ -d "$1" ]; then
-        x2=0
-    else
-        echo "ERROR: Unknown file type in 40-finder-flags compare test"
-        x2=1
-    fi
-    alltrue $x $x2
+    if [ ! -d $1 ]; then
+	    test "`GetFileInfo -P -t $1`" = "`GetFileInfo -P -t $2`" \
+	    && test "`GetFileInfo -P -c $1`" = "`GetFileInfo -P -c $2`"
+	fi
 }
 
 verify () {
@@ -99,6 +95,7 @@ verify () {
     && test "`GetFileInfo -ae hidden-extension.txt`" = "1" \
     && test "`GetFileInfo -as system-file`" = "1" \
     && compare ./mucho-flags-file $2/mucho-flags-file \
+    && compare ./mucho-flags-file-locked $2/mucho-flags-file-locked \
     && compare ./mucho-flags-dir $2/mucho-flags-dir
 }
 

tests.d/45-finder-locks.test

@@ -12,7 +12,6 @@ max_priority () {
 
 create () {
     cd $1
-    set -e
     touch 'locked-file'
     SetFile -a L locked-file
 }

tests.d/50-creation-date.test

@@ -6,7 +6,6 @@ max_priority () {
 
 create () {
     cd $1
-    set -e
     touch creation-date-test
     # Make sure the creation date isn't the same as the access/modification date
     # The modification date from SetFile is the same as the standard mtime.

tests.d/60-bsd-flags.test

@@ -33,7 +33,6 @@ max_priority () {
 
 create () {
     cd $1
-    set -e
 
     mkdir dir-with-flags
     chflags uappnd,uchg,nodump,opaque dir-with-flags