Expand environment variables for all config option values when loading

1 files changed, 1 insertions, 30 deletions

diff --git a/Alc/hrtf.c b/Alc/hrtf.c
index d326191a..092c9182 100644
--- a/Alc/hrtf.c
+++ b/Alc/hrtf.c
@@ -798,42 +798,13 @@ static struct Hrtf *LoadHrtf(ALuint deviceRate)
         next = fnamelist;
         while(*(fnamelist=next) != '\0' && *fnamelist != ',')
         {
-            next = strpbrk(fnamelist, "%,$");
+            next = strpbrk(fnamelist, "%,");
             while(fnamelist != next && *fnamelist && i < sizeof(fname))
                 fname[i++] = *(fnamelist++);
 
             if(!next || *next == ',')
                 break;
 
-            if(*next == '$')
-            {
-                next++;
-                if(*next == '$')
-                {
-                    /* '$$' becomes a single '$'. */
-                    if(i < sizeof(fname))
-                        fname[i++] = '$';
-                    next++;
-                }
-                else
-                {
-                    const char *str;
-                    char envname[1024];
-                    size_t k = 0;
-
-                    while((isalnum(*next) || *next == '_') && k < sizeof(envname)-1)
-                        envname[k++] = *(next++);
-                    envname[k++] = '\0';
-
-                    if((str=getenv(envname)) != NULL)
-                    {
-                        int wrote = snprintf(&fname[i], sizeof(fname)-i, "%s", str);
-                        i += minu(wrote, sizeof(fname)-i);
-                    }
-                }
-                continue;
-            }
-
             /* *next == '%' */
             next++;
             if(*next == 'r')