[Gnash-commit] gnash libbase/extension.cpp extensions/Makefile...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/12/15 21:19:25

Modified files:
        libbase        : extension.cpp 
        extensions     : Makefile.am 
        .              : ChangeLog 

Log message:
                * extensions/Makefile.am: Build MySQL extension.
                * libbase/extension.cpp: Don't continue if the search directory
                doesn't exist.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1945&r2=1.1946

Patches:
Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/extension.cpp       7 Dec 2006 12:39:36 -0000       1.4
+++ libbase/extension.cpp       15 Dec 2006 21:19:25 -0000      1.5
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: extension.cpp,v 1.4 2006/12/07 12:39:36 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.5 2006/12/15 21:19:25 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -192,6 +192,11 @@
         dbglogfile << "Scanning directory \"" << dir << "\" for plugins." << 
endl;
         DIR *library_dir = opendir(dir);
         
+        if (library_dir == NULL) {
+            dbglogfile << "Can't open directory " << dir << endl;
+            return false;
+        }
+        
         // By convention, the first two entries in each directory are for . and
         // .. (``dot'' and ``dot dot''), so we ignore those.
         entry = readdir(library_dir);

Index: extensions/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/Makefile.am      24 Nov 2006 19:58:03 -0000      1.1
+++ extensions/Makefile.am      15 Dec 2006 21:19:25 -0000      1.2
@@ -17,4 +17,4 @@
 
 AUTOMAKE_OPTIONS = 
 
-SUBDIRS = dejagnu
+SUBDIRS = dejagnu mysql

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -b -r1.1945 -r1.1946
--- ChangeLog   15 Dec 2006 20:51:43 -0000      1.1945
+++ ChangeLog   15 Dec 2006 21:19:25 -0000      1.1946
@@ -1,5 +1,9 @@
 2006-12-15  Rob Savoye  <address@hidden>
 
+       * extensions/Makefile.am: Build MySQL extension.
+       * libbase/extension.cpp: Don't continue if the search directory
+       doesn't exist.
+       
        * server/array.cpp: Add the size operator, which wasn't being added
        as a member.
        * extensions/mysql/Makefile.am: