#include "toolbox/logging.h"
#include "toolbox/util.h"
-#include "vm/exceptions.h"
+#include "vm/exceptions.hpp"
#include "vm/properties.h"
-#include "vm/vm.h"
+#include "vm/vm.hpp"
#include "vmcore/loader.h"
#include "vmcore/options.h"
#include "vmcore/suck.h"
-#include "vmcore/system.h"
+#include "vmcore/os.hpp"
#include "vmcore/zip.h"
*******************************************************************************/
-#if defined(__LINUX__)
static int scandir_filter(const struct dirent *a)
-#else
-static int scandir_filter(struct dirent *a)
-#endif
{
s4 namlen;
*******************************************************************************/
-void suck_add_from_property(char *key)
+void suck_add_from_property(const char *key)
{
- char *value;
- char *start;
- char *end;
+ const char *value;
+ const char *start;
+ const char *end;
char *path;
s4 pathlen;
struct dirent **namelist;
/* scan the directory found for zip/jar files */
- n = system_scandir(path, &namelist, scandir_filter, alphasort);
+ n = os_scandir(path, &namelist, scandir_filter, alphasort);
/* On error, just continue, this should be ok. */
/* Allocate memory for bootclasspath. */
- boot_class_path = properties_get("sun.boot.class.path");
+ // FIXME Make boot_class_path const char*.
+ boot_class_path = (char*) properties_get("sun.boot.class.path");
p = MNEW(char,
pathlen + strlen("/") + namlen +
strcpy(path, lce->path);
strcat(path, filename);
- classfile = system_fopen(path, "r");
+ classfile = os_fopen(path, "r");
if (classfile) { /* file exists */
- if (!system_stat(path, &buffer)) { /* read classfile data */
+ if (!os_stat(path, &buffer)) { /* read classfile data */
cb = NEW(classbuffer);
cb->clazz = c;
cb->size = buffer.st_size;
/* read class data */
- len = system_fread((void *) cb->data, 1, cb->size,
+ len = os_fread((void *) cb->data, 1, cb->size,
classfile);
if (len != buffer.st_size) {
/* close the class file */
- system_fclose(classfile);
+ os_fclose(classfile);
}
}