[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a



The following commit has been merged in the master branch:
commit 582094509e88ef4f17dd8f705b550cba3ec8ba6c
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sun May 19 21:56:25 2013 +0200

    Allow verbatim \n in C strings
    
    For gfdl detection allow verbatim \n in string, particularly in cstring
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 80413c3..ebc8588 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -490,6 +490,7 @@ sub find_cruft {
                           [%\*\"\|]   |  # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
                           \"\s*,      |  # String array (e.g. "line1",\n"line2")
                           ,\s*\"      |  # String array (e.g. "line1"\n ,"line2"), seen in findutils
+                          \\n         |  # Verbatim \n in string array
                           \n[-\+!<>]  |  # diff/patch lines
                           \n\.\\\"    |  # man comments
                           <br\s*/?>      # (X)HTML line breaks
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
similarity index 82%
copy from t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c
copy to t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
index 23aa0af..5291fd3 100644
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
@@ -1,4 +1,4 @@
-/* false positive from findutils */
+/* false positive from some package */
   static const char *copy_para[]=
     {
       "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
@@ -7,7 +7,7 @@
       ,"Permission is granted to copy, distribute and/or modify this document"
       ,"under the terms of the GNU Free Documentation License, Version 1.3 or"
       ,"any later version published by the Free Software Foundation; with no"
-      ,"Invariant Sections, with no Front-Cover Texts, and with no Back-Cover"
+      ,"Invariant\nSections, with no\nFront-Cover Texts,\nand with no Back-Cover"
       ,"Texts.  A copy of the license is included in the ``GNU Free"
       ,"Documentation License'' file as part of this distribution."
       ""

-- 
Debian package checker


Reply to: