* scripts/dpkg-source.pl (checkstats): Take '$dscdir' as an explicit

argument. Fix all callers.
(checktype): Take '$dir', '$fn' and '$type' as explicit arguments. Fix
all callers.

diff --git a/ChangeLog b/ChangeLog
index 54e174062bc43996a46b3341877080bb4d2cae5d..9ca95677ee23a5915c160e89eb9dec5b1a89f060 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-17  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-source.pl (checkstats): Take '$dscdir' as an explicit
+       argument. Fix all callers.
+       (checktype): Take '$dir', '$fn' and '$type' as explicit arguments. Fix
+       all callers.
+
 2007-02-17  Guillem Jover  <guillem@debian.org>
 
        * scripts/update-alternatives.pl: Check if '$alink' is defined before

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 2d6033c044be61a48f0dc434f3e6fc9681072b6f..d4dd94855d2330363c24d52c2e2b4502b79fcbbe 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -454,7 +454,7 @@ if ($opmode eq 'build') {
            my $mode = S_IMODE((lstat(_))[2]);
             if (-l _) {
                 $type{$fn}= 'symlink';
-                &checktype('-l') || next;
+               checktype($origdir, $fn, '-l') || next;
                 defined($n= readlink("$dir/$fn")) ||
                     &syserr(sprintf(_g("cannot read link %s"), "$dir/$fn"));
                 defined($n2= readlink("$origdir/$fn")) ||
@@ -518,7 +518,7 @@ if ($opmode eq 'build') {
                 }
             } elsif (-p _) {
                 $type{$fn}= 'pipe';
-                &checktype('-p');
+               checktype($origdir, $fn, '-p');
             } elsif (-b _ || -c _ || -S _) {
                 &unrepdiff(_g("device or socket is not allowed"));
             } elsif (-d _) {
@@ -689,7 +689,7 @@ if ($opmode eq 'build') {
        &error(sprintf(_g("repeated file type - files `%s' and `%s'"), $seen{$_}, $file)) if $seen{$_};
        $seen{$_} = $file;
 
-       checkstats($file);
+       checkstats($dscdir, $file);
 
        if (/^\.(?:orig(-\w+)?\.)?tar$/) {
            if ($1) { push @tarfiles, $file; } # push orig-foo.tar.gz to the end
@@ -906,6 +906,7 @@ if ($opmode eq 'build') {
 }
 
 sub checkstats {
+    my $dscdir = shift;
     my ($f) = @_;
     my @s;
     my $m;
@@ -1264,7 +1265,9 @@ sub cpiostderr {
 }
 
 sub checktype {
-    if (!lstat("$origdir/$fn")) {
+    my ($dir, $fn, $type) = @_;
+
+    if (!lstat("$dir/$fn")) {
         &unrepdiff2(_g("nonexistent"),$type{$fn});
     } else {
         $v= eval("$_[0] _ ? 2 : 1"); $v || &internerr(sprintf(_g("checktype %s (%s)"), "$@", $_[0]));