A18-0-1: improve query logic

change_notes/2024-02-12-improve-a18-0-1.md

@@ -0,0 +1,2 @@
+`A18-0-1` - `CLibraryFacilitiesNotAccessedThroughCPPLibraryHeaders.ql`:
+    - Fix issue #7 - improve query logic to only match on exact standard library names (exclude local files with same names. Now excludes sys/header.h type headers as well from the results as those are not C standard libraries).

cpp/autosar/src/rules/A18-0-1/CLibraryFacilitiesNotAccessedThroughCPPLibraryHeaders.ql

@@ -28,12 +28,13 @@ where
    *    not use any of 'signal.h's facilities, for example.
    */
 
-  filename = i.getIncludedFile().getBaseName() and
+  filename = i.getIncludeText().substring(1, i.getIncludeText().length() - 1) and
   filename in [
       "assert.h", "ctype.h", "errno.h", "fenv.h", "float.h", "inttypes.h", "limits.h", "locale.h",
       "math.h", "setjmp.h", "signal.h", "stdarg.h", "stddef.h", "stdint.h", "stdio.h", "stdlib.h",
       "string.h", "time.h", "uchar.h", "wchar.h", "wctype.h"
-    ]
+    ] and
+  not exists(i.getIncludedFile().getRelativePath())
 select i,
   "C library \"" + filename + "\" is included instead of the corresponding C++ library <c" +
     filename.prefix(filename.length() - 2) + ">."

cpp/autosar/test/rules/A18-0-1/lib/assert.h

@@ -0,0 +1,4 @@
+#ifndef LIB_EXAMPLE_H_
+#define LIB_EXAMPLE_H_
+
+#endif

cpp/autosar/test/rules/A18-0-1/test.cpp

@@ -39,4 +39,6 @@
 #include <ctime>     // COMPLIANT
 #include <cuchar>    // COMPLIANT
 #include <cwchar>    // COMPLIANT
-#include <cwctype>   // COMPLIANT
+#include <cwctype>   // COMPLIANT
+
+#include "lib/assert.h" // COMPLIANT