Fixed failing hunks.

[rsync/rsync-patches.git] / verify-patches

diff --git a/verify-patches b/verify-patches
index 4037362..7100d32 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -14,11 +14,11 @@ tmpdir=,tmp-for-patch-tests
 [ -d $tmpdir ] || mkdir $tmpdir
 cd $tmpdir || exit 1
 
-[ -d ,workdir ] || mkdir ,workdir
-echo "Using CVS to update the $tmpdir/,cvsdir copy of the source."
-cvs -d "$root" co -d ,cvsdir rsync
+[ -d workdir ] || mkdir workdir
+echo "Using CVS to update the $tmpdir/cvsdir copy of the source."
+cvs -d "$root" co -d cvsdir rsync
 
-cd ,workdir || exit 1
+cd workdir || exit 1
 
 if [ -z "$1" ]; then
     set -- ../../*.diff
@@ -36,11 +36,11 @@ for xx in "${@}"; do
     while : ; do
        echo -e "\n----------- $xx ------------"
        if [ $apply = y ]; then
-           rsync -a --delete ../,cvsdir/ .
+           rsync -a --delete ../cvsdir/ .
            patch -p0 <$xx | tee ,patch.output
            new=''
            for nn in `sed -n 's/^patching file //p' ,patch.output`; do
-               [ -f ../,cvsdir/$nn ] || new="$new $nn"
+               [ -f ../cvsdir/$nn ] || new="$new $nn"
            done
            if grep "^Hunk #[0-9]* FAILED" ,patch.output >/dev/null; then
                default=F
@@ -51,7 +51,7 @@ for xx in "${@}"; do
            fi
            apply=n
        fi
-       echo -e "\nFix rejects, Make proto, Edit both diffs, Update patch,"
+       echo -e "\nFix rejects, Edit both diffs, Update patch,"
        echo -n "Apply patch again, Next, Quit: [$default] "
        read ans
        [ -z "$ans" ] && ans=$default
@@ -59,23 +59,14 @@ for xx in "${@}"; do
        [Ee]*)
            [ ! -z "$new" ] && cvs add $new
            new=''
-           rm -f *.rej *.orig
+           rm -f *.rej *.orig */*.rej */*.orig
            sed '/^--- /,$ d' $xx >,new.patch
-           cvs diff -N | grep -v '^Index: ' |
-               grep -v '^=========' |
-               grep -v '^diff -' |
-               grep -v '^RCS file: ' |
-               grep -v '^retrieving revision ' >>,new.patch
+           cvs diff -N | egrep -v '^(diff -|===============|RCS file: |retrieving revision |Index: )' >>,new.patch
            vim -d $xx ,new.patch
            default=U
            ;;
        [Ff]*)
-           vim *.rej
-           default=E
-           ;;
-       [Mm]*)
-           cat *.c lib/compat.c | awk -f mkproto.awk >proto.h
-           echo -e "\nRegenerated proto.h"
+           vim `sed -ne 's/.* saving rejects to file //p' ,patch.output`
            default=E
            ;;
        [Uu]*)