Replace unsafe characters with _ in card name

Otherwise, they get misinterpreted as argument separators
in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries
from working.

While at it, add my Logitec C910 webcam to the SPDIF blacklist.

Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/conf.h b/include/conf.h
index ff270f61738333127cd04ef535a550710fb16020..087c05dc6bcf9c1486b161e77944fb9791bb50fb 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long
 int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value);
 int snd_config_imake_real(snd_config_t **config, const char *key, const double value);
 int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii);
+int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii);
 int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr);
 
 snd_config_type_t snd_config_get_type(const snd_config_t *config);

diff --git a/src/conf.c b/src/conf.c
index bb256e7ae443fc06671fb67b724fe09abee02beb..c6a83eef7d2fb9c64c5029cde5c787d790083b48 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v
        return 0;
 }
 
+int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value)
+{
+       int err;
+       snd_config_t *tmp;
+       char *c;
+
+       err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING);
+       if (err < 0)
+               return err;
+       if (value) {
+               tmp->u.string = strdup(value);
+               if (!tmp->u.string) {
+                       snd_config_delete(tmp);
+                       return -ENOMEM;
+               }
+
+               for (c = tmp->u.string; *c; c++) {
+                       if (*c == ' ' || *c == '-' || *c == '_' ||
+                               (*c >= '0' && *c <= '9') ||
+                               (*c >= 'a' && *c <= 'z') ||
+                               (*c >= 'A' && *c <= 'Z'))
+                                       continue;
+                       *c = '_';
+               }
+       } else {
+               tmp->u.string = NULL;
+       }
+       *config = tmp;
+       return 0;
+}
+
+
 /**
  * \brief Creates a pointer configuration node with the given initial value.
  * \param[out] config The function puts the handle to the new node at

diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
index 031bee0d86fd66bbea0b39b5a8b3e9c2741e836d..e365f2979e6a25a3d7a1eafc513dedcd7bbe2f14 100644 (file)
--- a/src/conf/cards/USB-Audio.conf
+++ b/src/conf/cards/USB-Audio.conf
@@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device {
        "Scarlett 2i4 USB" 999
        "Sennheiser USB headset" 999
        "SWTOR Gaming Headset by Razer" 999
-       "USB Device 0x46d:0x992" 999
+       "USB Device 0x46d_0x821" 999
+       "USB Device 0x46d_0x992" 999
 }
 
 # Second iec958 device number, if any.

diff --git a/src/confmisc.c b/src/confmisc.c
index 1fb4f282217e45f94d16ffb2d895adb15f96fe9e..ae0275ff4de302620994fd913f08650f58f41ea1 100644 (file)
--- a/src/confmisc.c
+++ b/src/confmisc.c
@@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root,
        }
        err = snd_config_get_id(src, &id);
        if (err >= 0)
-               err = snd_config_imake_string(dst, id,
+               err = snd_config_imake_safe_string(dst, id,
                                              snd_ctl_card_info_get_name(info));
       __error:
        if (ctl)