nortti/sortix-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add FNM_CASEFOLD.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2024-06-28 11:19:37 +02:00
parent b0ed8333bb
commit 5857cd592b
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libc/fnmatch/fnmatch.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 Jonas 'Sortie' Termansen.
* Copyright (c) 2013, 2024 Jonas 'Sortie' Termansen.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -17,6 +17,7 @@
* Filename matching.
*/
#include <ctype.h>
#include <errno.h>
#include <fnmatch.h>
#include <stdbool.h>
@ -70,9 +71,13 @@ static bool matches_bracket_pattern(char c, const char* pattern, int flags)
bool matched_any = false;
while ( escaped || pattern[pi] != ']' )
{
if ( !escaped && pattern[pi] == '\\' )
unsigned char pc = pattern[pi];
unsigned char sc = c;
if ( flags & FNM_CASEFOLD )
pc = tolower(pc), sc = tolower(sc);
if ( !escaped && pc == '\\' )
escaped = true;
else if ( pattern[pi] == c )
else if ( pc == sc )
{
if ( negated )
return false;
@ -121,9 +126,13 @@ int fnmatch(const char* pattern, const char* string, int flags)
{
if ( !pattern[1] )
return errno = EINVAL, -1;
if ( pattern[1] == string[0] )
unsigned char pc = pattern[1];
unsigned char sc = string[0];
if ( flags & FNM_CASEFOLD )
pc = tolower(pc), sc = tolower(sc);
if ( pc == sc )
{
if ( (flags & FNM_PATHNAME) && string[0] == '/' )
if ( (flags & FNM_PATHNAME) && pc == '/' )
next_flags &= ~__FNM_NOT_LEADING;
return fnmatch(pattern + 2, string + 1, next_flags);
}
@ -137,9 +146,13 @@ int fnmatch(const char* pattern, const char* string, int flags)
return FNM_NOMATCH;
return fnmatch(pattern + 1, string + 1, next_flags);
}
else if ( pattern[0] == string[0] )
unsigned char pc = pattern[0];
unsigned char sc = string[0];
if ( flags & FNM_CASEFOLD )
pc = tolower(pc), sc = tolower(sc);
if ( pc == sc )
{
if ( (flags & FNM_PATHNAME) && string[0] == '/' )
if ( (flags & FNM_PATHNAME) && sc == '/' )
next_flags &= ~__FNM_NOT_LEADING;
return fnmatch(pattern + 1, string + 1, next_flags);
}

14
libc/include/fnmatch.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 Jonas 'Sortie' Termansen.
* Copyright (c) 2013, 2024 Jonas 'Sortie' Termansen.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -22,15 +22,19 @@
#include <sys/cdefs.h>
#ifdef __cplusplus
extern "C" {
#endif
#define FNM_NOMATCH 1
#define FNM_PATHNAME (1 << 0)
#define FNM_NOESCAPE (1 << 1)
#define FNM_PERIOD (1 << 2)
#if __USE_SORTIX || 202405L <= __USE_POSIX
#define FNM_CASEFOLD (1 << 3)
#define FNM_IGNORECASE FNM_CASEFOLD
#endif
#ifdef __cplusplus
extern "C" {
#endif
int fnmatch(const char*, const char*, int);