Merge branch 'master' into AlexaBridge.pm

bin/.perltidyrc

@@ -51,7 +51,7 @@
 --look-for-selfloader
 --maximum-consecutive-blank-lines=1
 --maximum-fields-per-table=0
---maximum-line-length=80
+--maximum-line-length=160
 --minimum-space-to-comment=4
 --noopening-anonymous-sub-brace-on-new-line
 --noopening-brace-on-new-line

bin/alpha_page

@@ -27,26 +27,21 @@ my ( $Pgm_Path, $Pgm_Name, $Version );
 use vars '$Pgm_Root';    # So we can see it in eval var subs in read_parms
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'"
-      ;                           # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;
 my %parms;
-if (
-    !&GetOptions( \%parms, "h", "help", "message=s", "name:s", "pin:i",
-        "service:s" )
+if (  !&GetOptions( \%parms, "h", "help", "message=s", "name:s", "pin:i", "service:s" )
     or @ARGV
     or $parms{h}
     or $parms{help}
     or !$parms{message}
-    or !$parms{service}
-  )
+    or !$parms{service} )
 {
     print <<eof;
 
@@ -78,23 +73,19 @@ my (%pin_numbers);
 &setup;
 
 $parms{service} = "PageMart" unless $parms{service};
-unless ( ( $parms{service} eq "PageMart" ) | ( $parms{service} eq "Arch1way" ) |
-    ( $parms{service} eq "Arch2way" ) )
-{
+unless ( ( $parms{service} eq "PageMart" ) | ( $parms{service} eq "Arch1way" ) | ( $parms{service} eq "Arch2way" ) ) {
     print "\nParameter error: $parms{service}\n";
     print "The only accepted values for -service are:\n";
     print "    PageMart\n";
     print "    Arch1way\n";
     print "    Arch2way\n";
-    print
-      "(Note: not specifying -service will default to PageMart for backward compatibility.)\n";
+    print "(Note: not specifying -service will default to PageMart for backward compatibility.)\n";
     exit;
 }
 
 $parms{pin} = $pin_numbers{ $parms{name} } unless $parms{pin};
 unless ( $parms{pin} ) {
-    print
-      "\nYou must specifies mh.ini parm alpha_page_NAME_pin and -name option\n";
+    print "\nYou must specifies mh.ini parm alpha_page_NAME_pin and -name option\n";
     print "or specify -pin option.\n";
     exit;
 }

bin/authors

@@ -6,17 +6,15 @@ use strict;
 
 # Uses various flakey heuristics to pick out real names.
 
-my @bogus_first =
-  qw(The Tk Bug Web Added Applied Button By Category Change Email Family Fixed Global Henriksen Linux Lan
+my @bogus_first = qw(The Tk Bug Web Added Applied Button By Category Change Email Family Fixed Global Henriksen Linux Lan
   Memory More On Outlook Preset Radio Random Round Serial Unix Voice Windows Cue Dynamic Festival File Some
   ViaVoice SetWindowText Internet My Western Eastern Daylight Restart Call No Peet Rewrote Turtle
   Select Solid Edit Telephony Unit Weather Rio Red About Australian Caller Card
   Creative Device Digital Direct Evolution Extended External GHz Gentoo Home
   How Iridium Misterhouse Motorola Mythtv Password Server Song Charter Ogg European Another Media Moved Video VoIP
   Intuitive Package Perl Scalable Southern
 );
-my @bogus_last =
-  qw(Homelink House Group Report Programs Aqualink WinTV CallerID Voices Video Faq
+my @bogus_last = qw(Homelink House Group Report Programs Aqualink WinTV CallerID Voices Video Faq
   Events Address Station Audio Hat MrHouse Clipsal
   Remotes Credit Type Inputs Tivo Robotics Codes Commands Celeron Linux Theatre To Flares
   GUIs Management Network Info Media Windows Serial Wireless Acid Bay Manager Users

bin/backup_data

@@ -21,21 +21,15 @@ use strict;
 my ( $Pgm_Path, $Pgm_Name, $Version );
 
 BEGIN {
-    ($Version) =
-      q$Revision$ =~ /: (\S+)/;   # Note: revision number is auto-updated by cvs
+    ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
 }
 my %parms;
 use Getopt::Long;
-if (
-    !&GetOptions(
-        \%parms, 'h',      'help',    'file=s', 'size=i', 'skip=s',
-        'age=s', 'no_zip', 'no_date', 'int'
-    )
+if (   !&GetOptions( \%parms, 'h', 'help', 'file=s', 'size=i', 'skip=s', 'age=s', 'no_zip', 'no_date', 'int' )
     or !@ARGV
     or $parms{h}
-    or $parms{help}
-  )
+    or $parms{help} )
 {
     print <<eof;
 
@@ -109,20 +103,10 @@ sub get_files {
         push @files, &read_dir($dir);
     }
     $msg = "\nRead $counts{dir} directories:\n";
-    $msg .= sprintf " -  Storing %5.1f MB of data from %4d files\n",
-      $counts{size} / 10**6, $counts{file};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with size > $parms{size} KBytes\n",
-      $counts{size_size} / 10**6, $counts{count_size};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with name = $parms{skip}\n",
-      $counts{size_skip} / 10**6, $counts{count_skip};
-    $msg .=
-      sprintf
-      " -  Skipped %5.1f MB of data from %4d files with age  > $parms{age}\n",
-      $counts{size_age} / 10**6, $counts{count_age};
+    $msg .= sprintf " -  Storing %5.1f MB of data from %4d files\n",                                 $counts{size} / 10**6,      $counts{file};
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with size > $parms{size} KBytes\n", $counts{size_size} / 10**6, $counts{count_size};
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with name = $parms{skip}\n",        $counts{size_skip} / 10**6, $counts{count_skip};
+    $msg .= sprintf " -  Skipped %5.1f MB of data from %4d files with age  > $parms{age}\n",         $counts{size_age} / 10**6,  $counts{count_age};
     print $msg;
     $log .= $msg;
 }
@@ -156,8 +140,7 @@ sub tar_files {
         }
     }
     my ( $size, $date ) = ( stat $parms{file} )[ 7, 9 ];
-    printf "\nFile stats: %s  %s  %s\n\n", $parms{file}, $size,
-      scalar localtime $date;
+    printf "\nFile stats: %s  %s  %s\n\n", $parms{file}, $size, scalar localtime $date;
 }
 
 sub read_dir {