lua: honour size argument in recv() function

[project/uhttpd.git] / lua.c

diff --git a/lua.c b/lua.c
index 7cc05d9e0b798cff55d2553e039d5668c6576b14..abae88cb26c8db6dcb5ffadc3e445d79790fa088 100644 (file)
--- a/lua.c
+++ b/lua.c
@@ -1,23 +1,22 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-
 #include <libubox/blobmsg.h>
 #include <lua.h>
 #include <lauxlib.h>
@@ -47,13 +46,14 @@ static int uh_lua_recv(lua_State *L)
        int len;
        int r;
 
-       len = luaL_checknumber(L, 1);
+       len = luaL_optnumber(L, 1, LUAL_BUFFERSIZE);
        luaL_buffinit(L, &B);
        while(len > 0) {
                char *buf;
 
                buf = luaL_prepbuffer(&B);
-               r = read(STDIN_FILENO, buf, LUAL_BUFFERSIZE);
+               r = read(STDIN_FILENO, buf,
+                        len < LUAL_BUFFERSIZE ? len : LUAL_BUFFERSIZE);
                if (r < 0) {
                        if (errno == EWOULDBLOCK || errno == EAGAIN) {
                                pfd.revents = 0;
@@ -73,6 +73,7 @@ static int uh_lua_recv(lua_State *L)
 
                luaL_addsize(&B, r);
                data_len += r;
+               len -= r;
                if (r != LUAL_BUFFERSIZE)
                        break;
        }
@@ -145,7 +146,7 @@ static lua_State *uh_lua_state_init(void)
        lua_State *L;
        int ret;
 
-       L = lua_open();
+       L = luaL_newstate();
        luaL_openlibs(L);
 
        /* build uhttpd api table */
@@ -219,9 +220,14 @@ static void lua_main(struct client *cl, struct path_info *pi, char *url)
        path_len = strlen(url);
        str = strchr(url, '?');
        if (str) {
-               pi->query = str;
+               if (*(str + 1))
+                       pi->query = str + 1;
                path_len = str - url;
        }
+
+       if (prefix_len > 0 && conf.lua_prefix[prefix_len - 1] == '/')
+               prefix_len--;
+
        if (path_len > prefix_len) {
                lua_pushlstring(L, url + prefix_len,
                                path_len - prefix_len);
@@ -255,7 +261,7 @@ static void lua_main(struct client *cl, struct path_info *pi, char *url)
 
                printf("Status: 500 Internal Server Error\r\n\r\n"
               "Unable to launch the requested Lua program:\n"
-              "  %s: %s\n", pi->phys, strerror(errno));
+              "  %s: %s\n", pi->phys, error);
        }
 
        exit(0);
@@ -281,6 +287,7 @@ static bool check_lua_url(const char *url)
 }
 
 static struct dispatch_handler lua_dispatch = {
+       .script = true,
        .check_url = check_lua_url,
        .handle_request = lua_handle_request,
 };
@@ -294,6 +301,6 @@ static int lua_plugin_init(const struct uhttpd_ops *o, struct config *c)
        return 0;
 }
 
-const struct uhttpd_plugin uhttpd_plugin = {
+struct uhttpd_plugin uhttpd_plugin = {
        .init = lua_plugin_init,
 };