mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-11 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: Improve cset command parsing

Browse source 
The cset command parsing in ucm/main.c assumes implicitly that the
argument contains no space, thus an example below wouldn't work:
    cset "name='Input Select' Digital Mic"

This patch introduces a new internal API function
__snd_ctl_ascii_elem_id_parse() to improve the cset parser.

Reported-by: Tanu Kaskinen <tanu.kaskinen@digia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-10 14:14:28 +02:00
parent c34f74c818
commit 58d10c09e1
2 changed files with 46 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/control/ctlparse.c
View file

@ -143,21 +143,19 @@ char *snd_ctl_ascii_elem_id_get(snd_ctl_elem_id_t *id)
return strdup(buf);
}
/**
* \brief parse ASCII string as CTL element identifier
* \param dst destination CTL identifier
* \param str source ASCII string
* \return zero on success, otherwise a negative error code
*/
int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str)
#ifndef DOC_HIDDEN
/* used by UCM parser, too */
int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str,
const char **ret_ptr)
{
int c, size, numid;
int err = -EINVAL;
char *ptr;
while (*str == ' ' || *str == '\t')
while (isspace(*str))
str++;
if (!(*str))
return -EINVAL;
goto out;
snd_ctl_elem_id_set_interface(dst, SND_CTL_ELEM_IFACE_MIXER); /* default */
while (*str) {
if (!strncasecmp(str, "numid=", 6)) {
@ -165,7 +163,7 @@ int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str)
numid = atoi(str);
if (numid <= 0) {
fprintf(stderr, "amixer: Invalid numid %d\n", numid);
return -EINVAL;
goto out;
}
snd_ctl_elem_id_set_numid(dst, atoi(str));
while (isdigit(*str))
@ -191,7 +189,7 @@ int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str)
snd_ctl_elem_id_set_interface(dst, SND_CTL_ELEM_IFACE_SEQUENCER);
str += 9;
} else {
return -EINVAL;
goto out;
}
} else if (!strncasecmp(str, "name=", 5)) {
char buf[64];
@ -239,11 +237,33 @@ int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str)
if (*str == ',') {
str++;
} else {
/* when ret_ptr is given, allow to terminate gracefully
* at the next space letter
*/
if (ret_ptr && isspace(*str))
break;
if (*str)
return -EINVAL;
goto out;
}
}
return 0;
err = 0;
out:
if (ret_ptr)
*ret_ptr = str;
return err;
}
#endif
/**
* \brief parse ASCII string as CTL element identifier
* \param dst destination CTL identifier
* \param str source ASCII string
* \return zero on success, otherwise a negative error code
*/
int snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str)
{
return __snd_ctl_ascii_elem_id_parse(dst, str, NULL);
}
static int get_ctl_enum_item_index(snd_ctl_t *handle,