[adm5120] cleanup memory detection code, fix #2244

[openwrt.git] / scripts / timestamp.pl

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 89ec4e7..90d1fa7 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -13,7 +13,7 @@ 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 = $_;


@@ -36,7 +36,7 @@ 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{"findopts"} .= " -and -not -path \\*".$str."\\*"
+               $options{"findopts"} .= " -and -not -path '".$str."'"

        } elsif ($path =~ /^-f/) {
                $options{"findopts"} .= " -follow";
        } elsif ($path =~ /^-n/) {
        } elsif ($path =~ /^-f/) {
                $options{"findopts"} .= " -follow";
        } elsif ($path =~ /^-n/) {


@@ -47,7 +47,7 @@ while (@ARGV > 0) {
        } else {
                my ($tmp, $fname) = get_ts($path, $options{"findopts"});
                if ($tmp > $ts) {
        } else {
                my ($tmp, $fname) = get_ts($path, $options{"findopts"});
                if ($tmp > $ts) {

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

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