Changeset 1205 for bin

Timestamp:

09/01/09 00:40:39 (6 months ago)

Author:

vasi

Message:

sshjour: Deal with bonjour-only hosts, without another hostname option
appFormat: Allow finding old apps

Location:

bin

Files:

• appFormat.pl (modified) (6 diffs)
• sshjour (modified) (1 diff)

bin/appFormat.pl

@@ -7 +7 @@
 
 use File::Find;
+use Getopt::Long;
+use Pod::Usage;
 
 sub machCPU {
@@ -37 +39 @@
         read($df, my $data, 20) == 20 or return;
         my $cpu = unpack($tmpl, substr($data, 0, 4));
-        push @types, machCPU($cpu);
+        my $cpudesc = machCPU($cpu);
+        push @types, $cpudesc if $cpudesc;
     }
     return @types;
@@ -74 +77 @@
     }
     close $df;
+    return undef unless @types;
     
     my %exec = (types => \@types,
@@ -133 +137 @@
 }
 
+# New apps should include Mach-O x86 or Mach-O AMD64
+sub newExecType {
+    my $exec = shift;
+    my %okcpu = map { $_ => 1 } qw(x86 AMD64); 
+    return grep { $_->{format} eq 'Mach-O' && $okcpu{$_->{cpu}} } @{$exec->{types}};
+}
+
 sub dumpObj {
     my $exec = shift;
@@ -160 +171 @@
 }
 
-sub findApps {
+sub findPred {
+    my $pred = shift;
     find(sub {
         return unless -f;
         my $exec = executableType($_) or return;
+        return unless $pred->($exec);
         print "$File::Find::name\n";
         dumpObj($exec, "   ");
@@ -169 +182 @@
 }
 
-findApps(@ARGV);
+=head1 NAME
+
+  appFormat.pl - Find the format of Mac apps
+  
+=head1 SYNOPSIS
+
+  appFormat.pl [options] [path ...]
+  
+  Options:
+    -o, --old       Find only old apps
+    -h, --help      Print this message
+
+=cut
+
+my $pred = sub { 1 }; # TRUE
+my $help = 0;
+GetOptions(
+    'old' => sub { $pred = sub { !newExecType(@_) } },
+    'help' => \$help) or pod2usage(2);
+pod2usage(1) if $help;
+
+my @search = @ARGV ? @ARGV : ('.');
+findPred($pred, @search);

bin/sshjour

@@ -10 +10 @@
 end
 
+unless found
+        STDERR.puts "Can't find host!"
+        exit 1
+end
+
 exec('nc', found, fport || '22')