Skip to content

Commit

Permalink
scripts/get_maintainer.pl: add ability to read from STDIN
Browse files Browse the repository at this point in the history
Doesn't need or accept '-' as a trailing option to read stdin.  Doesn't
print usage() after bad options.  Adds --usage as command line equivalent
of --help

Suggested-by: Borislav Petkov <[email protected]>
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
JoePerches authored and torvalds committed Mar 6, 2010
1 parent f11e9a1 commit 64f77f3
Showing 1 changed file with 15 additions and 11 deletions.
26 changes: 15 additions & 11 deletions scripts/get_maintainer.pl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
'fe|file-emails!' => \$file_emails,
'f|file' => \$from_filename,
'v|version' => \$version,
'h|help' => \$help,
'h|help|usage' => \$help,
)) {
die "$P: invalid argument - use --help if necessary\n";
}
Expand All @@ -141,9 +141,9 @@
exit 0;
}

if ($#ARGV < 0) {
usage();
die "$P: argument missing: patchfile or -f file please\n";
if (-t STDIN && !@ARGV) {
# We're talking to a terminal, but have no command line arguments.
die "$P: missing patchfile or -f file - use --help if necessary\n";
}

if ($output_separator ne ", ") {
Expand All @@ -165,15 +165,13 @@
} else {
my $selections = $email + $scm + $status + $subsystem + $web;
if ($selections == 0) {
usage();
die "$P: Missing required option: email, scm, status, subsystem or web\n";
}
}

if ($email &&
($email_maintainer + $email_list + $email_subscriber_list +
$email_git + $email_git_penguin_chiefs + $email_git_blame) == 0) {
usage();
die "$P: Please select at least 1 email option\n";
}

Expand Down Expand Up @@ -248,12 +246,18 @@
my @keyword_tvi = ();
my @file_emails = ();

if (!@ARGV) {
push(@ARGV, "&STDIN");
}

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";
if ($file ne "&STDIN") {
##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";
}
}
if ($from_filename) {
push(@files, $file);
Expand Down

0 comments on commit 64f77f3

Please sign in to comment.