fix: rename cbor.c/h to lcbor.c/h, update CMakeLists.txt and migrate to current API

- Rename src/cbor.c -> src/lcbor.c and src/cbor.h -> src/lcbor.h to avoid
  collision with system libcbor headers
- Update CMakeLists.txt references to use new filenames
- Update #include directives in parser_cbor.c and printer_cbor.c
- Migrate printer_cbor.c to current libyang API (LYD_PRINT_SIBLINGS,
  plugins_internal.h, simplified anydata handling)
- Address PR review feedback in parser_cbor.c

Author: Meher C

CMakeLists.txt

@@ -257,7 +257,6 @@ option(ENABLE_YANGLINT_INTERACTIVE "Enable interactive CLI yanglint" ON)
 option(ENABLE_TOOLS "Build binary tools 'yanglint' and 'yangre'" ON)
 option(ENABLE_COMMON_TARGETS "Define common custom target names such as 'doc' or 'uninstall', may cause conflicts when using add_subdirectory() to build this project" ON)
 option(BUILD_SHARED_LIBS "By default, shared libs are enabled. Turn off for a static build." ON)
-option(ENABLE_CBOR_SUPPORT "Enable CBOR support with libcbor" ON)
 set(YANG_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/yang/modules/libyang" CACHE STRING "Directory where to copy the YANG modules to")
 
 if(ENABLE_INTERNAL_DOCS)
@@ -325,40 +324,14 @@ if(ENABLE_COVERAGE)
     gen_coverage_enable(${ENABLE_TESTS})
 endif()
 
-if(ENABLE_CBOR_SUPPORT)
-    find_package(PkgConfig)
-    if(PKG_CONFIG_FOUND)
-        pkg_check_modules(LIBCBOR REQUIRED libcbor)
-        if(LIBCBOR_FOUND)
-            message(STATUS "libcbor found, enabling CBOR support")
-            add_definitions(-DENABLE_CBOR_SUPPORT)
-            include_directories(${LIBCBOR_INCLUDE_DIRS})
-            # Add CBOR parser files to the library sources
-            list(APPEND libsrc src/parser_cbor.c src/lcbor.c src/printer_cbor.c)
-            list(APPEND headers src/lcbor.h)
-            # Add CBOR files to format sources
-            list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c src/printer_cbor.c)
-        else()
-            message(FATAL_ERROR "libcbor not found! Please install libcbor development package or disable CBOR support with -DENABLE_CBOR_SUPPORT=OFF")
-        endif()
-    else()
-        # Fallback to find_path and find_library if pkg-config is not available
-        find_path(LIBCBOR_INCLUDE_DIR cbor.h)
-        find_library(LIBCBOR_LIBRARY cbor)
-        if(LIBCBOR_INCLUDE_DIR AND LIBCBOR_LIBRARY)
-            message(STATUS "libcbor found via find_path/find_library, enabling CBOR support")
-            add_definitions(-DENABLE_CBOR_SUPPORT)
-            include_directories(${LIBCBOR_INCLUDE_DIR})
-            set(LIBCBOR_LIBRARIES ${LIBCBOR_LIBRARY})
-            # Add CBOR parser files to the library sources
-            list(APPEND libsrc src/parser_cbor.c src/lcbor.c src/printer_cbor.c)
-            list(APPEND headers src/lcbor.h)
-            # Add CBOR files to format sources
-            list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c src/printer_cbor.c)
-        else()
-            message(FATAL_ERROR "libcbor not found! Please install libcbor development package or disable CBOR support with -DENABLE_CBOR_SUPPORT=OFF")
-        endif()
-    endif()
+find_package(CBOR)
+if(CBOR_FOUND)
+    set(CBOR_SUPPORT ON)
+    list(APPEND libsrc src/parser_cbor.c src/lcbor.c src/printer_cbor.c)
+    list(APPEND headers src/lcbor.h)
+    list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c src/printer_cbor.c)
+else()
+    message(STATUS "libcbor not found, CBOR support disabled")
 endif()
 
 if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
@@ -465,9 +438,15 @@ find_package(PCRE2 10.21 REQUIRED)
 include_directories(${PCRE2_INCLUDE_DIRS})
 target_link_libraries(yang ${PCRE2_LIBRARIES})
 
-# link libcbor if CBOR support is enabled
-if(ENABLE_CBOR_SUPPORT)
-    target_link_libraries(yang ${LIBCBOR_LIBRARIES})
+# link libcbor if found
+if(CBOR_FOUND)
+    if(TARGET yangobj)
+        target_compile_definitions(yangobj PRIVATE ENABLE_CBOR_SUPPORT)
+        target_include_directories(yangobj PRIVATE ${CBOR_INCLUDE_DIR})
+    endif()
+    target_compile_definitions(yang PRIVATE ENABLE_CBOR_SUPPORT)
+    target_include_directories(yang PRIVATE ${CBOR_INCLUDE_DIR})
+    target_link_libraries(yang ${CBOR_LIBRARY})
 endif()
 
 # XXHash include and library

CMakeModules/FindCBOR.cmake

@@ -0,0 +1,37 @@
+# Try to find libcbor
+# Once done this will define
+#
+# Read-Only variables:
+#  CBOR_FOUND - system has libcbor
+#  CBOR_INCLUDE_DIR - the libcbor include directory
+#  CBOR_LIBRARY - Link these to use libcbor
+
+find_path(CBOR_INCLUDE_DIR
+    NAMES
+        cbor.h
+    PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+        /sw/include
+        ${CMAKE_INCLUDE_PATH}
+        ${CMAKE_INSTALL_PREFIX}/include
+)
+
+find_library(CBOR_LIBRARY
+    NAMES
+        cbor
+        libcbor
+    PATHS
+        /usr/lib
+        /usr/lib64
+        /usr/local/lib
+        /usr/local/lib64
+        /opt/local/lib
+        /sw/lib
+        ${CMAKE_LIBRARY_PATH}
+        ${CMAKE_INSTALL_PREFIX}/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CBOR FOUND_VAR CBOR_FOUND REQUIRED_VARS CBOR_INCLUDE_DIR CBOR_LIBRARY)

src/lcbor.c

@@ -1,5 +1,5 @@
 /**
- * @file lcbor.h
+ * @file lcbor.c
  * @author MeherRushi <meherrrushi2@gmail.com>
  * @brief CBOR data parser for libyang (abstraction over libcbor)
  *
@@ -12,8 +12,6 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#ifdef ENABLE_CBOR_SUPPORT
-
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -55,8 +53,10 @@ lycbor_token2str(enum cbor_type cbortype)
  */
 void lycbor_ctx_free(struct lycbor_ctx *cborctx)
 {
-    if (cborctx)
-    {
+    if (cborctx) {
+        if (cborctx->cbor_data) {
+            cbor_decref(&cborctx->cbor_data);
+        }
         free(cborctx);
     }
 }
@@ -108,24 +108,22 @@ lycbor_ctx_new(const struct ly_ctx *ctx, struct ly_in *in, struct lycbor_ctx **c
     cborctx->format = format;
 
     /* load and parse CBOR data */
-    cborctx->cbor_data = cbor_load(in->current, in->length, &result);
+    cborctx->cbor_data = cbor_load((cbor_data)in->current, in->length, &result);
     if (!cborctx->cbor_data) {
-        LOGVAL(ctx, LYVE_SYNTAX, "Failed to parse CBOR data.");
+        LOGVAL(ctx, NULL, LYVE_SYNTAX, "Failed to parse CBOR data.");
         free(cborctx);
         return LY_EVALID;
     }
     if (result.error.code != CBOR_ERR_NONE) {
-        LOGVAL(ctx, LYVE_SYNTAX, "CBOR parsing error (code %d).", result.error.code);
+        LOGVAL(ctx, NULL, LYVE_SYNTAX, "CBOR parsing error (code %d).", result.error.code);
         cbor_decref(&cborctx->cbor_data);
         free(cborctx);
         return LY_EVALID;
     }
 
     /* input line logging */
-    ly_log_location(NULL, NULL, NULL, in);
+    ly_log_location(NULL, NULL, in);
 
     *cborctx_p = cborctx;
     return ret;
 }
-
-#endif /* ENABLE_CBOR_SUPPORT */

src/lcbor.h

@@ -12,10 +12,8 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
-#ifndef LY_LCBOR_H_
-#define LY_LCBOR_H_
-
-#ifdef ENABLE_CBOR_SUPPORT
+#ifndef LY_CBOR_H_
+#define LY_CBOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -53,6 +51,14 @@ struct lycbor_ctx {
     } backup;
 };
 
+/**
+ * @brief Get a human-readable name for a CBOR type.
+ *
+ * @param[in] cbortype CBOR type.
+ * @return String representation of the CBOR type.
+ */
+const char *lycbor_token2str(enum cbor_type cbortype);
+
 /**
  * @brief Create new CBOR context for parsing.
  *
@@ -72,6 +78,4 @@ lycbor_ctx_new(const struct ly_ctx *ctx, struct ly_in *in, struct lycbor_ctx **c
 void
 lycbor_ctx_free(struct lycbor_ctx *cborctx);
 
-#endif /* ENABLE_CBOR_SUPPORT */
-
-#endif /* LY_LCBOR_H_ */
+#endif /* LY_CBOR_H_ */