diff options
author | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-17 20:17:45 +0000 |
---|---|---|
committer | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-17 20:17:45 +0000 |
commit | a7a20387006a89cd13fd122e0262dd59957bc6d0 (patch) | |
tree | f7e11679e9eeb93f936c7b5b89b7bc9093a389f3 /src/regex | |
parent | b1605042578ea3f1f8dda733e8aed21793c1cf26 (diff) | |
download | gnunet-a7a20387006a89cd13fd122e0262dd59957bc6d0.tar.gz gnunet-a7a20387006a89cd13fd122e0262dd59957bc6d0.zip |
fix
Diffstat (limited to 'src/regex')
-rw-r--r-- | src/regex/regex.c | 3 | ||||
-rw-r--r-- | src/regex/test_regex_iterate_api.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/regex/regex.c b/src/regex/regex.c index 024e26e0e..54d38e4c0 100644 --- a/src/regex/regex.c +++ b/src/regex/regex.c | |||
@@ -2838,7 +2838,8 @@ iterate_initial_edge (const unsigned int min_len, const unsigned int max_len, | |||
2838 | else | 2838 | else |
2839 | cur_len = 0; | 2839 | cur_len = 0; |
2840 | 2840 | ||
2841 | if (cur_len >= min_len && cur_len > 0 && NULL != consumed_string) | 2841 | if ((cur_len >= min_len || GNUNET_YES == state->accepting) && cur_len > 0 && |
2842 | NULL != consumed_string) | ||
2842 | { | 2843 | { |
2843 | if (cur_len <= max_len) | 2844 | if (cur_len <= max_len) |
2844 | { | 2845 | { |
diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c index fc60853f4..72847476b 100644 --- a/src/regex/test_regex_iterate_api.c +++ b/src/regex/test_regex_iterate_api.c | |||
@@ -28,7 +28,14 @@ | |||
28 | #include "gnunet_regex_lib.h" | 28 | #include "gnunet_regex_lib.h" |
29 | #include "regex_internal.h" | 29 | #include "regex_internal.h" |
30 | 30 | ||
31 | /** | ||
32 | * Regex initial padding. | ||
33 | */ | ||
31 | #define INITIAL_PADDING "PADPADPADPADPADP" | 34 | #define INITIAL_PADDING "PADPADPADPADPADP" |
35 | |||
36 | /** | ||
37 | * Set to GNUNET_YES to save a debug graph. | ||
38 | */ | ||
32 | #define GNUNET_REGEX_ITERATE_SAVE_DEBUG_GRAPH GNUNET_NO | 39 | #define GNUNET_REGEX_ITERATE_SAVE_DEBUG_GRAPH GNUNET_NO |
33 | 40 | ||
34 | static unsigned int transition_counter; | 41 | static unsigned int transition_counter; |