Commit 9624b8d6 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

checkpatch: add a --fix-inplace option

Add the ability to fix and overwrite existing files/patches instead of
creating a new file "<filename>.EXPERIMENTAL-checkpatch-fixes".
Suggested-by: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c34c09a8
...@@ -29,6 +29,7 @@ my $mailback = 0; ...@@ -29,6 +29,7 @@ my $mailback = 0;
my $summary_file = 0; my $summary_file = 0;
my $show_types = 0; my $show_types = 0;
my $fix = 0; my $fix = 0;
my $fix_inplace = 0;
my $root; my $root;
my %debug; my %debug;
my %camelcase = (); my %camelcase = ();
...@@ -76,6 +77,9 @@ Options: ...@@ -76,6 +77,9 @@ Options:
"<inputfile>.EXPERIMENTAL-checkpatch-fixes" "<inputfile>.EXPERIMENTAL-checkpatch-fixes"
with potential errors corrected to the preferred with potential errors corrected to the preferred
checkpatch style checkpatch style
--fix-inplace EXPERIMENTAL - may create horrible results
Is the same as --fix, but overwrites the input
file. It's your fault if there's no backup or git
--ignore-perl-version override checking of perl version. expect --ignore-perl-version override checking of perl version. expect
runtime errors. runtime errors.
-h, --help, --version display this help and exit -h, --help, --version display this help and exit
...@@ -131,6 +135,7 @@ GetOptions( ...@@ -131,6 +135,7 @@ GetOptions(
'mailback!' => \$mailback, 'mailback!' => \$mailback,
'summary-file!' => \$summary_file, 'summary-file!' => \$summary_file,
'fix!' => \$fix, 'fix!' => \$fix,
'fix-inplace!' => \$fix_inplace,
'ignore-perl-version!' => \$ignore_perl_version, 'ignore-perl-version!' => \$ignore_perl_version,
'debug=s' => \%debug, 'debug=s' => \%debug,
'test-only=s' => \$tst_only, 'test-only=s' => \$tst_only,
...@@ -140,6 +145,8 @@ GetOptions( ...@@ -140,6 +145,8 @@ GetOptions(
help(0) if ($help); help(0) if ($help);
$fix = 1 if ($fix_inplace);
my $exit = 0; my $exit = 0;
if ($^V && $^V lt $minimum_perl_version) { if ($^V && $^V lt $minimum_perl_version) {
...@@ -4388,7 +4395,8 @@ sub process { ...@@ -4388,7 +4395,8 @@ sub process {
hash_show_words(\%ignore_type, "Ignored"); hash_show_words(\%ignore_type, "Ignored");
if ($clean == 0 && $fix && "@rawlines" ne "@fixed") { if ($clean == 0 && $fix && "@rawlines" ne "@fixed") {
my $newfile = $filename . ".EXPERIMENTAL-checkpatch-fixes"; my $newfile = $filename;
$newfile .= ".EXPERIMENTAL-checkpatch-fixes" if (!$fix_inplace);
my $linecount = 0; my $linecount = 0;
my $f; my $f;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment