oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
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
This commit is contained in:
Eric Wong 2006-10-10 19:37:32 +00:00
parent e0a8c17957
commit 4c80121bba
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/buffer2array.c
View File

@ -24,7 +24,7 @@
#include <ctype.h> #include <ctype.h>
inline static static inline
int int
isWhiteSpace(char c) isWhiteSpace(char c)
{ {
@ -43,7 +43,7 @@ int buffer2array(char *buffer, char *array[], const int max)
if (*c == '\"') { if (*c == '\"') {
*(c++) = '\0'; *(c++) = '\0';
break; break;
} }
else if (*(c++) == '\\' && *c != '\0') { else if (*(c++) == '\\' && *c != '\0') {
memmove(c - 1, c, strlen(c) + 1); memmove(c - 1, c, strlen(c) + 1);
} }
@ -76,44 +76,56 @@ int main()
{ {
char *a[4] = { NULL }; char *a[4] = { NULL };
char *b; 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); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("/some/dir/name \"test\"", a[1]) ); assert( !strcmp("/some/dir/name \"test\"", a[1]) );
assert( !a[2] ); 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); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("/some/dir/name \"test\" something else", a[1]) ); assert( !strcmp("/some/dir/name \"test\" something else", a[1]) );
assert( !a[2] ); assert( !a[2] );
b = xstrdup("lsinfo \"/some/dir\\\\name\""); b = strdup("lsinfo \"/some/dir\\\\name\"");
max = buffer2array(b, a, 4); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("/some/dir\\name", a[1]) ); assert( !strcmp("/some/dir\\name", a[1]) );
assert( !a[2] ); assert( !a[2] );
b = xstrdup("lsinfo \"/some/dir name\""); b = strdup("lsinfo \"/some/dir name\"");
max = buffer2array(b, a, 4); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("/some/dir name", a[1]) ); assert( !strcmp("/some/dir name", a[1]) );
assert( !a[2] ); assert( !a[2] );
b = xstrdup("lsinfo \"\\\"/some/dir\\\"\""); b = strdup("lsinfo \"\\\"/some/dir\\\"\"");
max = buffer2array(b, a, 4); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("\"/some/dir\"", a[1]) ); assert( !strcmp("\"/some/dir\"", a[1]) );
assert( !a[2] ); assert( !a[2] );
b = xstrdup("lsinfo \"\\\"/some/dir\\\" x\""); b = strdup("lsinfo \"\\\"/some/dir\\\" x\"");
max = buffer2array(b, a, 4); max = buffer2array(b, a, 4);
assert( !strcmp("lsinfo", a[0]) ); assert( !strcmp("lsinfo", a[0]) );
assert( !strcmp("\"/some/dir\" x", a[1]) ); assert( !strcmp("\"/some/dir\" x", a[1]) );
assert( !a[2] ); 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; return 0;
} }