buffer2array: extra unit tests (for PHP magic quote escapes)

Make the unit tests compile correctly without using xstrdup. Also, use "static inline" instead of "inline static": certain compilers or cflags are likely to complain about the latter. git-svn-id: https://svn.musicpd.org/mpd/trunk@4892 09075e82-0dd4-0310-85a5-a0d7c8717e4f

buffer2array: extra unit tests (for PHP magic quote escapes)
4c80121b · Eric Wong · e0a8c179 · 4c80121b
Commit 4c80121b authored Oct 10, 2006 by Eric Wong
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

buffer2array.c src/buffer2array.c +20 -8

No files found.
--- a/src/buffer2array.c
+++ b/src/buffer2array.c
@@ -24,7 +24,7 @@
 #include <ctype.h>


-inline static
+static inline
 int
 isWhiteSpace(char c)
 {
@@ -76,44 +76,56 @@ int main()
 {
 	char *a[4] = { NULL };
 	char *b;
-	int i, max;
+	int max;

-	b = xstrdup("lsinfo \"/some/dir/name \\\"test\\\"\"");
+	b = strdup("lsinfo \"/some/dir/name \\\"test\\\"\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("/some/dir/name \"test\"", a[1]) );
 	assert( !a[2] );

-	b = xstrdup("lsinfo \"/some/dir/name \\\"test\\\" something else\"");
+	b = strdup("lsinfo \"/some/dir/name \\\"test\\\" something else\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("/some/dir/name \"test\" something else", a[1]) );
 	assert( !a[2] );

-	b = xstrdup("lsinfo \"/some/dir\\\\name\"");
+	b = strdup("lsinfo \"/some/dir\\\\name\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("/some/dir\\name", a[1]) );
 	assert( !a[2] );

-	b = xstrdup("lsinfo \"/some/dir name\"");
+	b = strdup("lsinfo \"/some/dir name\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("/some/dir name", a[1]) );
 	assert( !a[2] );

-	b = xstrdup("lsinfo \"\\\"/some/dir\\\"\"");
+	b = strdup("lsinfo \"\\\"/some/dir\\\"\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("\"/some/dir\"", a[1]) );
 	assert( !a[2] );

-	b = xstrdup("lsinfo \"\\\"/some/dir\\\" x\"");
+	b = strdup("lsinfo \"\\\"/some/dir\\\" x\"");
 	max = buffer2array(b, a, 4);
 	assert( !strcmp("lsinfo", a[0]) );
 	assert( !strcmp("\"/some/dir\" x", a[1]) );
 	assert( !a[2] );

+	b = strdup("lsinfo \"single quote\\'d from php magicquotes\"");
+	max = buffer2array(b, a, 4);
+	assert( !strcmp("lsinfo", a[0]) );
+	assert( !strcmp("single quote\'d from php magicquotes", a[1]) );
+	assert( !a[2] );
+
+	b = strdup("lsinfo \"double quote\\\"d from php magicquotes\"");
+	max = buffer2array(b, a, 4);
+	assert( !strcmp("lsinfo", a[0]) );
+	assert( !strcmp("double quote\"d from php magicquotes", a[1]) );
+	assert( !a[2] );
+
 	return 0;
 }