X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdiffdecvs;h=7b65e6d068d4d07790774ac0d00e4998490b258d;hp=dfbedf19bf646653d415436a1d06322602cb322a;hb=9ae5d129b8e52b7f3bfb92bf877cd98c05b1b661;hpb=cc63783a231791a5cd8cf84d72ea9432745203bf

diff --git a/bin/diffdecvs b/bin/diffdecvs
index dfbedf1..7b65e6d 100755
--- a/bin/diffdecvs
+++ b/bin/diffdecvs
@@ -6,7 +6,20 @@ if [ $# -ge 2 ];then
 	exit 1
 fi
 
-prog='print if !/^[?]/ && !/^Index:/ && !/^={67}$/ && !/^RCS file:/ && !/^retrieving revision / && !/^diff -/;'
+prog='
+	$wasdiff-- if $wasdiff;
+	$wasdiff=3 if /^diff -/;
+	# Do not substitute already existing "./"... or "/dev/null".
+	s{^\Q---\E (?![.]?/)}{$&./} if $wasdiff==2;
+	s{^\Q+++\E (?![.]?/)}{$&./} if $wasdiff==1;
+	next if /^[?]/;
+	next if /^Index:/;
+	next if /^={67}$/;
+	next if /^RCS file:/;
+	next if /^retrieving revision /;
+	next if /^diff -/;
+	print;
+'
 if [ $# -eq 1 ];then
 	exec perl -ne "$prog" -i "$1"
 else