unit test for misc.c:strdelim() that mostly servces to highlight its

inconsistencies

3 files changed, 179 insertions, 2 deletions

diff --git a/regress/usr.bin/ssh/unittests/misc/Makefile b/regress/usr.bin/ssh/unittests/misc/Makefile
index 0658c38c6a2..656ae44dbec 100644
--- a/regress/usr.bin/ssh/unittests/misc/Makefile
+++ b/regress/usr.bin/ssh/unittests/misc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2021/03/19 04:23:50 djm Exp $
+#	$OpenBSD: Makefile,v 1.7 2021/05/21 03:48:07 djm Exp $
 
 PROG=test_misc
 SRCS=tests.c
@@ -6,6 +6,7 @@ SRCS+=	test_convtime.c
 SRCS+=	test_expand.c
 SRCS+=	test_parse.c
 SRCS+=	test_argv.c
+SRCS+=	test_strdelim.c
 
 # From usr.bin/ssh/Makefile.inc
 SRCS+=	sshbuf.c
diff --git a/regress/usr.bin/ssh/unittests/misc/test_strdelim.c b/regress/usr.bin/ssh/unittests/misc/test_strdelim.c
new file mode 100644
index 00000000000..e5026d8637d
--- /dev/null
+++ b/regress/usr.bin/ssh/unittests/misc/test_strdelim.c
@@ -0,0 +1,174 @@
+/* 	$OpenBSD: test_strdelim.c,v 1.1 2021/05/21 03:48:07 djm Exp $ */
+/*
+ * Regress test for misc strdelim() and co
+ *
+ * Placed in the public domain.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helper.h"
+
+#include "log.h"
+#include "misc.h"
+#include "xmalloc.h"
+
+void test_strdelim(void);
+
+void
+test_strdelim(void)
+{
+	char *orig, *str, *cp;
+
+#define START_STRING(x)	orig = str = xstrdup(x)
+#define DONE_STRING()	free(orig)
+
+	TEST_START("empty");
+	START_STRING("");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("whitespace");
+	START_STRING("	");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("trivial");
+	START_STRING("blob");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("trivial whitespace");
+	START_STRING("blob   ");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("multi");
+	START_STRING("blob1 blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("multi whitespace");
+	START_STRING("blob1	 	blob2  	 	");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("multi equals");
+	START_STRING("blob1=blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("multi too many equals");
+	START_STRING("blob1==blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");	/* XXX better returning NULL early */
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("multi equals strdelimw");
+	START_STRING("blob1=blob2");
+	cp = strdelimw(&str);
+	ASSERT_STRING_EQ(cp, "blob1=blob2");
+	cp = strdelimw(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("quoted");
+	START_STRING("\"blob\"");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("quoted multi");
+	START_STRING("\"blob1\" blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("quoted multi reverse");
+	START_STRING("blob1 \"blob2\"");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");	/* XXX better as NULL */
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("quoted multi middle");
+	START_STRING("blob1 \"blob2\" blob3");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob1");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob2");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob3");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("badquote");
+	START_STRING("\"blob");
+	cp = strdelim(&str);
+	ASSERT_PTR_EQ(cp, NULL);
+	DONE_STRING();
+	TEST_DONE();
+
+	TEST_START("oops quote");
+	START_STRING("\"blob\\\"");
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "blob\\");	/* XXX wrong */
+	cp = strdelim(&str);
+	ASSERT_STRING_EQ(cp, "");
+	DONE_STRING();
+	TEST_DONE();
+
+}
diff --git a/regress/usr.bin/ssh/unittests/misc/tests.c b/regress/usr.bin/ssh/unittests/misc/tests.c
index fe9544a93fa..9d619fc7d6c 100644
--- a/regress/usr.bin/ssh/unittests/misc/tests.c
+++ b/regress/usr.bin/ssh/unittests/misc/tests.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: tests.c,v 1.6 2021/03/19 04:23:50 djm Exp $ */
+/* 	$OpenBSD: tests.c,v 1.7 2021/05/21 03:48:07 djm Exp $ */
 /*
  * Regress test for misc helper functions.
  *
@@ -21,6 +21,7 @@ void test_parse(void);
 void test_convtime(void);
 void test_expand(void);
 void test_argv(void);
+void test_strdelim(void);
 
 void
 tests(void)
@@ -29,4 +30,5 @@ tests(void)
 	test_convtime();
 	test_expand();
 	test_argv();
+	test_strdelim();
 }