File::Find behavior with files among @DIRS #9518
Comments
From jflack@math.purdue.eduCreated by jflack@math.purdue.eduThis is a bug report for perl from jflack@math.purdue.edu, ----------------------------------------------------------------- So, unless there is a really strong objection to documenting the There is one small point where the behavior for a non-directory Perl Info |
From @jkeenanOn Thu Oct 09 08:39:46 2008, jflack@math.purdue.edu wrote:
If I am reading the File::Find source code correctly, there is some ##### (I haven't studied the code between lines 577 and 620 well enough to say But the OP is correct with regard to the silence of the documentation on Thank you very much. |
|
The RT System itself - Status changed from 'new' to 'open' |
From @jkeenanOn Thu Jan 12 17:24:08 2012, jkeenan wrote:
Still need some feedback on this. Thank you very much. |
From @rjbsAs far as I'm concerned, this behavior can get documented as long as it's also got tests. |
From @jkeenanOn Wed Apr 04 18:42:20 2012, rjbs wrote:
Please review the patch attached. Thank you very much. Jim Keenan |
From @jkeenan0001-Individual-files-may-appear-in-list-of-directories-t.patchFrom 83a5ca1bbe148630b3ed1fef4afe065377a79dd6 Mon Sep 17 00:00:00 2001
From: jkeenan <jkeenan@cpan.org>
Date: Thu, 5 Apr 2012 20:41:14 -0400
Subject: [PATCH] Individual files may appear in list of directories to be searched.
Document that, then demonstrate that with additional tests.
For RT #59750.
---
lib/File/Find/t/find.t | 52 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/lib/File/Find/t/find.t b/lib/File/Find/t/find.t
index 1d0a087..87306cc 100644
--- a/lib/File/Find/t/find.t
+++ b/lib/File/Find/t/find.t
@@ -18,7 +18,7 @@ BEGIN {
$SIG{'__WARN__'} = sub { $warn_msg = $_[0]; warn "# $_[0]"; }
}
-my $test_count = 85;
+my $test_count = 98;
$test_count += 119 if $symlink_exists;
$test_count += 26 if $^O eq 'MSWin32';
$test_count += 2 if $^O eq 'MSWin32' and $symlink_exists;
@@ -108,6 +108,21 @@ sub cleanup {
rmdir dir_path('fb', 'fbc');
rmdir dir_path('fb');
}
+ if (-d dir_path('fc')) {
+ unlink (
+ file_path('fc', 'fca', 'match_alpha'),
+ file_path('fc', 'fca', 'match_beta'),
+ file_path('fc', 'fcb', 'match_gamma'),
+ file_path('fc', 'fcb', 'delta'),
+ file_path('fc', 'fcc', 'match_epsilon'),
+ file_path('fc', 'fcc', 'match_zeta'),
+ file_path('fc', 'fcc', 'eta'),
+ );
+ rmdir dir_path('fc', 'fca');
+ rmdir dir_path('fc', 'fcb');
+ rmdir dir_path('fc', 'fcc');
+ rmdir dir_path('fc');
+ }
if ($need_updir) {
my $updir = $^O eq 'VMS' ? File::Spec::VMS->updir() : File::Spec->updir;
chdir($updir);
@@ -870,6 +885,41 @@ if ($symlink_exists) { # Issue 68260
Check (!$dangling_symlink);
}
+print "# RT 59750\n";
+MkDir( dir_path('fc'), 0770 );
+MkDir( dir_path('fc', 'fca'), 0770 );
+MkDir( dir_path('fc', 'fcb'), 0770 );
+MkDir( dir_path('fc', 'fcc'), 0770 );
+touch( file_path('fc', 'fca', 'match_alpha') );
+touch( file_path('fc', 'fca', 'match_beta') );
+touch( file_path('fc', 'fcb', 'match_gamma') );
+touch( file_path('fc', 'fcb', 'delta') );
+touch( file_path('fc', 'fcc', 'match_epsilon') );
+touch( file_path('fc', 'fcc', 'match_zeta') );
+touch( file_path('fc', 'fcc', 'eta') );
+
+my @files_from_mixed = ();
+sub wantmatch {
+ if ( $File::Find::name =~ m/match/ ) {
+ push @files_from_mixed, $_;
+ print "# \$_ => '$_'\n";
+ }
+}
+find( \&wantmatch, (
+ dir_path('fc', 'fca'),
+ dir_path('fc', 'fcb'),
+ dir_path('fc', 'fcc'),
+) );
+Check( scalar(@files_from_mixed) == 5 );
+
+@files_from_mixed = ();
+find( \&wantmatch, (
+ dir_path('fc', 'fca'),
+ dir_path('fc', 'fcb'),
+ file_path('fc', 'fcc', 'match_epsilon'),
+ file_path('fc', 'fcc', 'eta'),
+) );
+Check( scalar(@files_from_mixed) == 4 );
if ($^O eq 'MSWin32') {
# Check F:F:f correctly handles a root directory path.
--
1.6.3.2
|
From @jkeenanOn Thu Apr 05 17:44:35 2012, jkeenan wrote:
This patch didn't include the intended documentation change. I will try jimk |
From @jkeenanOn Fri Apr 06 13:31:51 2012, jkeenan wrote:
|
From @jkeenan0002-Individual-files-may-appear-in-list-of-directories-t.patchFrom c07a361682707be2cd43004ce9eb572f4630691a Mon Sep 17 00:00:00 2001
From: jkeenan <jkeenan@cpan.org>
Date: Fri, 6 Apr 2012 20:20:59 -0400
Subject: [PATCH 2/2] Individual files may appear in list of directories to be searched.
Document that, then demonstrate that with additional tests.
For RT #59750.
---
lib/File/Find.pm | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index f2fe20b..3b66d86 100644
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -280,6 +280,14 @@ links that don't resolve:
-l && !-e && print "bogus link: $File::Find::name\n";
}
+Note that you may mix directories and (non-directory) files in the list of
+directories to be searched by the C<wanted()>.
+
+ find(\&wanted, "./foo", "./bar", "./baz/epsilon");
+
+In the example above, no file in F<./baz/> other than F<./baz/epsilon> will be
+evaluated by C<wanted()>.
+
See also the script C<pfind> on CPAN for a nice application of this
module.
--
1.6.3.2
|
From @jkeenan0001-Individual-files-may-appear-in-list-of-directories-t.patchFrom 83a5ca1bbe148630b3ed1fef4afe065377a79dd6 Mon Sep 17 00:00:00 2001
From: jkeenan <jkeenan@cpan.org>
Date: Thu, 5 Apr 2012 20:41:14 -0400
Subject: [PATCH 1/2] Individual files may appear in list of directories to be searched.
Document that, then demonstrate that with additional tests.
For RT #59750.
---
lib/File/Find/t/find.t | 52 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/lib/File/Find/t/find.t b/lib/File/Find/t/find.t
index 1d0a087..87306cc 100644
--- a/lib/File/Find/t/find.t
+++ b/lib/File/Find/t/find.t
@@ -18,7 +18,7 @@ BEGIN {
$SIG{'__WARN__'} = sub { $warn_msg = $_[0]; warn "# $_[0]"; }
}
-my $test_count = 85;
+my $test_count = 98;
$test_count += 119 if $symlink_exists;
$test_count += 26 if $^O eq 'MSWin32';
$test_count += 2 if $^O eq 'MSWin32' and $symlink_exists;
@@ -108,6 +108,21 @@ sub cleanup {
rmdir dir_path('fb', 'fbc');
rmdir dir_path('fb');
}
+ if (-d dir_path('fc')) {
+ unlink (
+ file_path('fc', 'fca', 'match_alpha'),
+ file_path('fc', 'fca', 'match_beta'),
+ file_path('fc', 'fcb', 'match_gamma'),
+ file_path('fc', 'fcb', 'delta'),
+ file_path('fc', 'fcc', 'match_epsilon'),
+ file_path('fc', 'fcc', 'match_zeta'),
+ file_path('fc', 'fcc', 'eta'),
+ );
+ rmdir dir_path('fc', 'fca');
+ rmdir dir_path('fc', 'fcb');
+ rmdir dir_path('fc', 'fcc');
+ rmdir dir_path('fc');
+ }
if ($need_updir) {
my $updir = $^O eq 'VMS' ? File::Spec::VMS->updir() : File::Spec->updir;
chdir($updir);
@@ -870,6 +885,41 @@ if ($symlink_exists) { # Issue 68260
Check (!$dangling_symlink);
}
+print "# RT 59750\n";
+MkDir( dir_path('fc'), 0770 );
+MkDir( dir_path('fc', 'fca'), 0770 );
+MkDir( dir_path('fc', 'fcb'), 0770 );
+MkDir( dir_path('fc', 'fcc'), 0770 );
+touch( file_path('fc', 'fca', 'match_alpha') );
+touch( file_path('fc', 'fca', 'match_beta') );
+touch( file_path('fc', 'fcb', 'match_gamma') );
+touch( file_path('fc', 'fcb', 'delta') );
+touch( file_path('fc', 'fcc', 'match_epsilon') );
+touch( file_path('fc', 'fcc', 'match_zeta') );
+touch( file_path('fc', 'fcc', 'eta') );
+
+my @files_from_mixed = ();
+sub wantmatch {
+ if ( $File::Find::name =~ m/match/ ) {
+ push @files_from_mixed, $_;
+ print "# \$_ => '$_'\n";
+ }
+}
+find( \&wantmatch, (
+ dir_path('fc', 'fca'),
+ dir_path('fc', 'fcb'),
+ dir_path('fc', 'fcc'),
+) );
+Check( scalar(@files_from_mixed) == 5 );
+
+@files_from_mixed = ();
+find( \&wantmatch, (
+ dir_path('fc', 'fca'),
+ dir_path('fc', 'fcb'),
+ file_path('fc', 'fcc', 'match_epsilon'),
+ file_path('fc', 'fcc', 'eta'),
+) );
+Check( scalar(@files_from_mixed) == 4 );
if ($^O eq 'MSWin32') {
# Check F:F:f correctly handles a root directory path.
--
1.6.3.2
|
From @jkeenanThe two patches in the preceding post, if applied in order, should do Thank you very much. |
From @cpansproutOn Fri Apr 06 17:30:01 2012, jkeenan wrote:
They are now waiting on the sprout/misc-post-5.16 to be merged after 5.16. -- Father Chrysostomos |
From [Unknown Contact. See original ticket]On Fri Apr 06 17:30:01 2012, jkeenan wrote:
They are now waiting on the sprout/misc-post-5.16 to be merged after 5.16. -- Father Chrysostomos |
From @cpansproutOn Tue Apr 24 17:56:38 2012, sprout wrote:
And have now been applied as 488985b and c82ae0b. Thakn yuo. -- Father Chrysostomos |
|
@cpansprout - Status changed from 'open' to 'resolved' |
Migrated from rt.perl.org#59750 (status was 'resolved')
Searchable as RT59750$
The text was updated successfully, but these errors were encountered: