* This file is part of GNUnet
* Copyright (C) 2012-2017 GNUnet e.V.
*
- * GNUnet is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 3, or (at your
- * option) any later version.
+ * GNUnet is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
*
* GNUnet is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Affero General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with GNUnet; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file src/regex/regex_test_lib.c
{
switch (size)
{
- case 2:
- case 8:
+ case 2:
+ case 8:
+ return c - '0';
+ break;
+
+ case 16:
+ if ((c >= '0') && (c <= '9') )
return c - '0';
- break;
- case 16:
- if (c >= '0' && c <= '9')
- return c - '0';
- else if (c >= 'A' && c <= 'F')
- return c - 'A' + 10;
- else if (c >= 'a' && c <= 'f')
- return c - 'a' + 10;
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot convert char %c in base %u\n",
- c, size);
- GNUNET_assert (0);
- }
- break;
- default:
+ else if ((c >= 'A') && (c <= 'F') )
+ return c - 'A' + 10;
+ else if ((c >= 'a') && (c <= 'f') )
+ return c - 'a' + 10;
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Cannot convert char %c in base %u\n",
+ c, size);
GNUNET_assert (0);
+ }
+ break;
+
+ default:
+ GNUNET_assert (0);
}
}
static void
space (int n)
{
- int i;
- for (i = 0; i < n; i++)
+ for (int i = 0; i < n; i++)
fprintf (stderr, "| ");
}
static void
debugctx (struct RegexCombineCtx *ctx, int level)
{
- return;
- unsigned int i;
+#if DEBUG_REGEX
if (NULL != ctx->s)
{
space (level - 1);
- fprintf (stderr, "%u:'%s'\n", c2i(ctx->s[0], ctx->size), ctx->s);
+ fprintf (stderr, "%u:'%s'\n", c2i (ctx->s[0], ctx->size), ctx->s);
}
else
fprintf (stderr, "ROOT (base %u)\n", ctx->size);
- for (i = 0; i < ctx->size; i++)
+ for (unsigned int i = 0; i < ctx->size; i++)
{
if (NULL != ctx->children[i])
{
debugctx (ctx->children[i], level + 1);
}
}
- fflush(stderr);
+ fflush (stderr);
+#endif
}
* @param regex Regex to add.
*/
static void
-regex_add (struct RegexCombineCtx *ctx, const char *regex);
+regex_add (struct RegexCombineCtx *ctx,
+ const char *regex);
/**
static void
move_children (struct RegexCombineCtx *dst,
- const struct RegexCombineCtx *src)
+ const struct RegexCombineCtx *src)
{
size_t array_size;
array_size = sizeof(struct RegexCombineCtx *) * src->size;
- memcpy (dst->children,
- src->children,
- array_size);
+ GNUNET_memcpy (dst->children,
+ src->children,
+ array_size);
for (unsigned int i = 0; i < src->size; i++)
{
src->children[i] = NULL;
p->s, ctx->s);
s = regex_combine (p);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " total '%s'\n", s);
- if (strlen(s) == 0)
+ if (strlen (s) == 0)
{
opt = GNUNET_YES;
}
regex = tmp;
}
GNUNET_free_non_null (s);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " so far '%s' for inner %s\n", regex, ctx->s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " so far '%s' for inner %s\n", regex,
+ ctx->s);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "opt: %d, innner: '%s'\n", opt, regex);
return best;
}
+
static void
regex_add_multiple (struct RegexCombineCtx *ctx,
const char *regex,
count = 0;
for (i = 1UL; i < l; i++)
{
- if (regex[i] != '|' && regex[i] != ')')
+ if ((regex[i] != '|') && (regex[i] != ')') )
{
count++;
}
tmp[1] = '\0';
for (i = 1UL; i < l; i++)
{
- if (regex[i] != '|' && regex[i] != ')')
+ if ((regex[i] != '|') && (regex[i] != ')') )
{
tmp[0] = regex[i];
- newctx = new_regex_ctx(ctx->size);
+ newctx = new_regex_ctx (ctx->size);
newctx->s = GNUNET_strdup (tmp);
if (children != NULL)
- memcpy (newctx->children, children, sizeof (*children) * ctx->size);
- ctx->children[c2i(tmp[0], ctx->size)] = newctx;
+ GNUNET_memcpy (newctx->children,
+ children,
+ sizeof(*children) * ctx->size);
+ ctx->children[c2i (tmp[0], ctx->size)] = newctx;
}
}
}
+
/**
* Add a single regex to a context, splitting the exisiting state.
*
char *suffix;
suffix = GNUNET_malloc (len - prefix_l + 1);
- strncpy (suffix, &ctx->s[prefix_l], len - prefix_l + 1);
+ /*
+ * We can use GNUNET_strlcpy because ctx->s is null-terminated
+ */
+ GNUNET_strlcpy (suffix, &ctx->s[prefix_l], len - prefix_l + 1);
/* Suffix saved, truncate current node so it only contains the prefix,
* copy any children nodes to put as grandchildren and initialize new empty
newctx = new_regex_ctx (ctx->size);
newctx->s = suffix;
move_children (newctx, ctx);
- idx = c2i(suffix[0], ctx->size);
+ idx = c2i (suffix[0], ctx->size);
ctx->children[idx] = newctx;
}
}
/* There is no prefix match, add new */
- idx = c2i(regex[0], ctx->size);
- if (NULL == ctx->children[idx] && NULL != ctx->s)
+ idx = c2i (regex[0], ctx->size);
+ if ((NULL == ctx->children[idx]) && (NULL != ctx->s))
{
/* this was the end before, add empty string */
newctx = new_regex_ctx (ctx->size);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " no match\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " new state %s\n", regex);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " under %s\n", ctx->s);
- newctx = new_regex_ctx(ctx->size);
+ newctx = new_regex_ctx (ctx->size);
newctx->s = GNUNET_strdup (regex);
ctx->children[idx] = newctx;
}
{
regex_ctx_destroy (ctx->children[i]);
}
- GNUNET_free_non_null (ctx->s); /* 's' on root node is null */
+ GNUNET_free_non_null (ctx->s); /* 's' on root node is null */
GNUNET_free (ctx->children);
GNUNET_free (ctx);
}
* @return A string with a single regex that matches any of the original regexes
*/
char *
-REGEX_TEST_combine (char * const regexes[], unsigned int alphabet_size)
+REGEX_TEST_combine (char *const regexes[], unsigned int alphabet_size)
{
unsigned int i;
char *combined;
buffer = GNUNET_malloc (size + 1);
GNUNET_DISK_file_read (f, buffer, size);
GNUNET_DISK_file_close (f);
- regexes = GNUNET_malloc (sizeof (char *));
+ regexes = GNUNET_malloc (sizeof(char *));
nr = 1;
offset = 0;
regex = NULL;
regexes[nr - 2] = regex;
regexes[nr - 1] = NULL;
regex = NULL;
- } while (offset < size);
+ }
+ while (offset < size);
GNUNET_free_non_null (regex);
GNUNET_free (buffer);
GNUNET_free (regexes);
}
+
/* end of regex_test_lib.c */
projects / oweals / gnunet.git / blobdiff