BSD 3 development

Work on file usr/src/cmd/diff3/Makefile
Work on file usr/src/cmd/diff3/diff3.sh

Synthesized-from: 3bsd

diff --git a/usr/src/cmd/diff3/Makefile b/usr/src/cmd/diff3/Makefile
new file mode 100644 (file)
index 0000000..d9606e1
--- /dev/null
+++ b/usr/src/cmd/diff3/Makefile
@@ -0,0 +1,11 @@
+CFLAGS=-O -d2
+
+diff3: diff3.o
+       cc -o diff3 diff3.o
+
+install: diff3
+       install -s diff3 $(DESTDIR)/usr/lib
+       install -c diff3.sh $(DESTDIR)/usr/bin/diff3
+
+clean:
+       rm -f diff3.o diff3     

diff --git a/usr/src/cmd/diff3/diff3.sh b/usr/src/cmd/diff3/diff3.sh
new file mode 100755 (executable)
index 0000000..d56219f
--- /dev/null
+++ b/usr/src/cmd/diff3/diff3.sh
@@ -0,0 +1,17 @@
+e=
+case $1 in
+-*)
+       e=$1
+       shift;;
+esac
+if test $# = 3 -a -f $1 -a -f $2 -a -f $3
+then
+       :
+else
+       echo usage: diff3 file1 file2 file3 1>&2
+       exit
+fi
+trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15
+diff $1 $3 >/tmp/d3a$$
+diff $2 $3 >/tmp/d3b$$
+/usr/lib/diff3 $e /tmp/d3[ab]$$ $1 $2 $3