* scripts/controllib.pl: Use defined instead of length, when variables

	might be undefined.
	* scripts/update-alternatives.pl: Likewise.
	* scripts/dpkg-source.pl: Likewise.
	* scripts/dpkg-genchanges.pl: Likewise.
	* scripts/dpkg-gencontrol.pl: Likewise.
	* scripts/dpkg-shlibdeps.pl: Likewise.

ChangeLog

@@ -1,3 +1,13 @@
+2007-04-03  Guillem Jover  <guillem@debian.org>
+
+	* scripts/controllib.pl: Use defined instead of length, when variables
+	might be undefined.
+	* scripts/update-alternatives.pl: Likewise.
+	* scripts/dpkg-source.pl: Likewise.
+	* scripts/dpkg-genchanges.pl: Likewise.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-shlibdeps.pl: Likewise.
+
 2007-04-03  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-checkbuilddeps.pl ($control): Remove redundant

scripts/controllib.pl

@@ -365,7 +365,7 @@ sub setsourcepackage {
     my $v = shift;
 
     checkpackagename( $v );
-    if (length($sourcepackage)) {
+    if (defined($sourcepackage)) {
         $v eq $sourcepackage ||
             &error(sprintf(_g("source package has two conflicting values - %s and %s"), $sourcepackage, $v));
     } else {

scripts/dpkg-genchanges.pl

@@ -262,13 +262,21 @@ for $p (keys %p2f) {
 
 for $p (keys %p2f) {
     $f= $p2f{$p};
-    $sec= $f2seccf{$f}; $sec= $sourcedefault{'Section'} if !length($sec);
-    if (!length($sec)) { $sec='-'; &warn(sprintf(_g("missing Section for binary package %s; using '-'"), $p)); }
+    $sec = $f2seccf{$f};
+    $sec = $sourcedefault{'Section'} if !defined($sec);
+    if (!defined($sec)) {
+	$sec = '-';
+	&warn(sprintf(_g("missing Section for binary package %s; using '-'"), $p));
+    }
     $sec eq $f2sec{$f} || &error(sprintf(_g("package %s has section %s in ".
                                            "control file but %s in files list"),
                                  $p, $sec, $f2sec{$f}));
-    $pri= $f2pricf{$f}; $pri= $sourcedefault{'Priority'} if !length($pri);
-    if (!length($pri)) { $pri='-'; &warn("missing Priority for binary package $p; using '-'"); }
+    $pri = $f2pricf{$f};
+    $pri = $sourcedefault{'Priority'} if !defined($pri);
+    if (!defined($pri)) {
+	$pri = '-';
+	&warn("missing Priority for binary package $p; using '-'");
+    }
     $pri eq $f2pri{$f} || &error(sprintf(_g("package %s has priority %s in ".
                                            "control file but %s in files list"),
                                  $p, $pri, $f2pri{$f}));
@@ -278,9 +286,15 @@ for $p (keys %p2f) {
 
 if (!$binaryonly) {
     $sec= $sourcedefault{'Section'};
-    if (!length($sec)) { $sec='-'; &warn(_g("missing Section for source files")); }
+    if (!defined($sec)) {
+	$sec = '-';
+	&warn(_g("missing Section for source files"));
+    }
     $pri= $sourcedefault{'Priority'};
-    if (!length($pri)) { $pri='-'; &warn(_g("missing Priority for source files")); }
+    if (!defined($pri)) {
+	$pri = '-';
+	&warn(_g("missing Priority for source files"));
+    }
 
     ($sversion = $substvar{'source:Version'}) =~ s/^\d+://;
     $dsc= "$uploadfilesdir/${sourcepackage}_${sversion}.dsc";
@@ -319,7 +333,7 @@ print(STDERR "$progname: $origsrcmsg\n") ||
 
 $f{'Format'}= $substvar{'Format'};
 
-if (!length($f{'Date'})) {
+if (!defined($f{'Date'})) {
     chop($date822=`date -R`); $? && subprocerr("date -R");
     $f{'Date'}= $date822;
 }
@@ -355,8 +369,8 @@ if ($f{'Version'} ne $substvar{'source:Version'}) {
     $f{'Source'} .= " ($substvar{'source:Version'})";
 }
 
-$f{'Maintainer'}= $forcemaint if length($forcemaint);
-$f{'Changed-By'}= $forcechangedby if length($forcechangedby);
+$f{'Maintainer'} = $forcemaint if defined($forcemaint);
+$f{'Changed-By'} = $forcechangedby if defined($forcechangedby);
 
 for $f (qw(Version Distribution Maintainer Changes)) {
     defined($f{$f}) || &error(sprintf(_g("missing information for critical output field %s"), $f));

scripts/dpkg-gencontrol.pl

@@ -108,7 +108,7 @@ parsechangelog($changelogfile, $changelogformat);
 parsesubstvars($varlistfile);
 parsecontrolfile($controlfile);
 
-if (length($oppackage)) {
+if (defined($oppackage)) {
     defined($p2i{"C $oppackage"}) || &error(sprintf(_g("package %s not in control info"), $oppackage));
     $myindex= $p2i{"C $oppackage"};
 } else {
@@ -175,7 +175,7 @@ for $_ (keys %fi) {
 	    setsourcepackage($v);
         } elsif (m/^Version$/) {
             $sourceversion= $v;
-            $f{$_}= $v unless length($forceversion);
+	    $f{$_} = $v unless defined($forceversion);
         } elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/) {
         } elsif (s/^X[CS]*B[CS]*-//i) {
             $f{$_}= $v;
@@ -188,7 +188,7 @@ for $_ (keys %fi) {
     }
 }
 
-$f{'Version'}= $forceversion if length($forceversion);
+$f{'Version'} = $forceversion if defined($forceversion);
 
 &init_substvars;
 
@@ -215,8 +215,8 @@ for $_ (keys %fi) {
 
 
 for $f (qw(Section Priority)) {
-    $spvalue{$f}= $spdefault{$f} unless length($spvalue{$f});
-    $f{$f}= $spvalue{$f} if length($spvalue{$f});
+    $spvalue{$f} = $spdefault{$f} unless defined($spvalue{$f});
+    $f{$f} = $spvalue{$f} if defined($spvalue{$f});
 }
 
 for $f (qw(Package Version)) {
@@ -248,7 +248,7 @@ if (!defined($substvar{'Installed-Size'})) {
 if (defined($substvar{'Extra-Size'})) {
     $substvar{'Installed-Size'} += $substvar{'Extra-Size'};
 }
-if (length($substvar{'Installed-Size'})) {
+if (defined($substvar{'Installed-Size'})) {
     $f{'Installed-Size'}= $substvar{'Installed-Size'};
 }
 
@@ -300,6 +300,6 @@ if (!$stdout) {
 
 sub spfileslistvalue {
     $r= $spvalue{$_[0]};
-    $r= '-' if !length($r);
+    $r = '-' if !defined($r);
     return $r;
 }

scripts/dpkg-shlibdeps.pl

@@ -391,7 +391,7 @@ sub scanshlibsfile {
             $dk= "$lf: $dv";
             if (!defined($unkdepfdone{$dk})) {
                 $unkdepfdone{$dk}= 1;
-                $unkdepf{$lf}.= ', ' if length($unkdepf{$lf});
+                $unkdepf{$lf} .= ', ' if defined($unkdepf{$lf});
                 $unkdepf{$lf}.= $dv;
             }
         }
@@ -424,7 +424,7 @@ if (!$stdout) {
 my %defdepf;
 for my $dv (sort keys %predefdepfdep) {
     my $lf= $predefdepfdep{$dv};
-    $defdepf{$lf}.= ', ' if length($defdepf{$lf});
+    $defdepf{$lf} .= ', ' if defined($defdepf{$lf});
     $defdepf{$lf}.= $dv;
 }
 for my $lf (reverse @depfields) {

scripts/dpkg-source.pl

@@ -1188,7 +1188,9 @@ sub checkdiff
 	defined($notfileobject{$fn}) &&
 	    &error(sprintf(_g("diff `%s' patches something which is not a plain file"), $diff));
 
-	$filepatched{$fn} eq $diff && &error(sprintf(_g("diff patches file %s twice"), $fn));
+	defined($filepatched{$fn}) &&
+	    $filepatched{$fn} eq $diff &&
+	    error(sprintf(_g("diff patches file %s twice"), $fn));
 	$filepatched{$fn} = $diff;
 
 	# read hunks

scripts/update-alternatives.pl

@@ -372,7 +372,7 @@ if ($state eq 'unexpected' && $manual eq 'auto') {
   if $verbosemode > 0;
 
 if ($mode eq 'install') {
-    if ($link ne $alink && $link ne '') {
+    if (defined($link) && $link ne $alink) {
         &pr(sprintf(_g("Renaming %s link from %s to %s."), $name, $link, $alink))
           if $verbosemode > 0;
         rename_mv($link,$alink) || $! == &ENOENT ||
@@ -393,10 +393,10 @@ if ($mode eq 'install') {
         }
         my $oldslavelink = $slavelinks[$j];
         my $newslavelink = $aslavelink{$sname};
-        $slavelinkcount{$oldslavelink}-- if $oldslavelink ne '';
+	$slavelinkcount{$oldslavelink}-- if defined($oldslavelink);
         $slavelinkcount{$newslavelink}++ &&
             &quit(sprintf(_g("slave link name %s duplicated"), $newslavelink));
-        if ($newslavelink ne $oldslavelink && $oldslavelink ne '') {
+	if (defined($oldslavelink) && $newslavelink ne $oldslavelink) {
             &pr(sprintf(_g("Renaming %s slave link from %s to %s."), $sname, $oldslavelink, $newslavelink))
               if $verbosemode > 0;
             rename_mv($oldslavelink,$newslavelink) || $! == &ENOENT ||