[Gnash-commit] gnash libbase/sharedlib.cpp libbase/extension.c...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/12/07 12:39:36

Modified files:
        libbase        : sharedlib.cpp extension.cpp 
        .              : ChangeLog 

Log message:
                * libbase/sharedlib.cpp: Don't call lt_dlexit when destructing. 
                * server/asobj/Global.cpp: Look for extensions.
                * extensions/dejagnu/Makefile.am: Use libdir instead of
                prefix. Include from asobjs too, and also link in
                libgnashvm. Don't build Sharedtest.
                * extensions/dejagnu/dejagnu.cpp: Setup the members
                correctly. Don't attach twice for this class.
                * extensions/dejagnu/test.as: Use pass and fail.
                * libbase/extension.cpp: Remove the plugin suffix. 
                * libbase/sharedlib.cpp: Don't exit libltdl in the destructor.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1875&r2=1.1876

Patches:
Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/sharedlib.cpp       6 Dec 2006 10:58:34 -0000       1.11
+++ libbase/sharedlib.cpp       7 Dec 2006 12:39:36 -0000       1.12
@@ -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: sharedlib.cpp,v 1.11 2006/12/06 10:58:34 strk Exp $ */
+/* $Id: sharedlib.cpp,v 1.12 2006/12/07 12:39:36 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -127,7 +127,7 @@
 {
     GNASH_REPORT_FUNCTION;
 //    closeLib();
-    lt_dlexit();
+//    lt_dlexit();
 }
 
 bool

Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/extension.cpp       24 Nov 2006 19:17:37 -0000      1.3
+++ libbase/extension.cpp       7 Dec 2006 12:39:36 -0000       1.4
@@ -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.3 2006/11/24 19:17:37 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.4 2006/12/07 12:39:36 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,7 +33,7 @@
 // #endif
 
 #include <ltdl.h>
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <sys/types.h>
 #include "log.h"
@@ -175,7 +175,6 @@
     
     int i;
     struct dirent *entry;
-    string mod;
     string::size_type pos;
     char *dirlistcopy;
     char *dir;
@@ -202,7 +201,7 @@
             // We only want shared libraries than end with the suffix, 
otherwise
             // we get all the duplicates.
             entry = readdir(library_dir);
-            if (entry < NULL) {
+            if (entry <= NULL) {
                 break;
             }
             
@@ -210,16 +209,9 @@
                 continue;
             }
             
+            *(strrchr(entry->d_name, '.')) = 0;
             dbglogfile << "Gnash Plugin name: " << entry->d_name << endl;
-            mod = entry->d_name;
-            pos = mod.rfind(".", mod.size());
-            if (pos != string::npos) {
-                mod.erase(pos, mod.size());
-            } else {
-                log_warning("Couldn't remove plugin suffix!");
-            }
-//        cerr << "Module name is: " << mod << endl;
-            _modules.push_back(mod);
+            _modules.push_back(entry->d_name);
             
         }
         if (closedir(library_dir) != 0) {

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1875
retrieving revision 1.1876
diff -u -b -r1.1875 -r1.1876
--- ChangeLog   7 Dec 2006 11:57:23 -0000       1.1875
+++ ChangeLog   7 Dec 2006 12:39:36 -0000       1.1876
@@ -1,3 +1,16 @@
+2006-12-06  Rob Savoye  <address@hidden>
+
+       * libbase/sharedlib.cpp: Don't call lt_dlexit when destructing. 
+       * server/asobj/Global.cpp: Look for extensions.
+       * extensions/dejagnu/Makefile.am: Use libdir instead of
+       prefix. Include from asobjs too, and also link in
+       libgnashvm. Don't build Sharedtest.
+       * extensions/dejagnu/dejagnu.cpp: Setup the members
+       correctly. Don't attach twice for this class.
+       * extensions/dejagnu/test.as: Use pass and fail.
+       * libbase/extension.cpp: Remove the plugin suffix. 
+       * libbase/sharedlib.cpp: Don't exit libltdl in the destructor.
+
 2006-12-07 Ann Barcomb <address@hidden>
 
         * doc/C/internals.xml, gnashrc.xml: