the final byte of a pkcs7 padded plaintext can never be 0

[openssl.git] / util / clean-depend.pl

diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index e44b17264eec5cfcd937bee57c13d0bf074d9ece..6c485d1e2fb12d9a83817e9e026e5fac8656199c 100755 (executable)
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -11,17 +11,36 @@ while(<STDIN>) {
 
 my %files;
 
+my $thisfile="";
 while(<STDIN>) {
-    my ($file,$deps)=/^(.*): (.*)$/;
+    my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
+    my $origfile="";
+    $thisfile=$file if defined $file;
     next if !defined $deps;
+    $origfile=$thisfile;
+    $origfile=~s/\.o$/.c/;
     my @deps=split ' ',$deps;
-    @deps=grep(!/^\/usr\/include/,@deps);
-    push @{$files{$file}},@deps;
+    @deps=grep(!/^\//,@deps);
+    @deps=grep(!/^\\$/,@deps);
+    @deps=grep(!/^$origfile$/,@deps);
+# pull out the kludged kerberos header (if present).
+    @deps=grep(!/^[.\/]+\/krb5.h/,@deps);
+    push @{$files{$thisfile}},@deps;
 }
 
-my $len=0;
-foreach my $file (sort keys %files) {
-    foreach my $dep (sort @{$files{$file}}) {
+my $file;
+foreach $file (sort keys %files) {
+    my $len=0;
+    my $dep;
+    my $origfile=$file;
+    $origfile=~s/\.o$/.c/;
+    $file=~s/^\.\///;
+    push @{$files{$file}},$origfile;
+    my $prevdep="";
+    foreach $dep (sort @{$files{$file}}) {
+       $dep=~s/^\.\///;
+       next if $prevdep eq $dep; # to exterminate duplicates...
+       $prevdep = $dep;
        $len=0 if $len+length($dep)+1 >= 80;
        if($len == 0) {
            print "\n$file:";