fix image preconfiguration

[openwrt.git] / scripts / timestamp.pl

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 093ced9..90d1fa7 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -13,13 +13,12 @@ sub get_ts($$) {
        my $options = shift;
        my $ts = 0;
        my $fn = "";
        my $options = shift;
        my $ts = 0;
        my $fn = "";

-       open FIND, "find $path -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+       open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";

        while (<FIND>) {
                chomp;
                my $file = $_;
        while (<FIND>) {
                chomp;
                my $file = $_;

-               open FILE, "<$file";
-               my @stat = stat FILE;
-               close FILE;
+               next if -l $file;
+               my @stat = stat $file;

                if ($stat[9] > $ts) {
                        $ts = $stat[9];
                        $fn = $file;
                if ($stat[9] > $ts) {
                        $ts = $stat[9];
                        $fn = $file;


@@ -37,13 +36,18 @@ while (@ARGV > 0) {
        my $path = shift @ARGV;
        if ($path =~ /^-x/) {
                my $str = shift @ARGV;
        my $path = shift @ARGV;
        if ($path =~ /^-x/) {
                my $str = shift @ARGV;

-               $options{"-x"} .= " -and -not -path \\*".$str."\\*"
+               $options{"findopts"} .= " -and -not -path '".$str."'"
+       } elsif ($path =~ /^-f/) {
+               $options{"findopts"} .= " -follow";
+       } elsif ($path =~ /^-n/) {
+               my $arg = $ARGV[0];
+               $options{$path} = $arg;

        } elsif ($path =~ /^-/) {
                $options{$path} = 1;
        } else {
        } 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 ($tmp > $ts) {

-                       if ($options{'-f'}) {
+                       if ($options{'-F'}) {

                                $n = $fname;
                        } else {
                                $n = $path;
                                $n = $fname;
                        } else {
                                $n = $path;


@@ -53,7 +57,9 @@ while (@ARGV > 0) {
        }
 }
 
        }
 }
 

-if ($options{"-p"}) {
+if ($options{"-n"}) {
+       exit ($n eq $options{"-n"} ? 0 : 1);
+} elsif ($options{"-p"}) {

        print "$n\n";
 } elsif ($options{"-t"}) {
        print "$ts\n";
        print "$n\n";
 } elsif ($options{"-t"}) {
        print "$ts\n";