Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
This is similar to NO_FNMATCH but it uses wildmatch instead of compat/fnmatch. This is an intermediate step to let wildmatch be used as fnmatch replacement for wider audience before it replaces fnmatch completely and compat/fnmatch is removed. fnmatch in test-wildmatch is not impacted by this and is the only place that NO_FNMATCH or NO_FNMATCH_CASEFOLD remain active when USE_WILDMATCH is set. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
6f1a31f0aa
commit
cebcab189a
@ -106,7 +106,9 @@
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#include <signal.h>
|
||||
#ifndef USE_WILDMATCH
|
||||
#include <fnmatch.h>
|
||||
#endif
|
||||
#include <assert.h>
|
||||
#include <regex.h>
|
||||
#include <utime.h>
|
||||
@ -238,6 +240,17 @@ extern char *gitbasename(char *);
|
||||
|
||||
#include "compat/bswap.h"
|
||||
|
||||
#ifdef USE_WILDMATCH
|
||||
#include "wildmatch.h"
|
||||
#define FNM_PATHNAME WM_PATHNAME
|
||||
#define FNM_CASEFOLD WM_CASEFOLD
|
||||
#define FNM_NOMATCH WM_NOMATCH
|
||||
static inline int fnmatch(const char *pattern, const char *string, int flags)
|
||||
{
|
||||
return wildmatch(pattern, string, flags, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* General helper functions */
|
||||
extern void vreportf(const char *prefix, const char *err, va_list params);
|
||||
extern void vwritef(int fd, const char *prefix, const char *err, va_list params);
|
||||
|
||||
Reference in New Issue
Block a user