diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | source4/lib/util/tests/file.c | 4 | ||||
| -rw-r--r-- | source4/lib/util/tests/str.c | 78 | ||||
| -rw-r--r-- | source4/lib/util/util_str.c | 4 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 1 | ||||
| -rw-r--r-- | source4/torture/local/local.c | 1 |
6 files changed, 86 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore index 00ae9572e2..39f306eabd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -200,3 +200,5 @@ test-results source/lib/ldb-samba/ldif_handlers.h rpc_server/lsa/proto.h torture/winbind/proto.h +source/rpc_server/lsa/proto.h +source/torture/winbind/proto.h diff --git a/source4/lib/util/tests/file.c b/source4/lib/util/tests/file.c index 0fe117a300..fe87293671 100644 --- a/source4/lib/util/tests/file.c +++ b/source4/lib/util/tests/file.c @@ -88,10 +88,10 @@ struct torture_suite *torture_local_util_file(TALLOC_CTX *mem_ctx) struct torture_suite *suite = torture_suite_create(mem_ctx, "FILE"); torture_suite_add_simple_test(suite, "file_load_save", - test_file_load_save); + test_file_load_save); torture_suite_add_simple_test(suite, "afdgets", - test_afdgets); + test_afdgets); return suite; } diff --git a/source4/lib/util/tests/str.c b/source4/lib/util/tests/str.c new file mode 100644 index 0000000000..4a964af0ee --- /dev/null +++ b/source4/lib/util/tests/str.c @@ -0,0 +1,78 @@ +/* + Unix SMB/CIFS implementation. + + util_str testing + + Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007 + + This program 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 of the License, or + (at your option) any later version. + + This program 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "torture/ui.h" + +static bool test_string_sub_simple(struct torture_context *tctx) +{ + char tmp[100]; + safe_strcpy(tmp, "foobar", sizeof(tmp)); + string_sub(tmp, "foo", "bar", sizeof(tmp)); + torture_assert_str_equal(tctx, tmp, "barbar", "invalid sub"); + return true; +} + +static bool test_string_sub_multiple(struct torture_context *tctx) +{ + char tmp[100]; + safe_strcpy(tmp, "fooblafoo", sizeof(tmp)); + string_sub(tmp, "foo", "bar", sizeof(tmp)); + torture_assert_str_equal(tctx, tmp, "barblabar", "invalid sub"); + return true; +} + +static bool test_string_sub_longer(struct torture_context *tctx) +{ + char tmp[100]; + safe_strcpy(tmp, "foobla", sizeof(tmp)); + string_sub(tmp, "foo", "blie", sizeof(tmp)); + torture_assert_str_equal(tctx, tmp, "bliebla", "invalid sub"); + return true; +} + +static bool test_string_sub_shorter(struct torture_context *tctx) +{ + char tmp[100]; + safe_strcpy(tmp, "foobla", sizeof(tmp)); + string_sub(tmp, "foo", "bl", sizeof(tmp)); + torture_assert_str_equal(tctx, tmp, "blbla", "invalid sub"); + return true; +} + +struct torture_suite *torture_local_util_str(TALLOC_CTX *mem_ctx) +{ + struct torture_suite *suite = torture_suite_create(mem_ctx, "STR"); + + torture_suite_add_simple_test(suite, "string_sub_simple", + test_string_sub_simple); + + torture_suite_add_simple_test(suite, "string_sub_multiple", + test_string_sub_multiple); + + torture_suite_add_simple_test(suite, "string_sub_shorter", + test_string_sub_shorter); + + torture_suite_add_simple_test(suite, "string_sub_longer", + test_string_sub_longer); + + return suite; +} diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c index 0f1f2d5a1c..e9f81dbd9b 100644 --- a/source4/lib/util/util_str.c +++ b/source4/lib/util/util_str.c @@ -274,7 +274,7 @@ _PUBLIC_ char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_ _PUBLIC_ void string_sub(char *s, const char *pattern, const char *insert, size_t len) { char *p; - ssize_t ls,lp,li, i; + ssize_t ls, lp, li, i; if (!insert || !pattern || !*pattern || !s) return; @@ -286,7 +286,7 @@ _PUBLIC_ void string_sub(char *s, const char *pattern, const char *insert, size_ if (len == 0) len = ls + 1; /* len is number of *bytes* */ - while (lp <= ls && (p = strstr(s,pattern))) { + while (lp <= ls && (p = strstr(s, pattern))) { if (ls + (li-lp) >= len) { DEBUG(0,("ERROR: string overflow by %d in string_sub(%.50s, %d)\n", (int)(ls + (li-lp) - len), diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 1364028ab7..e3ea9e44ef 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -28,6 +28,7 @@ OBJ_FILES = \ ../../lib/registry/tests/registry.o \ resolve.o \ ../../lib/util/tests/strlist.o \ + ../../lib/util/tests/str.o \ ../../lib/util/tests/file.o \ ../../lib/util/tests/genrand.o \ ../../lib/compression/testsuite.o \ diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 90c3c0d3d9..a52f5d2f7d 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -33,6 +33,7 @@ torture_local_irpc, torture_local_util_strlist, torture_local_util_file, + torture_local_util_str, torture_local_idtree, torture_local_genrand, torture_local_iconv, |