From: Yury Norov <ynorov@caviumnetworks.com>
To: linux-kernel@vger.kernel.org, Andy Whitcroft <apw@canonical.com>,
        Joe Perches <joe@perches.com>
Cc: Yury Norov <ynorov@caviumnetworks.com>
Subject: [PATCH v2] checkpatch: suppress false long-line warining
Date: Tue,  5 Dec 2017 19:34:03 +0300
Message-Id: <20171205163403.32470-1-ynorov@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2017 16:34:31.8062 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 2771f0ed-9b50-4ccd-fe65-08d53bfe11a8
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0701MB3834
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1111
Lines: 37

For DOS-formatted patches, extra ^M symbol at the end of line
increases overall line length by 1.

It triggers unneeded warning if line is exactly 80 chars length.
This patch fixes it.

Discovered in discussion to this patch:
https://lkml.org/lkml/2017/11/25/24

v2: simplify as suggested by Joe Perches.

Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
CC: Joe Perches <joe@perches.com>
---
 scripts/checkpatch.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 040aa79e1d9d..e7b941b8e6d7 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2732,6 +2732,13 @@ sub process {
 
 #trailing whitespace
 		if ($line =~ /^\+.*\015/) {
+			# If DOS line detected, additional ^M symbol at the end
+			# of line increases line length, so remove that ^M and
+			# decrease $length to avoid false positives when
+			# checking length of the line.
+			$line =~ s/[\s\015]+$//;
+			$length--;
+
 			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
 			if (ERROR("DOS_LINE_ENDINGS",
 				  "DOS line endings\n" . $herevet) &&
-- 
2.11.0