apex: Revert back to 1.4.7 - what I thought I tested wasn't what I actually tested...

[openwrt.git] / scripts / timestamp.pl

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index f6b06bc..a4c5cae 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -1,31 +1,54 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 
-sub get_ts($) {
+sub get_ts($$) {
        my $path = shift;
+       my $options = shift;
        my $ts = 0;
-       open FIND, "find $path -not -path \\*.svn\\* -and -not -path \\*CVS\\* |";
+       my $fn = "";
+       open FIND, "find $path -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
        while (<FIND>) {
-               open FILE, "<$_";
-               my @stat = stat FILE;
-               close FILE;
-               $ts = $stat[9] if ($stat[9] > $ts);
+               chomp;
+               my $file = $_;
+               next if -l $file;
+               my @stat = stat $file;
+               if ($stat[9] > $ts) {
+                       $ts = $stat[9];
+                       $fn = $file;
+               }
        }
        close FIND;
-       return $ts;
+       return ($ts, $fn);
 }
 
 (@ARGV > 0) or push @ARGV, ".";
 my $ts = 0;
 my $n = ".";
 my %options;
-foreach my $path (@ARGV) {
-       if ($path =~ /^-/) {
+while (@ARGV > 0) {
+       my $path = shift @ARGV;
+       if ($path =~ /^-x/) {
+               my $str = shift @ARGV;
+               $options{"findopts"} .= " -and -not -path \\*".$str."\\*"
+       } elsif ($path =~ /^-f/) {
+               $options{"findopts"} .= " -follow";
+       } elsif ($path =~ /^-/) {
                $options{$path} = 1;
        } else {
-               my $tmp = get_ts($path);
+               my ($tmp, $fname) = get_ts($path, $options{"findopts"});
                if ($tmp > $ts) {
-                       $n = $path;
+                       if ($options{'-f'}) {
+                               $n = $fname;
+                       } else {
+                               $n = $path;
+                       }
                        $ts = $tmp;
                }
        }