Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fbd75fd authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

get_maintainer: allow option --mpath <directory> to read all files in <directory>

There is an external use case for multiple private MAINTAINER style files
in a separate directory.  Allow it.

--mpath has a default of "./MAINTAINERS".

The value entered can be either a file or a directory.

The behaviors are now:

--mpath <file>          Read only the specific file as <MAINTAINER_TYPE> file
--mpath <directory>     Read all files in <directory> as <MAINTAINER_TYPE> files
--mpath <directory> --find-maintainer-files
                        Recurse through <directory> and read all files named MAINTAINERS

Link: http://lkml.kernel.org/r/991b2f20112d53863cd79e61d908f1d26d3e1971.camel@perches.com


Signed-off-by: default avatarJoe Perches <joe@perches.com>
Tested-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f0baf95
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -396,7 +396,12 @@ sub read_all_maintainer_files {

    if (-d $path) {
	$path .= '/' if ($path !~ m@/$@);
	if ($path eq "${lk_path}MAINTAINERS/") {
	if ($find_maintainer_files) {
	    find( { wanted => \&find_is_maintainer_file,
		    preprocess => \&find_ignore_git,
		    no_chdir => 1,
		}, "$path");
	} else {
	    opendir(DIR, "$path") or die $!;
	    my @files = readdir(DIR);
	    closedir(DIR);
@@ -404,12 +409,6 @@ sub read_all_maintainer_files {
		push(@mfiles, "$path$file") if ($file !~ /^\./);
	    }
	}
	if ($find_maintainer_files) {
	    find( { wanted => \&find_is_maintainer_file,
		    preprocess => \&find_ignore_git,
		    no_chdir => 1,
		}, "$path");
	}
    } elsif (-f "$path") {
	push(@mfiles, "$path");
    } else {