#include "arch.h"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
#include "threads/mutex.hpp"
#include "toolbox/list.hpp"
-#include "toolbox/logging.h"
-#include "toolbox/util.h"
+#include "toolbox/logging.hpp"
#include "vm/exceptions.hpp"
#include "vm/loader.hpp"
#include "vm/properties.hpp"
#include "vm/suck.hpp"
#include "vm/vm.hpp"
-#include "vm/zip.h"
-
-
-/* global variables ***********************************************************/
-
-List<list_classpath_entry*>* list_classpath_entries;
-
-
-/* suck_init *******************************************************************
-
- Initializes the suck subsystem like initializing the classpath
- entries list.
-
-*******************************************************************************/
-
-bool suck_init(void)
-{
- TRACESUBSYSTEMINITIALIZATION("suck_init");
-
-#warning Move this list into VM.
- list_classpath_entries = new List<list_classpath_entry*>();
-
- /* everything's ok */
-
- return true;
-}
+#include "vm/zip.hpp"
/* scandir_filter **************************************************************
}
-/* suck_add ********************************************************************
-
- Adds a classpath to the global classpath entries list.
-
-*******************************************************************************/
-
-void suck_add(char *classpath)
+/**
+ * Adds a classpath to the global classpath entries list.
+ */
+void SuckClasspath::add(char *classpath)
{
list_classpath_entry *lce;
char *start;
cwdlen = 0;
if (*start != '/') { /* XXX fix me for win32 */
- cwd = _Jv_getcwd();
+ cwd = os::getcwd();
cwdlen = strlen(cwd) + strlen("/");
}
/* add current classpath entry, if no error */
if (lce != NULL)
- list_classpath_entries->push_back(lce);
+ push_back(lce);
}
/* goto next classpath entry, skip ':' delimiter */
}
-/* suck_add_from_property ******************************************************
-
- Adds a classpath form a property entry to the global classpath
- entries list.
-
-*******************************************************************************/
-
-void suck_add_from_property(const char *key)
+/**
+ * Adds a classpath form a property entry to the global classpath
+ * entries list.
+ */
+void SuckClasspath::add_from_property(const char *key)
{
const char *value;
const char *start;
s4 namlen;
char *p;
- /* get the property value */
- Properties properties = VM::get_current()->get_properties();
+ // Get the property value.
+ Properties& properties = VM::get_current()->get_properties();
value = properties.get(key);
if (value == NULL)
utf_copy(filename, c->name);
strcat(filename, ".class");
+ // Get current list of classpath entries.
+ SuckClasspath& suckclasspath = VM::get_current()->get_suckclasspath();
+
/* walk through all classpath entries */
- for (List<list_classpath_entry*>::iterator it = list_classpath_entries->begin(); it != list_classpath_entries->end() && cb == NULL; it++) {
+ for (SuckClasspath::iterator it = suckclasspath.begin(); it != suckclasspath.end() && cb == NULL; it++) {
lce = *it;
#if defined(ENABLE_ZLIB)