option(WITH_LEGACY_BINDING_VDYN "Includes the legacy Binding API version dynamic" OFF)
option(WITH_DYNAMIC_BINDING "Allow to load dynamic bindings (shared libraries)" ON)
option(WITH_LIBMICROHTTPD "Activates HTTP server through LIBMICROHTTPD" ON)
+option(WITH_FNMATCH "Use fnmatch where possible" ON)
############################################################################
# legacy options
-DWITH_FDEV_EPOLL=$<NOT:$<BOOL:${WITH_SYSTEMD}>>
-DWITH_LIBMICROHTTPD=$<BOOL:${WITH_LIBMICROHTTPD}>
-DWITH_MONITORING=$<BOOL:${WITH_MONITORING}>
+ -DWITH_FNMATCH=$<BOOL:${WITH_FNMATCH}>
)
if (WITH_SUPERVISOR)
fdev.c
fdev-epoll.c
fdev-systemd.c
+ globmatch.c
globset.c
jobs.c
locale-root.c
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include <fnmatch.h>
#include <json-c/json.h>
#include "afb-auth.h"
#include "afb-export.h"
#include "afb-xreq.h"
-#include "verbose.h"
+#include "globmatch.h"
#include "sig-monitor.h"
+#include "verbose.h"
/*
* Description of a binding
return json_object_object_get_ex(config, name_of_optid(optid), NULL);
}
+__attribute__((unused))
static int config_has_bool(struct json_object *config, int optid)
{
struct json_object *x;
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <fnmatch.h>
#include <ctype.h>
#include <json-c/json.h>
#include "afb-evt.h"
#include "afb-api.h"
#include "afb-msg-json.h"
+
+#include "globmatch.h"
#include "verbose.h"
-#include <fnmatch.h>
#define MATCH(pattern,string) (\
pattern \
? !fnmatch((pattern),(string),FNM_CASEFOLD|FNM_EXTMATCH|FNM_PERIOD) \
--- /dev/null
+/*
+ * Copyright (C) 2018, 2019 "IoT.bzh"
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _GNU_SOURCE
+
+#include <ctype.h>
+
+#include "globmatch.h"
+
+/**
+ * Matches whether the string 'str' matches the pattern 'pat'
+ * and returns its matching score.
+ *
+ * @param pat the glob pattern
+ * @param str the string to match
+ * @return 0 if no match or number representing the matching score
+ */
+static unsigned match(const char *pat, const char *str, int flags)
+{
+ unsigned r, rs, rr;
+ char c, x;
+ int eq;
+
+ /* scan the prefix without glob */
+ r = 1;
+ while ((c = *pat++) != GLOB) {
+ x = *str++;
+ eq = (flags & FNM_CASEFOLD) ? (tolower(c) == tolower(x)) : (c == x);
+ if (!eq)
+ return 0; /* no match */
+ if (!c)
+ return r; /* match up to end */
+ r++;
+ }
+
+ /* glob found */
+ c = *pat++;
+ if (!c) {
+ /* not followed by pattern */
+ if (flags & FNM_PATHNAME) {
+ while(*str)
+ if (*str++ == '/')
+ return 0;
+ }
+ return r;
+ }
+
+ /* evaluate the best score for following pattern */
+ rs = 0;
+ while (*str) {
+ x = *str++;
+ eq = (flags & FNM_CASEFOLD) ? (tolower(c) == tolower(x)) : (c == x);
+ if (eq) {
+ /* first char matches, check remaining string */
+ rr = match(pat, str, flags);
+ if (rr > rs)
+ rs = rr;
+ } else if ((flags & FNM_PATHNAME) && x == '/')
+ return 0;
+ }
+
+ /* best score or not match if rs == 0 */
+ return rs ? rs + r : 0;
+}
+
+/**
+ * Matches whether the string 'str' matches the pattern 'pat'
+ * and returns its matching score.
+ *
+ * @param pat the glob pattern
+ * @param str the string to match
+ * @return 0 if no match or number representing the matching score
+ */
+unsigned globmatch(const char *pat, const char *str)
+{
+ return match(pat, str, 0);
+}
+
+/**
+ * Matches whether the string 'str' matches the pattern 'pat'
+ * and returns its matching score.
+ *
+ * @param pat the glob pattern
+ * @param str the string to match
+ * @return 0 if no match or number representing the matching score
+ */
+unsigned globmatchi(const char *pat, const char *str)
+{
+ return match(pat, str, FNM_CASEFOLD);
+}
+
+#if !WITH_FNMATCH
+int fnmatch(const char *pattern, const char *string, int flags)
+{
+ return !match(pattern, string, flags);
+}
+#endif
--- /dev/null
+/*
+ * Copyright (C) 2018, 2019 "IoT.bzh"
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#define GLOB '*'
+
+extern unsigned globmatch(const char *pat, const char *str);
+extern unsigned globmatchi(const char *pat, const char *str);
+
+#if WITH_FNMATCH
+
+#include <fnmatch.h>
+
+#else
+
+#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
+#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
+#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
+#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
+#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */
+#define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */
+#define FNM_EXTMATCH (1 << 5) /* Use ksh-like extended matching. */
+#define FNM_NOMATCH 1
+
+extern int fnmatch(const char *pattern, const char *string, int flags);
+
+#endif
#include <errno.h>
#include "globset.h"
-
-#define GLOB '*'
+#include "globmatch.h"
/*************************************************************************
* internal types
unsigned count;
};
-/**
- * Matches whether the string 'str' matches the pattern 'pat'
- * and returns its matching score.
- *
- * @param pat the glob pattern
- * @param str the string to match
- * @return 0 if no match or number representing the matching score
- */
-static unsigned match(const char *pat, const char *str)
-{
- unsigned r, rs, rr;
- char c;
-
- /* scan the prefix without glob */
- r = 1;
- while ((c = *pat++) != GLOB) {
- if (c != *str++)
- return 0; /* no match */
- if (!c)
- return r; /* match up to end */
- r++;
- }
-
- /* glob found */
- c = *pat++;
- if (!c)
- return r; /* not followed by pattern */
-
- /* evaluate the best score for following pattern */
- rs = 0;
- while (*str) {
- if (*str++ == c) {
- /* first char matches, check remaining string */
- rr = match(pat, str);
- if (rr > rs)
- rs = rr;
- }
- }
-
- /* best score or not match if rs == 0 */
- return rs ? rs + r : 0;
-}
-
/**
* Normalize the string 'from' to the string 'to' and computes the hash code.
* The normalization translates upper characters to lower characters.
return ph;
}
-
-
-
-
-
-
-
/**
* Allocates a new set of handlers
*
s = 0;
iph = set->globs;
while(iph) {
- g = match(iph->handler.pattern, txt);
+ g = globmatch(iph->handler.pattern, txt);
if (g > s) {
s = g;
ph = iph;
Code Review / src / app-framework-binder.git / commitdiff