Message ID | 1520535787-6223-13-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 08/03/2018 20:03, Ian Jackson wrote: > If you pass scripts/get_maintainer.pl the name of a FIFO or other > exciting object (/dev/stdin, for example), it would falsely print > "file not found". Instead: stat the object rather than using -f so > that we do not mind if the object is not a file; and print the errno > value in the error message. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > CC: Thomas Huth <thuth@redhat.com> > CC: Paolo Bonzini <pbonzini@redhat.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Anthony PERARD <anthony.perard@citrix.com> > --- > v6: New patch in this version of the series > --- > scripts/get_maintainer.pl | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl > index 07369aa..43fb5f5 100755 > --- a/scripts/get_maintainer.pl > +++ b/scripts/get_maintainer.pl > @@ -381,8 +381,8 @@ foreach my $file (@ARGV) { > ##if $file is a directory and it lacks a trailing slash, add one > if ((-d $file)) { > $file =~ s@([^/])$@$1/@; > - } elsif (!(-f $file)) { > - die "$P: file '${file}' not found\n"; > + } elsif (!(stat $file)) { > + die "$P: file '${file}' not found: $!\n"; > } > } > if ($from_filename) { > Queued, thanks. Paolo
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 07369aa..43fb5f5 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -381,8 +381,8 @@ foreach my $file (@ARGV) { ##if $file is a directory and it lacks a trailing slash, add one if ((-d $file)) { $file =~ s@([^/])$@$1/@; - } elsif (!(-f $file)) { - die "$P: file '${file}' not found\n"; + } elsif (!(stat $file)) { + die "$P: file '${file}' not found: $!\n"; } } if ($from_filename) {
If you pass scripts/get_maintainer.pl the name of a FIFO or other exciting object (/dev/stdin, for example), it would falsely print "file not found". Instead: stat the object rather than using -f so that we do not mind if the object is not a file; and print the errno value in the error message. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> CC: Thomas Huth <thuth@redhat.com> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Anthony PERARD <anthony.perard@citrix.com> --- v6: New patch in this version of the series --- scripts/get_maintainer.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)