mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

seqmid: restore sequencer address prefix match feature

Browse source 
Commit 1989233449 (seq: Fix for snd_seq_parse_address()) removed the
ability to match sequencer client names by any of by their prefixes in
an attempt to avoid wrong matches when one client name is the prefix of
another.

However, the prefix match feature was documented and actually used.

Allow prefixes to match, but only if there is no exact match.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2013-05-13 21:16:36 +02:00
parent 2d5ad69e4e
commit e23961df50
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/seq/seqmid.c
View file

@ -383,13 +383,8 @@ int snd_seq_sync_output_queue(snd_seq_t *seq)
* digit numbers. * digit numbers.
* Actually \a arg need to be only a prefix of the wanted client. * Actually \a arg need to be only a prefix of the wanted client.
* That is, if a client named "Foobar XXL Master 2012" with number 128 is available, * That is, if a client named "Foobar XXL Master 2012" with number 128 is available,
* then parsing "Foobar" will return the address 128:0. * then parsing "Foobar" will return the address 128:0 if no other client is
* However parsing is biased towards small client numbers, * an exact match.
* thus if also a client named "Foobar" with number 129 exists,
* then parsing will still yield address 128:0 and not 129:0.
* If you want be able to access all clients by prefixes
* then you must write your own parser that checks for matching client names
* in the order of increasing name lengths.
*/ */
int snd_seq_parse_address(snd_seq_t *seq, snd_seq_addr_t *addr, const char *arg) int snd_seq_parse_address(snd_seq_t *seq, snd_seq_addr_t *addr, const char *arg)
{ {
@ -421,14 +416,24 @@ int snd_seq_parse_address(snd_seq_t *seq, snd_seq_addr_t *addr, const char *arg)
return -EINVAL; return -EINVAL;
if (len <= 0) if (len <= 0)
return -EINVAL; return -EINVAL;
client = -1;
cinfo.client = -1; cinfo.client = -1;
while (snd_seq_query_next_client(seq, &cinfo) >= 0) { while (snd_seq_query_next_client(seq, &cinfo) >= 0) {
if ((strlen(cinfo.name) == (size_t)len) && if (!strncmp(arg, cinfo.name, len)) {
! strncmp(arg, cinfo.name, len)) { if (strlen(cinfo.name) == (size_t)len) {
addr->client = cinfo.client; /* exact match */
return 0; addr->client = cinfo.client;
return 0;
}
if (client < 0)
client = cinfo.client;
} }
} }
if (client >= 0) {
/* prefix match */
addr->client = client;
return 0;
}
return -ENOENT; /* not found */ return -ENOENT; /* not found */
} }
return 0; return 0;