fix rootfs split partition renaming (fix by Eric L. Chen)

[openwrt.git] / scripts / timestamp.pl

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