From 02e3bf2a532498c860f248a9bd81869dbf514404 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 1 Sep 2001 07:28:51 +0000 Subject: [PATCH] Use `""', not `<>' to #include non-system header files. (fnmatch_no_wildcards): Rewrite not to use function names, strcasecmp and strncasecmp as r-values. Unixware didn't have declarations. --- lib/exclude.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/exclude.c b/lib/exclude.c index 5a1e1ee6f5..7df879dd17 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -55,9 +55,9 @@ extern int errno; # endif #endif -#include -#include -#include +#include "exclude.h" +#include "fnmatch.h" +#include "xalloc.h" #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) @@ -119,12 +119,15 @@ static int fnmatch_no_wildcards (char const *pattern, char const *f, int options) { if (! (options & FNM_CASEFOLD)) - return (options & FNM_LEADING_DIR ? strcasecmp : strcmp) (pattern, f); + return ((options & FNM_LEADING_DIR) + ? strcasecmp (pattern, f) + : strcmp (pattern, f)); else { size_t patlen = strlen (pattern); - int r = ((options & FNM_LEADING_DIR ? strncasecmp : strncmp) - (pattern, f, patlen)); + int r = ((options & FNM_LEADING_DIR) + ? strncasecmp (pattern, f, patlen) + : strncmp (pattern, f, patlen)); if (! r) { r = f[patlen]; -- 2.30.2