Changeset 179

Timestamp:

12/29/09 23:25:39 (8 months ago)

Author:

sausage

Message:

Fix usage of errno,
Removed scriptlibc

Location:

eoserv/trunk

Files:

• Makefile.all (modified) (1 diff)
• config.ini (modified) (1 diff)
• project/mingw.cbp (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)
• src/script.cpp (modified) (1 diff)
• src/scriptlibc.cpp (deleted)
• src/scriptlibc.h (deleted)
• src/scriptreg.cpp (modified) (2 diffs)

eoserv/trunk/Makefile.all

@@ -48 +48 @@
        $(OBJDIR)/player.o \
        $(OBJDIR)/script.o \
-       $(OBJDIR)/scriptlibc.o \
        $(OBJDIR)/scriptreg.o \
        $(OBJDIR)/sha256.o \

eoserv/trunk/config.ini

@@ -163 +163 @@
 # Disable this if you're paranoid
 ScriptFileAccess = yes
-
-## ScriptLibCAccess (bool)
-# Allows scripts to access libc functions directly
-# Disable this if you're paranoid
-ScriptLibCAccess = yes
 
 ## ScriptMaxExecTime (number)

eoserv/trunk/project/mingw.cbp

@@ -236 +236 @@
                 <Unit filename="..\src\script.cpp" />
                 <Unit filename="..\src\script.hpp" />
-                <Unit filename="..\src\scriptlibc.cpp" />
-                <Unit filename="..\src\scriptlibc.h" />
                 <Unit filename="..\src\scriptreg.cpp" />
                 <Unit filename="..\src\scriptreg.hpp" />

eoserv/trunk/src/main.cpp

@@ -6 +6 @@
 
 #include <csignal>
+#include <cerrno>
 
 #include "character.hpp"
@@ -277 +278 @@
                 eoserv_config_default(config, "ProtectMaps"        , false);
                 eoserv_config_default(config, "ScriptFileAccess"   , true);
-                eoserv_config_default(config, "ScriptLibCAccess"   , true);
                 eoserv_config_default(config, "ScriptMaxExecTime"  , 1500);
                 eoserv_config_default(config, "SLN"                , true);

eoserv/trunk/src/script.cpp

@@ -8 +8 @@
 
 #include <cstdio>
+#include <cerrno>
 
 #include "console.hpp"

eoserv/trunk/src/scriptreg.cpp

@@ -13 +13 @@
 #include <angelscript/scriptdictionary.h>
 #include <angelscript/scriptfile.h>
-#include "./scriptlibc.h"
 
 #include "container/container.hpp"
@@ -67 +66 @@
         {
                 RegisterScriptFile(engine->as);
-        }
-
-        if (world.config["ScriptLibCAccess"])
-        {
-                RegisterScriptLibC(engine->as);
         }