removed buffer2array.c
This commit is contained in:
Max Kellermann
parent
38e9205d4e
commit
b58aa1f5ee
@ -48,7 +48,6 @@ mpd_headers = \
|
||||
src/filter/chain_filter_plugin.h \
|
||||
src/filter/convert_filter_plugin.h \
|
||||
src/filter/volume_filter_plugin.h \
|
||||
src/buffer2array.h \
|
||||
src/command.h \
|
||||
src/idle.h \
|
||||
src/cmdline.h \
|
||||
@ -181,7 +180,6 @@ src_mpd_SOURCES = \
|
||||
src/notify.c \
|
||||
src/audio.c \
|
||||
src/audio_parser.c \
|
||||
src/buffer2array.c \
|
||||
src/command.c \
|
||||
src/idle.c \
|
||||
src/cmdline.c \
|
||||
|
||||
@ -1,133 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2009 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* 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 2 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, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "buffer2array.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
int buffer2array(char *buffer, char *array[], const int max)
|
||||
{
|
||||
int i = 0;
|
||||
char *c = buffer;
|
||||
|
||||
while (*c != '\0' && i < max) {
|
||||
if (*c == '\"') {
|
||||
array[i++] = ++c;
|
||||
while (*c != '\0') {
|
||||
if (*c == '\"') {
|
||||
*(c++) = '\0';
|
||||
break;
|
||||
}
|
||||
else if (*(c++) == '\\' && *c != '\0') {
|
||||
memmove(c - 1, c, strlen(c) + 1);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
c = g_strchug(c);
|
||||
if (*c == '\0')
|
||||
return i;
|
||||
|
||||
array[i++] = c++;
|
||||
|
||||
while (!g_ascii_isspace(*c) && *c != '\0')
|
||||
++c;
|
||||
}
|
||||
if (*c == '\0')
|
||||
return i;
|
||||
*(c++) = '\0';
|
||||
|
||||
c = g_strchug(c);
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
#ifdef UNIT_TEST
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
char *a[4] = { NULL };
|
||||
char *b;
|
||||
int max;
|
||||
|
||||
b = strdup("lsinfo \"/some/dir/name \\\"test\\\"\"");
|
||||
assert(b);
|
||||
max = buffer2array(b, a, 4);
|
||||
assert( !strcmp("lsinfo", a[0]) );
|
||||
assert( !strcmp("/some/dir/name \"test\"", a[1]) );
|
||||
assert( !a[2] );
|
||||
|
||||
b = strdup("lsinfo \"/some/dir/name \\\"test\\\" something else\"");
|
||||
assert(b);
|
||||
max = buffer2array(b, a, 4);
|
||||
assert( !strcmp("lsinfo", a[0]) );
|
||||
assert( !strcmp("/some/dir/name \"test\" something else", a[1]) );
|
||||
assert( !a[2] );
|
||||
|
||||
b = strdup("lsinfo \"/some/dir\\\\name\"");
|
||||
assert(b);
|
||||
max = buffer2array(b, a, 4);
|
||||
assert( !strcmp("lsinfo", a[0]) );
|
||||
assert( !strcmp("/some/dir\\name", a[1]) );
|
||||
assert( !a[2] );
|
||||
|
||||
b = strdup("lsinfo \"/some/dir name\"");
|
||||
assert(b);
|
||||
max = buffer2array(b, a, 4);
|
||||
assert( !strcmp("lsinfo", a[0]) );
|
||||
assert( !strcmp("/some/dir name", a[1]) );
|
||||
assert( !a[2] );
|
||||
|
||||
b = strdup("lsinfo \"\\\"/some/dir\\\"\"");
|
||||
assert(b);
|
||||
max = buffer2array(b, a, 4);
|
||||
assert( !strcmp("lsinfo", a[0]) );
|
||||
assert( !strcmp("\"/some/dir\"", a[1]) );
|
||||
assert( !a[2] );
|
||||
|
||||
b = strdup("lsinfo \"\\\"/some/dir\\\" x\"");
|
||||
assert(b);
|
||||
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\"");
|
||||
assert(b);
|
||||
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\"");
|
||||
assert(b);
|
||||
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;
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2003-2009 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* 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 2 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, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef MPD_BUFFER_2_ARRAY_H
|
||||
#define MPD_BUFFER_2_ARRAY_H
|
||||
|
||||
/* tokenizes up to max elements in buffer (a null-terminated string) and
|
||||
* stores the result in array (which must be capable of holding up to
|
||||
* max elements). Tokenization is based on C string quoting rules.
|
||||
* The arguments buffer and array are modified.
|
||||
* Returns the number of elements tokenized.
|
||||
*/
|
||||
int buffer2array(char *buffer, char *array[], const int max);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user