[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_ladspa.c,1.22,1.23

[Takashi I. <ti...@us...>]

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7374/src/pcm

Modified Files:
	pcm_ladspa.c 
Log Message:
Summary: Use snd_user_file() in pcm_ladpsa.c

Use snd_user_file() in pcm_ladpsa.c to get rid of wordexp.



Index: pcm_ladspa.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_ladspa.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pcm_ladspa.c	14 Nov 2005 09:50:29 -0000	1.22
+++ pcm_ladspa.c	29 Nov 2005 15:20:07 -0000	1.23
@@ -28,7 +28,6 @@
   
 #include <dirent.h>
 #include <dlfcn.h>
-#include <wordexp.h>
 #include <locale.h>
 #include "pcm_local.h"
 #include "pcm_plugin.h"
@@ -815,26 +814,18 @@
 {
 	const char *c;
 	size_t l;
-	wordexp_t we;
 	int err;
 	
 	for (c = path; (l = strcspn(c, ": ")) > 0; ) {
 		char name[l + 1];
+		char *fullpath;
 		memcpy(name, c, l);
 		name[l] = 0;
-		err = wordexp(name, &we, WRDE_NOCMD);
-		switch (err) {
-		case WRDE_NOSPACE:
-			return -ENOMEM;
-		case 0:
-			if (we.we_wordc == 1)
-				break;
-			/* Fall through */
-		default:
-			return -EINVAL;
-		}
-		err = snd_pcm_ladspa_check_dir(plugin, we.we_wordv[0], label, ladspa_id);
-		wordfree(&we);
+		err = snd_user_file(name, &fullpath);
+		if (err < 0)
+			return err;
+		err = snd_pcm_ladspa_check_dir(plugin, fullpath, label, ladspa_id);
+		free(fullpath);
 		if (err < 0)
 			return err;
 		if (err > 0)