projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Not so bad.
[apps/pfixtools.git]
/
postlicyd
/
filter.h
diff --git
a/postlicyd/filter.h
b/postlicyd/filter.h
index
abfb5af
..
c950402
100644
(file)
--- a/
postlicyd/filter.h
+++ b/
postlicyd/filter.h
@@
-58,7
+58,8
@@
ARRAY(filter_hook_t)
typedef struct filter_param_t {
filter_param_id_t type;
typedef struct filter_param_t {
filter_param_id_t type;
- char *value;
+ char *value;
+ ssize_t value_len;
} filter_param_t;
ARRAY(filter_param_t)
} filter_param_t;
ARRAY(filter_param_t)
@@
-70,10
+71,14
@@
typedef struct filter_t {
void *data;
A(filter_param_t) params;
void *data;
A(filter_param_t) params;
+
+ /* Loop checking flags.
+ */
+ int last_seen;
} filter_t;
ARRAY(filter_t)
} filter_t;
ARRAY(filter_t)
-#define FILTER_INIT { NULL, FTK_UNKNOWN, ARRAY_INIT, NULL, ARRAY_INIT }
+#define FILTER_INIT { NULL, FTK_UNKNOWN, ARRAY_INIT, NULL, ARRAY_INIT
, -1
}
#define CHECK_FILTER(Filter) \
assert(Filter != FTK_UNKNOWN && Filter != FTK_count \
&& "Unknown filter type")
#define CHECK_FILTER(Filter) \
assert(Filter != FTK_UNKNOWN && Filter != FTK_count \
&& "Unknown filter type")
@@
-147,6
+152,9
@@
static inline int filter_find_with_name(A(filter_t) *array, const char *name)
__attribute__((nonnull(1,2)))
bool filter_update_references(filter_t *filter, A(filter_t) *array);
__attribute__((nonnull(1,2)))
bool filter_update_references(filter_t *filter, A(filter_t) *array);
+__attribute__((nonnull(1)))
+bool filter_check_safety(A(filter_t) *array);
+
__attribute__((nonnull(1)))
static inline void filter_hook_wipe(filter_hook_t *hook)
{
__attribute__((nonnull(1)))
static inline void filter_hook_wipe(filter_hook_t *hook)
{
@@
-178,30
+186,30
@@
const filter_hook_t *filter_run(const filter_t *filter, const query_t *query);
case ATK_ ## Param: { \
char *next; \
(Dest) = strtol(param->value, &next, 10); \
case ATK_ ## Param: { \
char *next; \
(Dest) = strtol(param->value, &next, 10); \
- PARSE_CHECK(!*next, "invalid %s value %
s", atokens[ATK_ ## Param],
\
- param->value
);
\
+ PARSE_CHECK(!*next, "invalid %s value %
.*s", atokens[ATK_ ## Param],
\
+ param->value
_len, param->value);
\
} break
#define FILTER_PARAM_PARSE_BOOLEAN(Param, Dest) \
case ATK_ ## Param: { \
} break
#define FILTER_PARAM_PARSE_BOOLEAN(Param, Dest) \
case ATK_ ## Param: { \
- if (param->value
[0] == '1' && param->value[1] == '\0') {
\
+ if (param->value
_len == 1 && param->value[0] == '1') {
\
(Dest) = true; \
(Dest) = true; \
- } else if (param->value
[0] == '0' && param->value[1] == '\0') {
\
+ } else if (param->value
_len == 1 && param->value[0] == '0') {
\
(Dest) = false; \
(Dest) = false; \
- } else if (ascii_tolower(param->value[0]) == 't') { \
+ } else if (param->value_len == 4 \
+ && ascii_tolower(param->value[0]) == 't') { \
(Dest) = ascii_tolower(param->value[1]) == 'r' \
&& ascii_tolower(param->value[2]) == 'u' \
(Dest) = ascii_tolower(param->value[1]) == 'r' \
&& ascii_tolower(param->value[2]) == 'u' \
- && ascii_tolower(param->value[3]) == 'e'
\
-
&& !param->value[4];
\
-
} else if (ascii_tolower(param->value[0]) == 'f') {
\
+ && ascii_tolower(param->value[3]) == 'e'
;
\
+
} else if (param->value_len == 5
\
+
&& ascii_tolower(param->value[0]) == 'f') {
\
(Dest) = ascii_tolower(param->value[1]) == 'a' \
&& ascii_tolower(param->value[2]) == 'l' \
&& ascii_tolower(param->value[3]) == 's' \
(Dest) = ascii_tolower(param->value[1]) == 'a' \
&& ascii_tolower(param->value[2]) == 'l' \
&& ascii_tolower(param->value[3]) == 's' \
- && ascii_tolower(param->value[4]) == 'e' \
- && !param->value[5]; \
+ && ascii_tolower(param->value[4]) == 'e'; \
} else { \
} else { \
- PARSE_CHECK(false, "invalid %s value %
s", atokens[ATK_ ## Param],
\
- param->value
);
\
+ PARSE_CHECK(false, "invalid %s value %
.*s", atokens[ATK_ ## Param],
\
+ param->value
_len, param->value);
\
} \
} break
} \
} break