diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2010-11-17 21:56:45 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2010-11-17 21:56:45 +0000 |
| commit | bea61e2d012ba85fe37f09bd1a90e0150c1d0cb7 (patch) | |
| tree | 930a1ed94fc15abeb8c0eabc77461ae9a52356d7 | |
| parent | added rawio lua module (diff) | |
rawio: fixed return value at read
cleanups
git-svn-id: https://svn.spreadspace.org/gcsd/trunk@38 ac14a137-c7f1-4531-abe0-07747231d213
| -rw-r--r-- | src/l_rawio.c | 2 | ||||
| -rw-r--r-- | src/modules/debug_shell.lua | 3 | ||||
| -rw-r--r-- | src/modules/stdio.lua | 3 | ||||
| -rw-r--r-- | src/modules/stdout.lua | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/l_rawio.c b/src/l_rawio.c index 25d98ee..889aeb7 100644 --- a/src/l_rawio.c +++ b/src/l_rawio.c @@ -99,7 +99,7 @@ static int l_rawio_read(lua_State *L) size_t len = luaL_checkinteger(L,2); char* data = malloc(len); if(!data) { - lua_pushboolean(L, 0); + lua_pushnil(L); lua_pushstring(L, "bad alloc"); return 2; } diff --git a/src/modules/debug_shell.lua b/src/modules/debug_shell.lua index e30780a..576e1cc 100644 --- a/src/modules/debug_shell.lua +++ b/src/modules/debug_shell.lua @@ -118,9 +118,6 @@ function debug_shell:new(config) else self.in_buffer = self.in_buffer .. data ret = debug_shell:exec_cmd(self) - if(ret == 1) then - ret = defines.KILL_CLIENT - end self.in_buffer = "" end return ret diff --git a/src/modules/stdio.lua b/src/modules/stdio.lua index 21d314e..e4c8282 100644 --- a/src/modules/stdio.lua +++ b/src/modules/stdio.lua @@ -60,10 +60,9 @@ function stdio:new(config) if(buffer == nil) then log.printf(log.ERROR, inst.name .. ": connection error: %s", err) return defines.KILL_MODULE_CLASS - else - self.in_buffer = self.in_buffer .. buffer end + self.in_buffer = self.in_buffer .. buffer -- TODO: dispatch table et al command_queue:command_completed() diff --git a/src/modules/stdout.lua b/src/modules/stdout.lua index c82aa1f..b6b6c55 100644 --- a/src/modules/stdout.lua +++ b/src/modules/stdout.lua @@ -60,10 +60,10 @@ function stdout:new(config) local len, err = rawio.write(1, self.out_buffer) if(len == nil) then log.printf(log.INFO, inst.name .. ": connection error: %s", err) - ret = defines.KILL_MODULE_CLASS - else - self.out_buffer = string.sub(self.out_buffer, len+1) + return defines.KILL_MODULE_CLASS end + + self.out_buffer = string.sub(self.out_buffer, len+1) if(self.out_buffer == "") then command_queue:command_sent() command_queue:command_completed() |