Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › a275d7a
query: Respect case sensitivity when globbing
Baptiste Daroussin committed 3 years ago
commit a275d7a63dcfa01c9bbabbc9539e2378fab88b9b
parent 9bf1a55
1 file changed +24 -10
modified libpkg/pkgdb_query.c
@@ -108,16 +108,30 @@ pkgdb_get_pattern_query(const char *pattern, match_t match)
		}

		break;

	case MATCH_GLOB:
- 
		if (checkuid == NULL) {
- 
			if (checkorigin == NULL)
- 
				comp = " WHERE (p.name GLOB ?1 "
- 
					"OR p.name || '-' || version GLOB ?1)";
- 
			else if (checkflavor == NULL)
- 
				comp = " WHERE (origin GLOB ?1 OR categories.name || substr(origin, instr(origin, '/')) GLOB ?1)";
- 
			else
- 
				comp = "WHERE (categories.name || substr(origin, instr(origin, '/')) || '@' || flavor GLOB ?1)";
- 
		} else {
- 
			comp = " WHERE p.name GLOB ?1";
+ 
		if (pkgdb_case_sensitive()) {
+ 
			if (checkuid == NULL) {
+ 
				if (checkorigin == NULL)
+ 
					comp = " WHERE (p.name GLOB ?1 "
+ 
						"OR p.name || '-' || version GLOB ?1)";
+ 
				else if (checkflavor == NULL)
+ 
					comp = " WHERE (origin GLOB ?1 OR categories.name || substr(origin, instr(origin, '/')) GLOB ?1)";
+ 
				else
+ 
					comp = "WHERE (categories.name || substr(origin, instr(origin, '/')) || '@' || flavor GLOB ?1)";
+ 
			} else {
+ 
				comp = " WHERE p.name GLOB ?1";
+ 
			}
+ 
		} else  {
+ 
			if (checkuid == NULL) {
+ 
				if (checkorigin == NULL)
+ 
					comp = " WHERE (p.name GLOB ?1 COLLATE NOCASE "
+ 
						"OR p.name || '-' || version GLOB ?1 COLLATE NOCASE)";
+ 
				else if (checkflavor == NULL)
+ 
					comp = " WHERE (origin GLOB ?1 COLLATE NOCASE OR categories.name || substr(origin, instr(origin, '/')) GLOB ?1 COLLATE NOCASE)";
+ 
				else
+ 
					comp = "WHERE (categories.name || substr(origin, instr(origin, '/')) || '@' || flavor GLOB ?1 COLLATE NOCASE)";
+ 
			} else {
+ 
				comp = " WHERE p.name GLOB ?1 COLLATE NOCASE";
+ 
			}

		}

		break;

	case MATCH_REGEX: