Use new style perl function calls

ChangeLog

@@ -1,3 +1,15 @@
+2008-11-11  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-architecture.pl: Use new style functions calls.
+	* scripts/dpkg-distaddfile.pl: Likewise.
+	* scripts/dpkg-divert.pl: Likewise.
+	* scripts/dpkg-genchanges.pl: Likewise.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+	* scripts/dpkg-gensymbols.pl: Likewise.
+	* scripts/dpkg-scanpackages.pl: Likewise.
+	* scripts/dpkg-statoverride.pl: Likewise.
+	* scripts/update-alternatives.pl: Likewise.
+
 2008-11-08  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Shlibs/Objdump.pm (_parse): Support RUNPATH exactly

scripts/dpkg-architecture.pl

@@ -111,10 +111,10 @@ while (@ARGV) {
         list_arches();
         exit unless @ARGV;
     } elsif (m/^-(h|-help)$/) {
-       &usage;
+        usage();
        exit 0;
     } elsif (m/^--version$/) {
-       &version;
+        version();
        exit 0;
     } else {
 	usageerr(_g("unknown option \`%s'"), $_);

scripts/dpkg-distaddfile.pl

@@ -42,9 +42,11 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     if (m/^-f/) {
         $fileslistfile= $';
     } elsif (m/^-(h|-help)$/) {
-        &usage; exit(0);
+        usage();
+        exit(0);
     } elsif (m/^--version$/) {
-        &version; exit(0);
+        version();
+        exit(0);
     } elsif (m/^--$/) {
         last;
     } else {
@@ -52,26 +54,26 @@ while (@ARGV && $ARGV[0] =~ m/^-/) {
     }
 }
 
-@ARGV==3 || &usageerr(_g("need exactly a filename, section and priority"));
+@ARGV == 3 || usageerr(_g("need exactly a filename, section and priority"));
 my ($file, $section, $priority) = @ARGV;
 
 ($file =~ m/\s/ || $section =~ m/\s/ || $priority =~ m/\s/) &&
-    &error(_g("filename, section and priority may contain no whitespace"));
+    error(_g("filename, section and priority may contain no whitespace"));
 
 $fileslistfile="./$fileslistfile" if $fileslistfile =~ m/^\s/;
-open(Y,"> $fileslistfile.new") || &syserr(_g("open new files list file"));
+open(Y, "> $fileslistfile.new") || syserr(_g("open new files list file"));
 if (open(X,"< $fileslistfile")) {
     while (<X>) {
         s/\n$//;
         next if m/^(\S+) / && $1 eq $file;
-        print(Y "$_\n") || &syserr(_g("copy old entry to new files list file"));
+        print(Y "$_\n") || syserr(_g("copy old entry to new files list file"));
     }
 } elsif ($! != ENOENT) {
-    &syserr(_g("read old files list file"));
+    syserr(_g("read old files list file"));
 }
 print(Y "$file $section $priority\n")
-    || &syserr(_g("write new entry to new files list file"));
-close(Y) || &syserr(_g("close new files list file"));
+    || syserr(_g("write new entry to new files list file"));
+close(Y) || syserr(_g("close new files list file"));
 rename("$fileslistfile.new", $fileslistfile) ||
     syserr(_g("install new files list file"));
 

scripts/dpkg-divert.pl

@@ -83,9 +83,11 @@ while (@ARGV) {
     if (!m/^-/) {
         unshift(@ARGV,$_); last;
     } elsif (m/^--help$/) {
-        &usage; exit(0);
+        usage();
+        exit(0);
     } elsif (m/^--version$/) {
-        &version; exit(0);
+        version();
+        exit(0);
     } elsif (m/^--test$/) {
         $testmode= 1;
     } elsif (m/^--rename$/) {
@@ -95,86 +97,88 @@ while (@ARGV) {
     } elsif (m/^--local$/) {
         $package= ':';
     } elsif (m/^--add$/) {
-        &checkmanymodes;
+        checkmanymodes();
         $mode= 'add';
     } elsif (m/^--remove$/) {
-        &checkmanymodes;
+        checkmanymodes();
         $mode= 'remove';
     } elsif (m/^--list$/) {
-        &checkmanymodes;
+        checkmanymodes();
         $mode= 'list';
     } elsif (m/^--listpackage$/) {
-        &checkmanymodes;
+        checkmanymodes();
         $mode= 'listpackage';
     } elsif (m/^--truename$/) {
-        &checkmanymodes;
+        checkmanymodes();
         $mode= 'truename';
     } elsif (m/^--divert$/) {
-        @ARGV || &badusage(sprintf(_g("--%s needs a divert-to argument"), "divert"));
+        @ARGV || badusage(sprintf(_g("--%s needs a divert-to argument"), "divert"));
         $divertto= shift(@ARGV);
-        $divertto =~ m/\n/ && &badusage(_g("divert-to may not contain newlines"));
+        $divertto =~ m/\n/ && badusage(_g("divert-to may not contain newlines"));
     } elsif (m/^--package$/) {
-        @ARGV || &badusage(sprintf(_g("--%s needs a <package> argument"), "package"));
+        @ARGV || badusage(sprintf(_g("--%s needs a <package> argument"), "package"));
         $package= shift(@ARGV);
-        $package =~ m/\n/ && &badusage(_g("package may not contain newlines"));
+        $package =~ m/\n/ && badusage(_g("package may not contain newlines"));
     } elsif (m/^--admindir$/) {
-        @ARGV || &badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
+        @ARGV || badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
         $admindir= shift(@ARGV);
     } else {
-        &badusage(sprintf(_g("unknown option \`%s'"), $_));
+        badusage(sprintf(_g("unknown option \`%s'"), $_));
     }
 }
 
 $mode='add' unless $mode;
 
-open(O,"$admindir/diversions") || &quit(sprintf(_g("cannot open diversions: %s"), $!));
+open(O, "$admindir/diversions") || quit(sprintf(_g("cannot open diversions: %s"), $!));
 while(<O>) {
     s/\n$//; push(@contest,$_);
-    $_=<O>; s/\n$// || &badfmt(_g("missing altname"));
+    $_ = <O>;
+    s/\n$// || badfmt(_g("missing altname"));
     push(@altname,$_);
-    $_=<O>; s/\n$// || &badfmt(_g("missing package"));
+    $_ = <O>;
+    s/\n$// || badfmt(_g("missing package"));
     push(@package,$_);
 }
 close(O);
 
 if ($mode eq 'add') {
-    @ARGV == 1 || &badusage(sprintf(_g("--%s needs a single argument"), "add"));
+    @ARGV == 1 || badusage(sprintf(_g("--%s needs a single argument"), "add"));
     $file= $ARGV[0];
-    $file =~ m#^/# || &badusage(sprintf(_g("filename \"%s\" is not absolute"), $file));
-    $file =~ m/\n/ && &badusage(_g("file may not contain newlines"));
-	-d $file && &badusage(_g("Cannot divert directories"));
+    $file =~ m#^/# || badusage(sprintf(_g("filename \"%s\" is not absolute"), $file));
+    $file =~ m/\n/ && badusage(_g("file may not contain newlines"));
+    -d $file && badusage(_g("Cannot divert directories"));
     $divertto= "$file.distrib" unless defined($divertto);
-    $divertto =~ m#^/# || &badusage(sprintf(_g("filename \"%s\" is not absolute"), $divertto));
+    $divertto =~ m#^/# || badusage(sprintf(_g("filename \"%s\" is not absolute"), $divertto));
     $package= ':' unless defined($package);
     for (my $i = 0; $i <= $#contest; $i++) {
         if ($contest[$i] eq $file || $altname[$i] eq $file ||
             $contest[$i] eq $divertto || $altname[$i] eq $divertto) {
             if ($contest[$i] eq $file && $altname[$i] eq $divertto &&
                 $package[$i] eq $package) {
-                printf(_g("Leaving \`%s'")."\n", &infon($i)) if $verbose > 0;
+                printf(_g("Leaving \`%s'")."\n", infon($i)) if $verbose > 0;
                 exit(0);
             }
-            &quit(sprintf(_g("\`%s' clashes with \`%s'"), &infoa, &infon($i)));
+            quit(sprintf(_g("\`%s' clashes with \`%s'"), infoa(), infon($i)));
         }
     }
     push(@contest,$file);
     push(@altname,$divertto);
     push(@package,$package);
-    printf(_g("Adding \`%s'")."\n", &infon($#contest)) if $verbose > 0;
-    &checkrename($file,$divertto);
-    &save;
-    &dorename($file,$divertto);
+    printf(_g("Adding \`%s'")."\n", infon($#contest)) if $verbose > 0;
+    checkrename($file, $divertto);
+    save();
+    dorename($file, $divertto);
     exit(0);
 } elsif ($mode eq 'remove') {
-    @ARGV == 1 || &badusage(sprintf(_g("--%s needs a single argument"), "remove"));
+    @ARGV == 1 || badusage(sprintf(_g("--%s needs a single argument"), "remove"));
     $file= $ARGV[0];
     for (my $i = 0; $i <= $#contest; $i++) {
         next unless $file eq $contest[$i];
-        &quit(sprintf(_g("mismatch on divert-to\n  when removing \`%s'\n  found \`%s'"), &infoa, &infon($i)))
+        quit(sprintf(_g("mismatch on divert-to\n  when removing \`%s'\n  found \`%s'"), infoa(), infon($i)))
               if defined($divertto) && $altname[$i] ne $divertto;
-        &quit(sprintf(_g("mismatch on package\n  when removing \`%s'\n  found \`%s'"), &infoa, &infon($i)))
+        quit(sprintf(_g("mismatch on package\n  when removing \`%s'\n  found \`%s'"), infoa(), infon($i)))
               if defined($package) && $package[$i] ne $package;
-        printf(_g("Removing \`%s'")."\n", &infon($i)) if $verbose > 0;
+        printf(_g("Removing \`%s'")."\n", infon($i)) if $verbose > 0;
         my $orgfile = $contest[$i];
         my $orgdivertto = $altname[$i];
         @contest= (($i > 0 ? @contest[0..$i-1] : ()),
@@ -183,12 +187,13 @@ if ($mode eq 'add') {
                    ($i < $#altname ? @altname[$i+1..$#altname] : ()));
         @package= (($i > 0 ? @package[0..$i-1] : ()),
                    ($i < $#package ? @package[$i+1..$#package] : ()));
-        &checkrename($orgdivertto,$orgfile);
-        &dorename($orgdivertto,$orgfile);
-        &save;
+        checkrename($orgdivertto, $orgfile);
+        dorename($orgdivertto, $orgfile);
+        save();
         exit(0);
     }
-    printf(_g("No diversion \`%s', none removed")."\n", &infoa) if $verbose > 0;
+    printf(_g("No diversion \`%s', none removed")."\n", infoa())
+        if $verbose > 0;
     exit(0);
 } elsif ($mode eq 'list') {
     my @list;
@@ -204,11 +209,11 @@ if ($mode eq 'add') {
         next unless ($contest[$i] =~ m/$pat/o ||
                      $altname[$i] =~ m/$pat/o ||
                      $package[$i] =~ m/$pat/o);
-        print &infon($i),"\n";
+        print infon($i), "\n";
     }
     exit(0);
 } elsif ($mode eq 'truename') {
-    @ARGV == 1 || &badusage(sprintf(_g("--%s needs a single argument"), "truename"));
+    @ARGV == 1 || badusage(sprintf(_g("--%s needs a single argument"), "truename"));
     $file= $ARGV[0];
     for (my $i = 0; $i <= $#contest; $i++) {
 	next unless $file eq $contest[$i];
@@ -218,7 +223,7 @@ if ($mode eq 'add') {
     print $file, "\n";
     exit(0);
 } elsif ($mode eq 'listpackage') {
-    @ARGV == 1 || &badusage(sprintf(_g("--%s needs a single argument"), $mode));
+    @ARGV == 1 || badusage(sprintf(_g("--%s needs a single argument"), $mode));
     $file= $ARGV[0];
     for (my $i = 0; $i <= $#contest; $i++) {
 	next unless $file eq $contest[$i];
@@ -233,7 +238,7 @@ if ($mode eq 'add') {
     # print nothing if file is not diverted
     exit(0);
 } else {
-    &quit(sprintf(_g("internal error - bad mode \`%s'"), $mode));
+    quit(sprintf(_g("internal error - bad mode \`%s'"), $mode));
 }
 
 sub infol {
@@ -246,10 +251,10 @@ sub infol {
 sub checkrename {
     return unless $dorename;
     ($rsrc,$rdest) = @_;
-    (@ssrc= lstat($rsrc)) || $! == &ENOENT ||
-        &quit(sprintf(_g("cannot stat old name \`%s': %s"), $rsrc, $!));
-    (@sdest= lstat($rdest)) || $! == &ENOENT ||
-        &quit(sprintf(_g("cannot stat new name \`%s': %s"), $rdest, $!));
+    (@ssrc = lstat($rsrc)) || $! == ENOENT ||
+        quit(sprintf(_g("cannot stat old name \`%s': %s"), $rsrc, $!));
+    (@sdest = lstat($rdest)) || $! == ENOENT ||
+        quit(sprintf(_g("cannot stat new name \`%s': %s"), $rdest, $!));
     # Unfortunately we have to check for write access in both
     # places, just having +w is not enough, since people do
     # mount things RO, and we need to fail before we start
@@ -277,8 +282,8 @@ sub checkrename {
     }
     if (@ssrc && @sdest &&
         !($ssrc[0] == $sdest[0] && $ssrc[1] == $sdest[1])) {
-        &quit(sprintf(_g("rename involves overwriting \`%s' with\n".
-              "  different file \`%s', not allowed"), $rdest, $rsrc));
+        quit(sprintf(_g("rename involves overwriting \`%s' with\n".
+                        "  different file \`%s', not allowed"), $rdest, $rsrc));
     }
 }
 
@@ -292,7 +297,7 @@ sub dorename {
     return if $testmode;
     if (@ssrc) {
         if (@sdest) {
-            unlink($rsrc) || &quit(sprintf(_g("rename: remove duplicate old link \`%s': %s"), $rsrc, $!));
+            unlink($rsrc) || quit(sprintf(_g("rename: remove duplicate old link \`%s': %s"), $rsrc, $!));
         } else {
             rename_mv($rsrc, $rdest) ||
                 quit(sprintf(_g("rename: rename \`%s' to \`%s': %s"), $rsrc, $rdest, $!));
@@ -302,26 +307,30 @@ sub dorename {
     
 sub save {
     return if $testmode;
-    open(N,"> $admindir/diversions-new") || &quit(sprintf(_g("create diversions-new: %s"), $!));
+    open(N, "> $admindir/diversions-new") || quit(sprintf(_g("create diversions-new: %s"), $!));
     chmod 0644, "$admindir/diversions-new";
     for (my $i = 0; $i <= $#contest; $i++) {
         print(N "$contest[$i]\n$altname[$i]\n$package[$i]\n")
-            || &quit(sprintf(_g("write diversions-new: %s"), $!));
+            || quit(sprintf(_g("write diversions-new: %s"), $!));
     }
-    close(N) || &quit(sprintf(_g("close diversions-new: %s"), $!));
+    close(N) || quit(sprintf(_g("close diversions-new: %s"), $!));
     unlink("$admindir/diversions-old") ||
-        $! == &ENOENT || &quit(sprintf(_g("remove old diversions-old: %s"), $!));
+        $! == ENOENT || quit(sprintf(_g("remove old diversions-old: %s"), $!));
     link("$admindir/diversions","$admindir/diversions-old") ||
-        $! == &ENOENT || &quit(sprintf(_g("create new diversions-old: %s"), $!));
+        $! == ENOENT || quit(sprintf(_g("create new diversions-old: %s"), $!));
     rename("$admindir/diversions-new","$admindir/diversions")
-        || &quit(sprintf(_g("install new diversions: %s"), $!));
+        || quit(sprintf(_g("install new diversions: %s"), $!));
+}
+
+sub infoa
+{
+    infol($file, $divertto, $package);
 }
 
-sub infoa { &infol($file,$divertto,$package); }
 sub infon
 {
     my $i = shift;
-    &infol($contest[$i], $altname[$i], $package[$i]);
+    infol($contest[$i], $altname[$i], $package[$i]);
 }
 
 sub quit
@@ -333,8 +342,12 @@ sub quit
 sub badusage
 {
     printf STDERR "%s: %s\n\n", $progname, "@_";
-    &usage;
+    usage();
     exit(2);
 }
 
-sub badfmt { &quit(sprintf(_g("internal error: %s corrupt: %s"), "$admindir/diversions", $_[0])); }
+sub badfmt
+{
+    quit(sprintf(_g("internal error: %s corrupt: %s"), "$admindir/diversions", $_[0]));
+}
+

scripts/dpkg-genchanges.pl

@@ -133,18 +133,18 @@ Options:
 while (@ARGV) {
     $_=shift(@ARGV);
     if (m/^-b$/) {
-	is_sourceonly && &usageerr(_g("cannot combine %s and -S"), $_);
+	is_sourceonly && usageerr(_g("cannot combine %s and -S"), $_);
 	$include = BIN;
     } elsif (m/^-B$/) {
-	is_sourceonly && &usageerr(_g("cannot combine %s and -S"), $_);
+	is_sourceonly && usageerr(_g("cannot combine %s and -S"), $_);
 	$include = ARCH_DEP;
 	printf STDERR _g("%s: arch-specific upload - not including arch-independent packages")."\n", $progname;
     } elsif (m/^-A$/) {
-	is_sourceonly && &usageerr(_g("cannot combine %s and -S"), $_);
+	is_sourceonly && usageerr(_g("cannot combine %s and -S"), $_);
 	$include = ARCH_INDEP;
 	printf STDERR _g("%s: arch-indep upload - not including arch-specific packages")."\n", $progname;
     } elsif (m/^-S$/) {
-	is_binaryonly && &usageerr(_g("cannot combine %s and -S"), binary_opt);
+	is_binaryonly && usageerr(_g("cannot combine %s and -S"), binary_opt);
 	$include = SOURCE;
     } elsif (m/^-s([iad])$/) {
         $sourcestyle= $1;
@@ -178,9 +178,11 @@ while (@ARGV) {
     } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
 	$substvars->set($1, $POSTMATCH);
     } elsif (m/^-(h|-help)$/) {
-        &usage; exit(0);
+	usage();
+	exit(0);
     } elsif (m/^--version$/) {
-        &version; exit(0);
+	version();
+	exit(0);
     } else {
         usageerr(_g("unknown option \`%s'"), $_);
     }
@@ -213,7 +215,7 @@ if (defined($prev_changelog) and
 }
 
 if (not is_sourceonly) {
-    open(FL,"<",$fileslistfile) || &syserr(_g("cannot read files list file"));
+    open(FL, "<", $fileslistfile) || syserr(_g("cannot read files list file"));
     while(<FL>) {
 	if (m/^(([-+.0-9a-z]+)_([^_]+)_([-\w]+)\.u?deb) (\S+) (\S+)$/) {
 	    defined($p2f{"$2 $4"}) &&
@@ -343,7 +345,7 @@ foreach $_ (keys %{$changelog}) {
 
 if ($changesdescription) {
     $fields->{'Changes'} = '';
-    open(X,"<",$changesdescription) || &syserr(_g("read changesdescription"));
+    open(X, "<", $changesdescription) || syserr(_g("read changesdescription"));
     while(<X>) {
         s/\s*\n$//;
         $_= '.' unless m/\S/;
@@ -468,7 +470,7 @@ if (!is_binaryonly) {
 }
 
 print(STDERR "$progname: $origsrcmsg\n") ||
-    &syserr(_g("write original source message")) unless $quiet;
+    syserr(_g("write original source message")) unless $quiet;
 
 $fields->{'Format'} = $substvars->get("Format");
 

scripts/dpkg-gencontrol.pl

@@ -112,9 +112,11 @@ while (@ARGV) {
     } elsif (m/^-n/) {
         $forcefilename= $';
     } elsif (m/^-(h|-help)$/) {
-        &usage; exit(0);
+        usage();
+        exit(0);
     } elsif (m/^--version$/) {
-        &version; exit(0);
+        version();
+        exit(0);
     } else {
         usageerr(_g("unknown option \`%s'"), $_);
     }
@@ -288,7 +290,7 @@ if (!defined($substvars->get('Installed-Size'))) {
     if (!$c) {
         chdir("$packagebuilddir") ||
             syserr(_g("chdir for du to \`%s'"), $packagebuilddir);
-        exec("du","-k","-s",".") or &syserr(_g("exec du"));
+        exec("du", "-k", "-s", ".") or syserr(_g("exec du"));
     }
     my $duo = '';
     while (<DU>) {
@@ -316,7 +318,7 @@ for my $f (keys %remove) {
 }
 
 $fileslistfile="./$fileslistfile" if $fileslistfile =~ m/^\s/;
-open(Y, ">", "$fileslistfile.new") || &syserr(_g("open new files list file"));
+open(Y, ">", "$fileslistfile.new") || syserr(_g("open new files list file"));
 binmode(Y);
 if (open(X, "<", $fileslistfile)) {
     binmode(X);
@@ -327,11 +329,11 @@ if (open(X, "<", $fileslistfile)) {
 	        && ($3 eq $pkg_type)
 	        && (debarch_eq($2, $fields->{'Architecture'})
 		    || debarch_eq($2, 'all'));
-        print(Y "$_\n") || &syserr(_g("copy old entry to new files list file"));
+        print(Y "$_\n") || syserr(_g("copy old entry to new files list file"));
     }
-    close(X) || &syserr(_g("close old files list file"));
+    close(X) || syserr(_g("close old files list file"));
 } elsif ($! != ENOENT) {
-    &syserr(_g("read old files list file"));
+    syserr(_g("read old files list file"));
 }
 my $sversion = $fields->{'Version'};
 $sversion =~ s/^\d+://;
@@ -341,9 +343,9 @@ $forcefilename = sprintf("%s_%s_%s.%s", $oppackage, $sversion, $fields->{'Archit
 print(Y $substvars->substvars(sprintf("%s %s %s\n", $forcefilename,
 				      $fields->{'Section'} || '-',
 				      $fields->{'Priority'} || '-')))
-    || &syserr(_g("write new entry to new files list file"));
-close(Y) || &syserr(_g("close new files list file"));
-rename("$fileslistfile.new",$fileslistfile) || &syserr(_g("install new files list file"));
+    || syserr(_g("write new entry to new files list file"));
+close(Y) || syserr(_g("close new files list file"));
+rename("$fileslistfile.new", $fileslistfile) || syserr(_g("install new files list file"));
 
 my $cf;
 my $fh_output;

scripts/dpkg-gensymbols.pl

@@ -96,9 +96,11 @@ while (@ARGV) {
     } elsif (m/^-O(.+)$/) {
 	$output = $1;
     } elsif (m/^-(h|-help)$/) {
-	&usage; exit(0);
+	usage();
+	exit(0);
     } elsif (m/^--version$/) {
-	&version; exit(0);
+	version();
+	exit(0);
     } else {
 	usageerr(_g("unknown option \`%s'"), $_);
     }

scripts/dpkg-scanpackages.pl

@@ -35,7 +35,7 @@ my %field_case;
 
 use Getopt::Long qw(:config bundling);
 
-my %options = (help            => sub { &usage; exit 0; },
+my %options = (help            => sub { usage(); exit 0; },
 	       version         => \&version,
 	       type            => undef,
 	       udeb            => 0,
@@ -183,7 +183,7 @@ FILE:
 	
 	if (defined($packages{$p}) and not $options{multiversion}) {
 	    foreach (@{$packages{$p}}) {
-		if (&vercmp($tv{'Version'}, $_->{'Version'})) {
+		if (vercmp($tv{'Version'}, $_->{'Version'})) {
 		    printf(STDERR _g(
 			  " ! Package %s (filename %s) is repeat but newer version;\n".
 			  "   used that one and ignored data from %s !\n"), $p, $fn, $_->{Filename})
@@ -265,8 +265,8 @@ close(STDOUT) or syserr(_g("Couldn't close stdout"));
 
 my @spuriousover= grep(!defined($packages{$_}),sort keys %overridden);
 
-&writelist(_g("** Packages in archive but missing from override file: **"),
-           @missingover);
+writelist(_g("** Packages in archive but missing from override file: **"),
+          @missingover);
 if (@changedmaint) {
     print(STDERR
           _g(" ++ Packages in override file with incorrect old maintainer value: ++")."\n",

scripts/dpkg-statoverride.pl

@@ -66,9 +66,11 @@ while (@ARGV) {
 	if (!m/^-/) {
 		unshift(@ARGV,$_); last;
 	} elsif (m/^--help$/) {
-		&usage; exit(0);
+		usage();
+		exit(0);
 	} elsif (m/^--version$/) {
-		&version; exit(0);
+		version();
+		exit(0);
 	} elsif (m/^--update$/) {
 		$doupdate=1;
 	} elsif (m/^--quiet$/) {
@@ -76,30 +78,30 @@ while (@ARGV) {
 	} elsif (m/^--force$/) {
 		$doforce=1;
 	} elsif (m/^--admindir$/) {
-		@ARGV || &badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
+		@ARGV || badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
 		$admindir= shift(@ARGV);
 	} elsif (m/^--add$/) {
-		&CheckModeConflict;
+		CheckModeConflict();
 		$mode= 'add';
 	} elsif (m/^--remove$/) {
-		&CheckModeConflict;
+		CheckModeConflict();
 		$mode= 'remove';
 	} elsif (m/^--list$/) {
-		&CheckModeConflict;
+		CheckModeConflict();
 		$mode= 'list';
 	} else {
-		&badusage(sprintf(_g("unknown option \`%s'"), $_));
+		badusage(sprintf(_g("unknown option \`%s'"), $_));
 	}
 }
 
 my $dowrite = 0;
 my $exitcode = 0;
 
-&badusage(_g("no mode specified")) unless $mode;
-&ReadOverrides;
+badusage(_g("no mode specified")) unless $mode;
+ReadOverrides();
 
 if ($mode eq "add") {
-	@ARGV==4 || &badusage(_g("--add needs four arguments"));
+	@ARGV == 4 || badusage(_g("--add needs four arguments"));
 
 	my $user = $ARGV[0];
 	my $uid = 0;
@@ -107,25 +109,28 @@ if ($mode eq "add") {
 
 	if ($user =~ m/^#([0-9]+)$/) {
 	    $uid=$1;
-	    &badusage(sprintf(_g("illegal user %s"), $user)) if ($uid<0);
+	    badusage(sprintf(_g("illegal user %s"), $user)) if ($uid < 0);
 	} else {
 	    my ($name, $pw);
-	    (($name,$pw,$uid)=getpwnam($user)) || &badusage(sprintf(_g("non-existing user %s"), $user));
+	    (($name, $pw, $uid) = getpwnam($user)) ||
+	        badusage(sprintf(_g("non-existing user %s"), $user));
 	}
 
 	my $group = $ARGV[1];
 	if ($group =~ m/^#([0-9]+)$/) {
 	    $gid=$1;
-	    &badusage(sprintf(_g("illegal group %s"), $group)) if ($gid<0);
+	    badusage(sprintf(_g("illegal group %s"), $group)) if ($gid < 0);
 	} else {
 	    my ($name, $pw);
-	    (($name,$pw,$gid)=getgrnam($group)) || &badusage(sprintf(_g("non-existing group %s"), $group));
+	    (($name, $pw, $gid) = getgrnam($group)) ||
+	        badusage(sprintf(_g("non-existing group %s"), $group));
 	}
 
 	my $mode = $ARGV[2];
-	(($mode<0) or (oct($mode)>07777) or ($mode !~ m/\d+/)) && &badusage(sprintf(_g("illegal mode %s"), $mode));
+	(($mode < 0) or (oct($mode) > 07777) or ($mode !~ m/\d+/)) &&
+	    badusage(sprintf(_g("illegal mode %s"), $mode));
 	my $file = $ARGV[3];
-	$file =~ m/\n/ && &badusage(_g("file may not contain newlines"));
+	$file =~ m/\n/ && badusage(_g("file may not contain newlines"));
 	$file =~ s,/+$,, && print STDERR _g("stripping trailing /")."\n";
 
 	if (defined $owner{$file}) {
@@ -151,7 +156,7 @@ if ($mode eq "add") {
 	    }
 	}
 } elsif ($mode eq "remove") {
-	@ARGV==1 || &badusage(sprintf(_g("--%s needs a single argument"), "remove"));
+	@ARGV == 1 || badusage(sprintf(_g("--%s needs a single argument"), "remove"));
 	my $file = $ARGV[0];
 	$file =~ s,/+$,, && print STDERR _g("stripping trailing /")."\n";
 	if (not defined $owner{$file}) {
@@ -185,12 +190,13 @@ if ($mode eq "add") {
 	}
 }
 
-&WriteOverrides if ($dowrite);
+WriteOverrides() if ($dowrite);
 
 exit($exitcode);
 
 sub ReadOverrides {
-	open(SO,"$admindir/statoverride") || &quit(sprintf(_g("cannot open statoverride: %s"), $!));
+	open(SO, "$admindir/statoverride") ||
+	    quit(sprintf(_g("cannot open statoverride: %s"), $!));
 	while (<SO>) {
 		my ($owner,$group,$mode,$file);
 		chomp;
@@ -209,18 +215,19 @@ sub ReadOverrides {
 sub WriteOverrides {
 	my ($file);
 
-	open(SO,">$admindir/statoverride-new") || &quit(sprintf(_g("cannot open new statoverride file: %s"), $!));
+	open(SO, ">$admindir/statoverride-new") ||
+	    quit(sprintf(_g("cannot open new statoverride file: %s"), $!));
 	foreach $file (keys %owner) {
 		print SO "$owner{$file} $group{$file} $mode{$file} $file\n";
 	}
 	close(SO);
 	chmod(0644, "$admindir/statoverride-new");
 	unlink("$admindir/statoverride-old") ||
-		$! == ENOENT || &quit(sprintf(_g("error removing statoverride-old: %s"), $!));
+		$! == ENOENT || quit(sprintf(_g("error removing statoverride-old: %s"), $!));
 	link("$admindir/statoverride","$admindir/statoverride-old") ||
-		$! == ENOENT || &quit(sprintf(_g("error creating new statoverride-old: %s"), $!));
+		$! == ENOENT || quit(sprintf(_g("error creating new statoverride-old: %s"), $!));
 	rename("$admindir/statoverride-new","$admindir/statoverride")
-		|| &quit(sprintf(_g("error installing new statoverride: %s"), $!));
+		|| quit(sprintf(_g("error installing new statoverride: %s"), $!));
 }
 
 
@@ -233,7 +240,7 @@ sub quit
 sub badusage
 {
 	printf STDERR "%s: %s\n\n", $0, "@_";
-	&usage;
+	usage();
 	exit(2);
 }
 

scripts/update-alternatives.pl

@@ -117,7 +117,7 @@ sub quit
 sub badusage
 {
     printf STDERR "%s: %s\n\n", $progname, "@_";
-    &usage;
+    usage();
     exit(2);
 }
 
@@ -331,48 +331,50 @@ while (@ARGV) {
     $_= shift(@ARGV);
     last if m/^--$/;
     if (!m/^--/) {
-        &quit(sprintf(_g("unknown argument \`%s'"), $_));
+        quit(sprintf(_g("unknown argument \`%s'"), $_));
     } elsif (m/^--help$/) {
-        &usage; exit(0);
+        usage();
+        exit(0);
     } elsif (m/^--version$/) {
-        &version; exit(0);
+        version();
+        exit(0);
     } elsif (m/^--verbose$/) {
         $verbosemode= +1;
     } elsif (m/^--quiet$/) {
         $verbosemode= -1;
     } elsif (m/^--install$/) {
 	check_many_actions();
-        @ARGV >= 4 || &badusage(_g("--install needs <link> <name> <path> <priority>"));
+        @ARGV >= 4 || badusage(_g("--install needs <link> <name> <path> <priority>"));
         ($alink,$name,$apath,$apriority,@ARGV) = @ARGV;
-        $apriority =~ m/^[-+]?\d+/ || &badusage(_g("priority must be an integer"));
+        $apriority =~ m/^[-+]?\d+/ || badusage(_g("priority must be an integer"));
 	$action = 'install';
     } elsif (m/^--(remove|set)$/) {
 	check_many_actions();
-        @ARGV >= 2 || &badusage(sprintf(_g("--%s needs <name> <path>"), $1));
+        @ARGV >= 2 || badusage(sprintf(_g("--%s needs <name> <path>"), $1));
         ($name,$apath,@ARGV) = @ARGV;
 	$action = $1;
     } elsif (m/^--(display|query|auto|config|list|remove-all)$/) {
 	check_many_actions();
-        @ARGV || &badusage(sprintf(_g("--%s needs <name>"), $1));
+        @ARGV || badusage(sprintf(_g("--%s needs <name>"), $1));
 	$action = $1;
         $name= shift(@ARGV);
     } elsif (m/^--slave$/) {
-        @ARGV >= 3 || &badusage(_g("--slave needs <link> <name> <path>"));
+        @ARGV >= 3 || badusage(_g("--slave needs <link> <name> <path>"));
         ($slink,$sname,$spath,@ARGV) = @ARGV;
-        defined($aslavelink{$sname}) && &badusage(sprintf(_g("slave name %s duplicated"), $sname));
-        $aslavelinkcount{$slink}++ && &badusage(sprintf(_g("slave link %s duplicated"), $slink));
+        defined($aslavelink{$sname}) && badusage(sprintf(_g("slave name %s duplicated"), $sname));
+        $aslavelinkcount{$slink}++ && badusage(sprintf(_g("slave link %s duplicated"), $slink));
         $aslavelink{$sname}= $slink;
         $aslavepath{$sname}= $spath;
     } elsif (m/^--altdir$/) {
-        @ARGV || &badusage(sprintf(_g("--%s needs a <directory> argument"), "altdir"));
+        @ARGV || badusage(sprintf(_g("--%s needs a <directory> argument"), "altdir"));
         $altdir= shift(@ARGV);
     } elsif (m/^--admindir$/) {
-        @ARGV || &badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
+        @ARGV || badusage(sprintf(_g("--%s needs a <directory> argument"), "admindir"));
         $admindir= shift(@ARGV);
     } elsif (m/^--all$/) {
 	$action = 'all';
     } else {
-        &badusage(sprintf(_g("unknown option \`%s'"), $_));
+        badusage(sprintf(_g("unknown option \`%s'"), $_));
     }
 }
 
@@ -387,7 +389,7 @@ $action eq 'install' || !%aslavelink ||
   badusage(_g("--slave only allowed with --install"));
 
 if ($action eq 'all') {
-    &config_all();
+    config_all();
     exit 0;
 }
 
@@ -437,7 +439,7 @@ if (defined($linkname= readlink("$altdir/$name"))) {
     } else {
         $state= 'unexpected';
     }
-} elsif ($! == &ENOENT) {
+} elsif ($! == ENOENT) {
     $state= 'nonexistent';
 } else {
     $state= 'unexpected';
@@ -450,7 +452,7 @@ if (defined($linkname= readlink("$altdir/$name"))) {
 # all independent
 
 if ($action eq 'auto') {
-    &pr(sprintf(_g("Setting up automatic selection of %s."), $name))
+    pr(sprintf(_g("Setting up automatic selection of %s."), $name))
       if $verbosemode > 0;
     checked_rm("$altdir/$name.dpkg-tmp");
     checked_rm("$altdir/$name");
@@ -464,8 +466,8 @@ if ($action eq 'auto') {
 # action=auto <=> state=nonexistent
 
 if ($state eq 'unexpected' && $mode eq 'auto') {
-    &pr(sprintf(_g("%s has been changed (manually or by a script).\n".
-                   "Switching to manual updates only."), "$altdir/$name"))
+    pr(sprintf(_g("%s has been changed (manually or by a script).\n" .
+                  "Switching to manual updates only."), "$altdir/$name"))
       if $verbosemode > 0;
     $mode = 'manual';
 }
@@ -482,10 +484,10 @@ pr(sprintf(_g("Checking available versions of %s, updating links in %s ..."),
 
 if ($action eq 'install') {
     if (defined($link) && $link ne $alink) {
-        &pr(sprintf(_g("Renaming %s link from %s to %s."), $name, $link, $alink))
+        pr(sprintf(_g("Renaming %s link from %s to %s."), $name, $link, $alink))
           if $verbosemode > 0;
-        rename_mv($link,$alink) || $! == &ENOENT ||
-            &quit(sprintf(_g("unable to rename %s to %s: %s"), $link, $alink, $!));
+        rename_mv($link,$alink) || $! == ENOENT ||
+            quit(sprintf(_g("unable to rename %s to %s: %s"), $link, $alink, $!));
     }
     $link= $alink;
     my $i;
@@ -504,12 +506,12 @@ if ($action eq 'install') {
         my $newslavelink = $aslavelink{$sname};
 	$slavelinkcount{$oldslavelink}-- if defined($oldslavelink);
         $slavelinkcount{$newslavelink}++ &&
-            &quit(sprintf(_g("slave link name %s duplicated"), $newslavelink));
+            quit(sprintf(_g("slave link name %s duplicated"), $newslavelink));
 	if (defined($oldslavelink) && $newslavelink ne $oldslavelink) {
-            &pr(sprintf(_g("Renaming %s slave link from %s to %s."), $sname, $oldslavelink, $newslavelink))
+            pr(sprintf(_g("Renaming %s slave link from %s to %s."), $sname, $oldslavelink, $newslavelink))
               if $verbosemode > 0;
-            rename_mv($oldslavelink,$newslavelink) || $! == &ENOENT ||
-                &quit(sprintf(_g("unable to rename %s to %s: %s"), $oldslavelink, $newslavelink, $!));
+            rename_mv($oldslavelink,$newslavelink) || $! == ENOENT ||
+                quit(sprintf(_g("unable to rename %s to %s: %s"), $oldslavelink, $newslavelink, $!));
         }
         $slavelinks[$j]= $newslavelink;
     }
@@ -523,7 +525,7 @@ if ($action eq 'install') {
 if ($action eq 'remove') {
     my $hits = 0;
     if ($mode eq "manual" and $state ne "expected" and (map { $hits += $apath eq $_ } @versions) and $hits and $linkname eq $apath) {
-	&pr(_g("Removing manually selected alternative - switching to auto mode"));
+        pr(_g("Removing manually selected alternative - switching to auto mode"));
 	$mode = "auto";
     }
     if (defined(my $i = $versionnum{$apath})) {
@@ -537,7 +539,7 @@ if ($action eq 'remove') {
             delete $slavepath{$k,$j};
         }
     } else {
-        &pr(sprintf(_g("Alternative %s for %s not registered, not removing."), $apath, $name))
+        pr(sprintf(_g("Alternative %s for %s not registered, not removing."), $apath, $name))
           if $verbosemode > 0;
     }
 }
@@ -564,7 +566,7 @@ for (my $j = 0; $j <= $#slavenames; $j++) {
         last if $slavepath{$i,$j} ne '';
     }
     if ($i > $#versions) {
-        &pr(sprintf(_g("Discarding obsolete slave link %s (%s)."), $slavenames[$j], $slavelinks[$j]))
+        pr(sprintf(_g("Discarding obsolete slave link %s (%s)."), $slavenames[$j], $slavelinks[$j]))
           if $verbosemode > 0;
         checked_rm("$altdir/$slavenames[$j]");
         checked_rm($slavelinks[$j]);
@@ -583,13 +585,13 @@ for (my $j = 0; $j <= $#slavenames; $j++) {
 }
         
 if ($mode eq 'manual') {
-    &pr(sprintf(_g("Automatic updates of %s are disabled, leaving it alone."), "$altdir/$name"))
+    pr(sprintf(_g("Automatic updates of %s are disabled, leaving it alone."), "$altdir/$name"))
       if $verbosemode > 0;
-    &pr(sprintf(_g("To return to automatic updates use \`update-alternatives --auto %s'."), $name))
+    pr(sprintf(_g("To return to automatic updates use \`update-alternatives --auto %s'."), $name))
       if $verbosemode > 0;
 } else {
     if ($state eq 'expected-inprogress') {
-        &pr(sprintf(_g("Recovering from previous failed update of %s ..."), $name));
+        pr(sprintf(_g("Recovering from previous failed update of %s ..."), $name));
 	checked_mv("$altdir/$name.dpkg-tmp", "$altdir/$name");
         $state= 'expected';
     }
@@ -603,30 +605,30 @@ if ($mode eq 'manual') {
 # mode=auto => state!=expected-inprogress && state!=unexpected
 
 open(AF,">$admindir/$name.dpkg-new") ||
-    &quit(sprintf(_g("unable to open %s for write: %s"), "$admindir/$name.dpkg-new", $!));
+    quit(sprintf(_g("unable to open %s for write: %s"), "$admindir/$name.dpkg-new", $!));
 paf($mode);
-&paf($link);
+paf($link);
 for (my $j = 0; $j <= $#slavenames; $j++) {
-    &paf($slavenames[$j]);
-    &paf($slavelinks[$j]);
+    paf($slavenames[$j]);
+    paf($slavelinks[$j]);
 }
 
 find_best_version();
 
-&paf('');
+paf('');
 for (my $i = 0; $i <= $#versions; $i++) {
-    &paf($versions[$i]);
-    &paf($priorities[$i]);
+    paf($versions[$i]);
+    paf($priorities[$i]);
     for (my $j = 0; $j <= $#slavenames; $j++) {
-        &paf($slavepath{$i,$j});
+        paf($slavepath{$i,$j});
     }
 }
-&paf('');
-close(AF) || &quit(sprintf(_g("unable to close %s: %s"), "$admindir/$name.dpkg-new", $!));
+paf('');
+close(AF) || quit(sprintf(_g("unable to close %s: %s"), "$admindir/$name.dpkg-new", $!));
 
 if ($mode eq 'auto') {
     if ($best eq '') {
-        &pr(sprintf(_g("Last package providing %s (%s) removed, deleting it."), $name, $link))
+        pr(sprintf(_g("Last package providing %s (%s) removed, deleting it."), $name, $link))
           if $verbosemode > 0;
         checked_rm("$altdir/$name");
         checked_rm("$link");
@@ -650,7 +652,7 @@ if ($mode eq 'auto') {
         $spath= $slavepath{$bestnum,$j};
         checked_rm("$altdir/$sname.dpkg-tmp");
         if ($spath eq '') {
-            &pr(sprintf(_g("Removing %s (%s), not appropriate with %s."), $sname, $slink, $best))
+            pr(sprintf(_g("Removing %s (%s), not appropriate with %s."), $sname, $slink, $best))
               if $verbosemode > 0;
             checked_rm("$altdir/$sname");
             checked_rm("$slink");
@@ -718,25 +720,30 @@ sub set_alternatives {
      }
    }
    if($preferred == -1){
-     &quit(sprintf(_g("Cannot find alternative `%s'."), $apath)."\n")
+     quit(sprintf(_g("Cannot find alternative `%s'."), $apath)."\n");
    }
    set_links($apath, $preferred);
 }
 
-sub pr { print(STDOUT "@_\n") || &quit(sprintf(_g("error writing stdout: %s"), $!)); }
+sub pr
+{
+    print(STDOUT "@_\n") ||
+        quit(sprintf(_g("error writing stdout: %s"), $!));
+}
+
 sub paf {
-    $_[0] =~ m/\n/ && &quit(sprintf(_g("newlines prohibited in update-alternatives files (%s)"), $_[0]));
-    print(AF "$_[0]\n") || &quit(sprintf(_g("error writing stdout: %s"), $!));
+    $_[0] =~ m/\n/ && quit(sprintf(_g("newlines prohibited in update-alternatives files (%s)"), $_[0]));
+    print(AF "$_[0]\n") || quit(sprintf(_g("error writing stdout: %s"), $!));
 }
 sub gl {
     $!=0; $_= <AF>;
     defined($_) || quit(sprintf(_g("error or eof reading %s for %s (%s)"),
                                 "$admindir/$name", $_[0], $!));
-    s/\n$// || &badfmt(sprintf(_g("missing newline after %s"), $_[0]));
+    s/\n$// || badfmt(sprintf(_g("missing newline after %s"), $_[0]));
     $_;
 }
 sub badfmt {
-    &quit(sprintf(_g("internal error: %s corrupt: %s"), "$admindir/$name", $_[0]));
+    quit(sprintf(_g("internal error: %s corrupt: %s"), "$admindir/$name", $_[0]));
 }
 sub rename_mv {
     return (rename($_[0], $_[1]) || (system(("mv", $_[0], $_[1])) == 0));
@@ -744,12 +751,12 @@ sub rename_mv {
 sub checked_symlink {
     my ($filename, $linkname) = @_;
     symlink($filename, $linkname) ||
-	&quit(sprintf(_g("unable to make %s a symlink to %s: %s"), $linkname, $filename, $!));
+        quit(sprintf(_g("unable to make %s a symlink to %s: %s"), $linkname, $filename, $!));
 }
 sub checked_mv {
     my ($source, $dest) = @_;
     rename_mv($source, $dest) ||
-	&quit(sprintf(_g("unable to install %s as %s: %s"), $source, $dest, $!));
+        quit(sprintf(_g("unable to install %s as %s: %s"), $source, $dest, $!));
 }
 sub config_all {
     opendir ADMINDIR, $admindir or die sprintf(_g("Serious problem: %s"), $!);