1 files changed, 21 insertions, 8 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 24a08363995a..4de3cc42fc50 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -55,6 +55,7 @@ my $spelling_file = "$D/spelling.txt";
 my $codespell = 0;
 my $codespellfile = "/usr/share/codespell/dictionary.txt";
 my $color = 1;
+my $allow_c99_comments = 1;
 
 sub help {
         my ($exitcode) = @_;
@@ -227,9 +228,9 @@ if ($^V && $^V lt $minimum_perl_version) {
         }
 }
 
+#if no filenames are given, push '-' to read patch from stdin
 if ($#ARGV < 0) {
-        print "$P: no input files\n";
-        exit(1);
+        push(@ARGV, '-');
 }
 
 sub hash_save_array_words {
@@ -1144,6 +1145,11 @@ sub sanitise_line {
                 $res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
         }
 
+        if ($allow_c99_comments && $res =~ m@(//.*$)@) {
+                my $match = $1;
+                $res =~ s/\Q$match\E/"$;" x length($match)/e;
+        }
+
         return $res;
 }
 
@@ -2063,6 +2069,7 @@ sub process {
         my $is_patch = 0;
         my $in_header_lines = $file ? 0 : 1;
         my $in_commit_log = 0;          #Scanning lines before patch
+        my $has_commit_log = 0;         #Encountered lines before patch
        my $commit_log_possible_stack_dump = 0;
         my $commit_log_long_line = 0;
         my $commit_log_has_diff = 0;
@@ -2453,9 +2460,9 @@ sub process {
 
 # Check for git id commit length and improperly formed commit descriptions
                 if ($in_commit_log && !$commit_log_possible_stack_dump &&
-                    $line !~ /^\s*(?:Link|Patchwork|http|BugLink):/i &&
+                    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink):/i &&
                     ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
-                     ($line =~ /\b[0-9a-f]{12,40}\b/i &&
+                     ($line =~ /(?:\s|^)[0-9a-f]{12,40}(?:[\s"'\(\[]|$)/i &&
                       $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i &&
                       $line !~ /\bfixes:\s*[0-9a-f]{12,40}/i))) {
                         my $init_char = "c";
@@ -2560,6 +2567,7 @@ sub process {
                       $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
                         $in_header_lines = 0;
                         $in_commit_log = 1;
+                        $has_commit_log = 1;
                 }
 
 # Check if there is UTF-8 in a commit log when a mail header has explicitly
@@ -2763,6 +2771,10 @@ sub process {
                                  $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) {
                                 $msg_type = "";
 
+                        # EFI_GUID is another special case
+                        } elsif ($line =~ /^\+.*\bEFI_GUID\s*\(/) {
+                                $msg_type = "";
+
                         # Otherwise set the alternate message types
 
                         # a comment starts before $max_line_length
@@ -3337,7 +3349,7 @@ sub process {
                 next if ($line =~ /^[^\+]/);
 
 # check for declarations of signed or unsigned without int
-                while ($line =~ m{($Declare)\s*(?!char\b|short\b|int\b|long\b)\s*($Ident)?\s*[=,;\[\)\(]}g) {
+                while ($line =~ m{\b($Declare)\s*(?!char\b|short\b|int\b|long\b)\s*($Ident)?\s*[=,;\[\)\(]}g) {
                         my $type = $1;
                         my $var = $2;
                         $var = "" if (!defined $var);
@@ -5722,8 +5734,9 @@ sub process {
                         }
                 }
 
-# check for #defines like: 1 << <digit> that could be BIT(digit)
-                if ($line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) {
+# check for #defines like: 1 << <digit> that could be BIT(digit), it is not exported to uapi
+                if ($realfile !~ m@^include/uapi/@ &&
+                    $line =~ /#\s*define\s+\w+\s+\(?\s*1\s*([ulUL]*)\s*\<\<\s*(?:\d+|$Ident)\s*\)?/) {
                         my $ull = "";
                         $ull = "_ULL" if (defined($1) && $1 =~ /ll/i);
                         if (CHK("BIT_MACRO",
@@ -6044,7 +6057,7 @@ sub process {
                 ERROR("NOT_UNIFIED_DIFF",
                       "Does not appear to be a unified-diff format patch\n");
         }
-        if ($is_patch && $filename ne '-' && $chk_signoff && $signoff == 0) {
+        if ($is_patch && $has_commit_log && $chk_signoff && $signoff == 0) {
                 ERROR("MISSING_SIGN_OFF",
                       "Missing Signed-off-by: line(s)\n");
         }