diff options
| author | Pierre Pronchery <khorben@FreeBSD.org> | 2026-06-26 17:34:10 +0000 |
|---|---|---|
| committer | Pierre Pronchery <khorben@FreeBSD.org> | 2026-06-29 05:21:50 +0000 |
| commit | 0cf7106da9f36671ef62142c27de98eee9d874d6 (patch) | |
| tree | 48090361499358411adb1d0bb16ca768e7c226a1 /libpkgconf | |
| parent | b0fc1b7a2fe8fcb18ee407227591bf25a86ffbaf (diff) | |
Vendor import of pkgconf 2.9.93vendor/pkgconf/2.9.93vendor/pkgconf
Obtained from https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-2.9.93.tar.gz
SHA1: 6bcbedc97081e17ea58e0164adea2ab827acfe23 -
SHA256: b9632d0d91321f56645de720fd8cd3584b0d0ca8ff13a3d9d5285888869fcc98 -
SHA512: e014096f5486b7cdfa8c6410992b9143b63c7ef0ba540c7cad09923867c3924b951c1dfbd9a85f6d786b0deb30be1b7284f67317f4b261b6e0eca70b20ace1af -
One test folder in tests/lib1 had to be removed to avoid UTF-8 filenames
in the tree. (Breaks `make create-source-packages`)
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57890
Diffstat (limited to 'libpkgconf')
| -rw-r--r-- | libpkgconf/libpkgconf.h | 4 | ||||
| -rw-r--r-- | libpkgconf/license.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index 22b6c97a94f8..de646a2a54c5 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -71,8 +71,8 @@ typedef struct pkgconf_license_ pkgconf_license_t; #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \ for ((value) = (tail); (value) != NULL; (value) = (value)->prev) -#define LIBPKGCONF_VERSION 20992 -#define LIBPKGCONF_VERSION_STR "2.9.92" +#define LIBPKGCONF_VERSION 20993 +#define LIBPKGCONF_VERSION_STR "2.9.93" struct pkgconf_queue_ { pkgconf_node_t iter; diff --git a/libpkgconf/license.c b/libpkgconf/license.c index e9bef533584f..7c7cb21802f0 100644 --- a/libpkgconf/license.c +++ b/libpkgconf/license.c @@ -228,15 +228,15 @@ pkgconf_license_evaluate_str(pkgconf_client_t *client, pkgconf_list_t *license_l } pkgconf_license_insert(client, license_list, PKGCONF_LICENSE_BRACKET_CLOSE, ")"); } - else if (!strncasecmp(cur_word, "and", 3)) + else if (!strcasecmp(cur_word, "and")) { pkgconf_license_insert(client, license_list, PKGCONF_LICENSE_AND, "AND"); } - else if (!strncasecmp(cur_word, "or", 2)) + else if (!strcasecmp(cur_word, "or")) { pkgconf_license_insert(client, license_list, PKGCONF_LICENSE_OR, "OR"); } - else if (!strncasecmp(cur_word, "with", 2)) + else if (!strcasecmp(cur_word, "with")) { pkgconf_license_insert(client, license_list, PKGCONF_LICENSE_WITH, "WITH"); } @@ -316,7 +316,7 @@ pkgconf_license_render(pkgconf_client_t *client, const pkgconf_list_t *list, pkg frag_string = PKGCONF_BUFFER_FROM_STR(license->data); pkgconf_buffer_append(buf, pkgconf_buffer_str_or_empty(frag_string)); - if (license->type == PKGCONF_LICENSE_BRACKET_OPEN || (node->next != NULL && ((const pkgconf_license_t *)node->next)->type == PKGCONF_LICENSE_BRACKET_CLOSE)) + if (license->type == PKGCONF_LICENSE_BRACKET_OPEN || (node->next != NULL && ((const pkgconf_license_t *)node->next->data)->type == PKGCONF_LICENSE_BRACKET_CLOSE)) { is_delim = false; } |