Fixed failing hunks.

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

diff --git a/verify-patches b/verify-patches
index 928e24c..7100d32 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -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,19 +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 | 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]*)