Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
case sensitivity: make the behaviour consistent (and default to no everywhere)
Baptiste Daroussin committed 5 months ago
commit 51d4a973bcf3713e45c766491aff0c5d0d61b4a0
parent 9778962
3 files changed +5 -6
modified libpkg/pkg_config.c
@@ -277,7 +277,7 @@ static struct config_entry c[] = {
	{
		PKG_BOOL,
		"CASE_SENSITIVE_MATCH",
-
		"YES",
+
		"NO",
	},
	{
		PKG_INT,
@@ -1571,7 +1571,7 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
	ctx.repo_accept_legacy_pkg = pkg_object_bool(pkg_config_get("REPO_ACCEPT_LEGACY_PKG"));
	ctx.no_version_for_deps = (getenv("PKG_NO_VERSION_FOR_DEPS") != NULL);
	ctx.track_linux_compat_shlibs = pkg_object_bool(pkg_config_get("TRACK_LINUX_COMPAT_SHLIBS"));
-
        pkgdb_set_case_sensitivity(pkg_object_bool(pkg_config_get("CASE_SENSITIVE_MATCH")));
+
        ctx.case_sensitive = pkg_object_bool(pkg_config_get("CASE_SENSITIVE_MATCH"));

	it = NULL;
	object = ucl_object_find_key(config, "PKG_ENV");
modified libpkg/pkgdb.c
@@ -1278,19 +1278,17 @@ pkgdb_transaction_rollback(struct pkgdb *db, const char *savepoint)
 * CASE_SENSITIVE_MATCH in pkg.conf and then possbily reset again in
 * pkg search et al according to command line flags */

-
static bool _case_sensitive_flag = true;
-

void
pkgdb_set_case_sensitivity(bool case_sensitive)
{
-
	_case_sensitive_flag = case_sensitive;
+
	ctx.case_sensitive = case_sensitive;
	return;
}

bool
pkgdb_case_sensitive(void)
{
-
	return (_case_sensitive_flag);
+
	return (ctx.case_sensitive);
}

typedef enum _sql_prstmt_index {
modified libpkg/private/pkg.h
@@ -152,6 +152,7 @@ struct pkg_ctx {
	bool ischrooted;
	bool no_version_for_deps;
	bool track_linux_compat_shlibs;
+
	bool case_sensitive;
};

extern struct pkg_ctx ctx;