Trailing whitespace deleted.

[bpt/emacs.git] / lib-src / vcdiff

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 2dd4865..5fdc345 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -1,24 +1,51 @@
-#!/bin/sh
+#! /bin/sh
 #
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-#      $Id: vcdiff,v 1.2 1992/06/03 04:56:26 eric Exp $
+# Copyright (C) 1992, 1993, 1995, 1997, 2001
+#   Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#      $Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
 #
 
 DIFF="diff"
-usage="$0: Usage: vcdiff [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
+usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
+
+PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
 
-sid1=-r sid2=
+echo=
+sid1= sid2=
 
 for f
 do
        case $f in
        -*)
                case $f in
+               --brief)
+                       DIFF=cmp;;
+               -q)
+                       echo=:;;
                -r?*)
                        case $sid1 in
-                       -r)
+                       '')
                                sid1=$f
                                ;;
                        *)
@@ -71,7 +98,7 @@ do
                                workfile=$rev2
                        esac
                then
-                       echo $DIFF $options $sid1 $sid2 $workfile >&2
+                       $echo $DIFF $options $sid1 $sid2 $workfile >&2
                        $DIFF $options $rev1 $workfile
                        s=$?
                fi