[Gnash-commit] gnash ChangeLog configure.ac server/shm.cpp uti...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/22 19:09:16

Modified files:
        .              : ChangeLog configure.ac 
        server         : shm.cpp 
        utilities      : dumpshm.cpp 

Log message:
        Clean-up...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1347&r2=1.1348
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.177&r2=1.178
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1347
retrieving revision 1.1348
diff -u -b -r1.1347 -r1.1348
--- ChangeLog   22 Oct 2006 18:40:59 -0000      1.1347
+++ ChangeLog   22 Oct 2006 19:09:15 -0000      1.1348
@@ -25,9 +25,11 @@
 
        * configure.ac: Don't look for KDE if not --enable-plugin.
          Wrong amount of args to 'test'. AC_DEFINE(KLASH...).
-         Added checking and setting HAVE_SHM_UNLINK.
-       * utilities/dumpshm.cpp: Fixed !__GNUC__ stuff. NetBSD and OpenBSD
-         doesn't comply to POSIX shm, just return.
+         Added checking and setting HAVE_SHM_UNLINK. Added check for
+         shmdt.
+       * utilities/dumpshm.cpp: Fixed !__GNUC__ stuff.
+         Look at server/shm.cpp and implement it likewise.
+       * server/shm.cpp: Actually HAVE_SHM_UNLINK is appriate here.
        * plugin/mozplugger/mozpluggerrc.patch: added -j -k and 'stream'.
 
 2006-10-21  Rob Savoye  <address@hidden>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- configure.ac        22 Oct 2006 18:40:59 -0000      1.177
+++ configure.ac        22 Oct 2006 19:09:15 -0000      1.178
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.177 2006/10/22 18:40:59 nihilus Exp $
+dnl $Id: configure.ac,v 1.178 2006/10/22 19:09:15 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -449,9 +449,7 @@
 AC_REPLACE_FUNCS(getopt)
 
 AC_CHECK_FUNCS(sysconf)
-AC_CHECK_FUNCS(shmget)
-AC_CHECK_FUNCS(shmat)
-AC_CHECK_FUNCS(mmap)
+AC_CHECK_FUNCS(shmget shmat shmdt mmap)
 AC_CHECK_FUNCS(gettimeofday)
 AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY_PROTO, [1],[Define if you have 
the strlcpy prototype]))
 AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT_PROTO, [1],[Define if you have 
the strlcat prototype]))

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/shm.cpp      22 Oct 2006 17:27:40 -0000      1.23
+++ server/shm.cpp      22 Oct 2006 19:09:16 -0000      1.24
@@ -36,6 +36,8 @@
 //
 //
 
+/* $Id: shm.cpp,v 1.24 2006/10/22 19:09:16 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -410,7 +412,7 @@
 Shm::closeMem()
 {
     // Only nuke the shared memory segement if we're the last one.
-#ifdef HAVE_SHM_OPEN
+#ifdef HAVE_SHM_UNLINK
     if (strlen(_filespec) != 0) {
         shm_unlink(_filespec);
     }

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- utilities/dumpshm.cpp       22 Oct 2006 18:42:39 -0000      1.6
+++ utilities/dumpshm.cpp       22 Oct 2006 19:09:16 -0000      1.7
@@ -37,7 +37,7 @@
 //
 
 
-/* $Id: dumpshm.cpp,v 1.6 2006/10/22 18:42:39 nihilus Exp $ */
+/* $Id: dumpshm.cpp,v 1.7 2006/10/22 19:09:16 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,9 +57,15 @@
 }
 #include <dirent.h>
 #include <sys/types.h>
-extern "C"{
-       #include <sys/mman.h>
-}
+#ifndef HAVE_WINSOCK_H
+#include <sys/mman.h>
+#include <sys/shm.h>
+#include <sys/ipc.h>
+#else
+#include <windows.h>
+#include <process.h>
+#include <io.h>
+#endif
 #include <iostream>
 #include <iomanip>
 #include <fstream>
@@ -91,11 +97,6 @@
 int
 main(int argc, char *argv[])
 {
-#ifndef HAVE_SHM_UNLINK
-//Do nothing just return.
-cerr << "POSIX shm_unlink() is not supported by your OS!" << endl;
-       return -1;
-#else
     unsigned int          i;
     int                   c;
     bool                  dump  = false;
@@ -197,7 +198,9 @@
         // These are the names left by the various test cases. Just
         // blindly delete them, because they may not even exist, so
         // the errors can be ignored.
+#ifdef HAVE_SHM_UNLINK        
         shm_unlink("/lc_test");
+#endif
         exit(0);
     }
 
@@ -229,13 +232,17 @@
                                    // use the correct path
                     tmpname += entry->d_name;
                     cout << "Removing segment: " << tmpname << endl;
+#ifdef HAVE_SHM_UNLINK
                     shm_unlink(tmpname.c_str());
+#endif
                 }
             }
             exit(0);
         } else {
             cout << "Nuking the shared memory segment " << filespec << endl;
+#ifdef HAVE_SHM_UNLINK 
             shm_unlink(filespec.c_str());
+#endif
         }
         
         exit(0);
@@ -283,7 +290,6 @@
 //        tmpptr[1] = reinterpret_cast<long>(memblks);        
 //        mmptr->memBlocksSet(memblks);
     }
-#endif
 }
 
 /// \brief  Display the command line arguments