Fixed some CC:T errors

Author: MCJack123

craftos2-lua

@@ -1,4 +1,5 @@
 config.set("abortTimeout", 3000) -- to speed things up a bit
+config.set("standardsMode", true)
 config.add("http_blacklist", "$private")
 if ... == "debugger" then
     periphemu.create("left", "debugger")

resources/CCT-Test-Bootstrap.lua

@@ -123,8 +123,10 @@ static std::vector<path_t> fixpath_multiple(Computer *comp, std::string path) {
 static std::string normalizePath(const path_t& basePath) {
     path_t cleanPath;
     for (const auto& p : basePath) {
-        if (std::regex_match(p.native(), pathregex("^\\.\\.\\.+$"))) cleanPath /= ".";
-        else cleanPath /= p;
+        path_t::string_type str = p.native();
+        str.erase(std::remove_if(str.begin(), str.end(), [](path_t::string_type::value_type c)->bool {return c == '"' || c == '*' || c == ':' || c == '<' || c == '>' || c == '?' || c == '|' || c < 32;}), str.end());
+        if (std::regex_match(str, pathregex("^\\.\\.\\.+$"))) cleanPath /= ".";
+        else cleanPath /= path_t(str);
     }
     cleanPath = cleanPath.lexically_normal();
     if (path_t::preferred_separator != (path_t::value_type)'/') {
@@ -246,15 +248,16 @@ static int fs_isReadOnly(lua_State *L) {
 
 static int fs_getName(lua_State *L) {
     lastCFunction = __func__;
-    pushstring(L, path_t(normalizePath(checkstring(L, 1))).filename().string());
+    std::string retval = path_t(normalizePath(checkstring(L, 1))).filename().string();
+    if (retval.empty()) lua_pushliteral(L, "root");
+    else pushstring(L, retval);
     return 1;
 }
 
 static int fs_getDrive(lua_State *L) {
     lastCFunction = __func__;
     std::string retval;
-    std::string str = checkstring(L, 1);
-    fixpath_mkdir(get_comp(L), str + "/a", false, &retval);
+    if (fixpath(get_comp(L), checkstring(L, 1), true, true, &retval).empty()) return 0;
     lua_pushstring(L, retval.c_str());
     return 1;
 }

src/apis/fs.cpp

@@ -74,10 +74,10 @@ int fs_handle_readAll(lua_State *L) {
         lua_pushliteral(L, "");
         return 1;
     }
-    if (!fp->good()) return 0;
+    if (fp->bad() || fp->fail()) return 0;
     const long pos = (long)fp->tellg();
     fp->seekg(0, std::ios::end);
-    if (!fp->good()) return 0;
+    if (fp->bad() || fp->fail()) return 0;
     long size = (long)fp->tellg() - pos;
     char * retval = new char[size + 1];
     memset(retval, 0, size + 1);
@@ -170,8 +170,12 @@ int fs_handle_readAllByte(lua_State *L) {
     lastCFunction = __func__;
     std::iostream * fp = *(std::iostream**)lua_touserdata(L, lua_upvalueindex(1));
     if (fp == NULL) return luaL_error(L, "attempt to use a closed file");
-    if (fp->eof()) return 0;
-    if (!fp->good()) return luaL_error(L, "Could not read file");
+    if (fp->eof()) {
+        if (fp->tellg() < 1) return 0;
+        lua_pushliteral(L, "");
+        return 1;
+    }
+    if (fp->bad() || fp->fail()) return luaL_error(L, "Could not read file");
     std::streampos pos = fp->tellg();
     fp->seekg(0, std::ios_base::end);
     size_t size = fp->tellg() - pos;