blob: f71b6eb4cea4380e554f866489fef1546b60175d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
#!@PREFIX@/bin/perl
#
# $NetBSD: patchdiff.pl,v 1.2 2000/08/17 03:09:26 wiz Exp $
#
# patchdiff: compares a set of patches patch-aa, patch-ab, ... in
# $WRKDIR/.newpatches in the with another set in patches.
#
# Copyright (c) 2000 by Dieter Baron <dillo@giga.or.at> and
# Thomas Klausner <wiz@netbsd.org>
# All Rights Reserved. Absolutely no warranty.
use Getopt::Std;
use Cwd;
my $oldpatchdir, $newpatchdir;
my $wrkdir;
my %orig, %new;
# change to WRKDIR
sub goto_wrkdir {
chdir $wrkdir or die ("can't cd to WRKDIR ($wrkdir)");
}
sub getfilename {
my $fname=shift;
local $_;
local *handle;
open(handle, $fname);
while (<handle>) {
next unless m/^\+\+\+[ ]([^ ]*)/;
close(handle);
$_ = $1;
chomp();
return $_;
}
close(handle);
return undef;
}
sub putinhash {
my $hash=shift;
my $files=shift;
my $temp;
local *handle;
open(handle, "ls $files|");
while(<handle>) {
chomp;
$temp=getfilename($_);
$$hash{$temp}=$_;
# print "put in hash: $temp // $_\n";
}
close(handle);
}
getopts('d:h');
if ($opt_h) {
($prog) = ($0 =~ /([^\/]+)$/);
print STDERR <<EOF;
usage: $prog [-d output-directory]
-d dirname directory to compare the patches in patches/ to;
defaults to \$WRKDIR/.newpatches
EOF
exit 0;
};
%orig=();
%new=();
$oldpatchdir=cwd();
chomp($oldpatchdir);
$oldpatchdir=$oldpatchdir."/patches";
$wrkdir=`make show-var VARNAME=WRKDIR` or
die ("can't find WRKDIR -- wrong dir?");
chomp($wrkdir);
if ($opt_d) {
$newpatchdir = cwd()."/$opt_d";
}
else {
$newpatchdir="$wrkdir"."/.newpatches";
}
if ( ! -d $oldpatchdir) {
print "No old patches found (directory $oldpatchdir not found)\n";
exit(0);
}
if ( ! -d $newpatchdir ) {
print "No new patches found (directory $newpatchdir not found)\n";
exit(0);
}
putinhash(\%orig,"$oldpatchdir/patch-*");
putinhash(\%new,"$newpatchdir/patch-*");
foreach $patch (keys%orig) {
print "Only in old: $orig{$patch} ($patch)\n" unless defined($new{$patch});
}
foreach $patch (keys%new) {
if (defined($orig{$patch})) {
# system("diff",$orig{$patch},$new{$patch});
$diff=`diff $orig{$patch} $new{$patch}`;
$diff=~s/^\dc\d\n..\$NetBSD.*\$\n---\n..\$NetBSD.*\$\n//m;
$diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
if ($diff) {
print "Comparing $orig{$patch} to $new{$patch}\n$diff";
}
} else {
print "Only in new: $new{$patch} ($patch)\n"
}
}
|
