Changeset abcabca628baf7989fde32b378c8d4783e6346df

Timestamp:

20/12/00 17:39:16 (8 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 977330356 +0000

git-parent:

[50118171a93a426f2f553369aa65bbc42101d8b8]

git-author:

Sam Hocevar <sam@videolan.org> 977330356 +0000

Message:

. now we only try to open plugins which are existing files

Files:

• INSTALL (modified) (1 diff)
• src/misc/plugins.c (modified) (4 diffs)

INSTALL

@@ -12 +12 @@
-
-   ./configure --prefix=/usr --enable-mmx --enable-gnome --enable-fb \
-mga
+sdl
-
-See `./configure --help' for more information.

src/misc/plugins.c

@@ -28 +28 @@
-#include <string.h>                                            /* strerror() */
-#include <errno.h>                                                 /* ENOMEM */
+#include <sys/types.h>                                               /* open */
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>                                                 /* close */
-
-#if defined(HAVE_DLFCN_H)                                /* Linux, BSD, Hurd */
@@ -136 +140 @@
-char * TestPlugin ( plugin_id_t *p_plugin_id, char * psz_name )
-{
-
+, i_fd
-    char * psz_plugin;
-    char * psz_plugin_path[ ] =
@@ -164 +168 @@
-        sprintf( psz_plugin, "%s/%s.so", psz_plugin_path[i_count], psz_name );
-
+        /* Try to open the plugin before dlopen()ing it. */
+        i_fd = open( psz_plugin, O_RDONLY );
+        if( i_fd == -1 )
+        {
+            free( psz_plugin );
+            continue;
+        }
+        close( i_fd );
+        
-        *p_plugin_id = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
-#endif
@@ -176 +189 @@
-            return( psz_plugin );
-        }
+
-#ifndef SYS_BEOS
-
-
-
-
+
-#endif
-