diff options
| -rw-r--r-- | src/lpm.c | 30 | ||||
| -rw-r--r-- | src/lpm.lua | 13 |
2 files changed, 22 insertions, 21 deletions
@@ -425,10 +425,10 @@ static int lpm_fetch(lua_State* L) { return 0; } -static int mbedtls_snprintf(char* buffer, int len, int status, const char* str, ...) { - char mbed_buffer[128]; +static int mbedtls_snprintf(int mbedtls, char* buffer, int len, int status, const char* str, ...) { + char mbed_buffer[256]; mbedtls_strerror(status, mbed_buffer, sizeof(mbed_buffer)); - int error_len = strlen(mbed_buffer); + int error_len = mbedtls ? strlen(mbed_buffer) : strlen(strerror(status)); va_list va; int offset = 0; va_start(va, str); @@ -437,7 +437,7 @@ static int mbedtls_snprintf(char* buffer, int len, int status, const char* str, if (offset < len - 2) { strcat(buffer, ": "); if (offset < len - error_len - 2) - strcat(buffer, mbed_buffer); + strcat(buffer, mbedtls ? mbed_buffer : strerror(status)); } return strlen(buffer); } @@ -786,20 +786,20 @@ static int lpm_get(lua_State* L) { ssl_ctx = &ssl_context; mbedtls_ssl_init(&ssl_context); if ((status = mbedtls_ssl_setup(&ssl_context, &ssl_config)) != 0) { - mbedtls_snprintf(err, sizeof(err), status, "can't set up ssl for %s: %d", hostname, status); goto cleanup; + mbedtls_snprintf(1, err, sizeof(err), status, "can't set up ssl for %s: %d", hostname, status); goto cleanup; } net_ctx = &net_context; mbedtls_net_init(&net_context); mbedtls_net_set_block(&net_context); mbedtls_ssl_set_bio(&ssl_context, &net_context, mbedtls_net_send, NULL, mbedtls_net_recv_timeout); if ((status = mbedtls_net_connect(&net_context, hostname, port, MBEDTLS_NET_PROTO_TCP)) != 0) { - mbedtls_snprintf(err, sizeof(err), status, "can't connect to hostname %s", hostname); goto cleanup; + mbedtls_snprintf(1, err, sizeof(err), status, "can't connect to hostname %s", hostname); goto cleanup; } else if ((status = mbedtls_ssl_set_hostname(&ssl_context, hostname)) != 0) { - mbedtls_snprintf(err, sizeof(err), status, "can't set hostname %s", hostname); goto cleanup; + mbedtls_snprintf(1, err, sizeof(err), status, "can't set hostname %s", hostname); goto cleanup; } else if ((status = mbedtls_ssl_handshake(&ssl_context)) != 0) { - mbedtls_snprintf(err, sizeof(err), status, "can't handshake with %s", hostname); goto cleanup; + mbedtls_snprintf(1, err, sizeof(err), status, "can't handshake with %s", hostname); goto cleanup; } else if (((status = mbedtls_ssl_get_verify_result(&ssl_context)) != 0) && !no_verify_ssl) { - mbedtls_snprintf(err, sizeof(err), status, "can't verify result for %s", hostname); goto cleanup; + mbedtls_snprintf(1, err, sizeof(err), status, "can't verify result for %s", hostname); goto cleanup; } } else { int port = luaL_checkinteger(L, 3); @@ -832,14 +832,14 @@ static int lpm_get(lua_State* L) { int buffer_length = snprintf(buffer, sizeof(buffer), "GET %s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\n\r\n", rest, hostname); buffer_length = lpm_socket_write(s, buffer, buffer_length, ssl_ctx); if (buffer_length < 0) { - snprintf(err, sizeof(err), "can't write to socket %s: %s", hostname, strerror(errno)); goto cleanup; + mbedtls_snprintf(ssl_ctx ? 1 : 0, err, sizeof(err), ssl_ctx ? buffer_length : errno, "can't write to socket %s", hostname); goto cleanup; } int bytes_read = 0; const char* header_end = NULL; while (!header_end && bytes_read < sizeof(buffer)) { buffer_length = lpm_socket_read(s, &buffer[bytes_read], sizeof(buffer) - bytes_read - 1, ssl_ctx); if (buffer_length < 0) { - snprintf(err, sizeof(err), "can't read from socket %s: %s", hostname,strerror(errno)); goto cleanup; + mbedtls_snprintf(ssl_ctx ? 1 : 0, err, sizeof(err), ssl_ctx ? buffer_length : errno, "can't read from socket %s", hostname); goto cleanup; } bytes_read += buffer_length; buffer[bytes_read] = 0; @@ -882,9 +882,9 @@ static int lpm_get(lua_State* L) { fwrite(header_end, sizeof(char), body_length, file); while (content_length == -1 || remaining > 0) { int length = lpm_socket_read(s, buffer, sizeof(buffer), ssl_ctx); - if (length == 0) break; + if (length == 0 || (ssl_ctx && content_length == -1 && length == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)) break; if (length < 0) { - snprintf(err, sizeof(err), "error retrieving full response for %s%s: %s (%d)", hostname, rest, strerror(errno), length); goto cleanup; + mbedtls_snprintf(ssl_ctx ? 1 : 0, err, sizeof(err), ssl_ctx ? length : errno, "error retrieving full response for %s%s", hostname, rest); goto cleanup; } if (callback_function) { lua_pushvalue(L, callback_function); @@ -904,9 +904,9 @@ static int lpm_get(lua_State* L) { luaL_addlstring(&B, header_end, body_length); while (content_length == -1 || remaining > 0) { int length = lpm_socket_read(s, buffer, sizeof(buffer), ssl_ctx); - if (length == 0) break; + if (length == 0 || (ssl_ctx && content_length == -1 && length == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)) break; if (length < 0) { - snprintf(err, sizeof(err), "error retrieving full response for %s%s: %s (%d)", hostname, rest, strerror(errno), length); goto cleanup; + mbedtls_snprintf(ssl_ctx ? 1 : 0, err, sizeof(err), ssl_ctx ? length : errno, "error retrieving full response for %s%s", hostname, rest); goto cleanup; } if (callback_function) { lua_pushvalue(L, callback_function); diff --git a/src/lpm.lua b/src/lpm.lua index 9ab9028..bfb9fb4 100644 --- a/src/lpm.lua +++ b/src/lpm.lua @@ -1487,11 +1487,12 @@ end local function lpm_addon_list(type, id) local max_id = 4 - local result = { [(type or "addon") .. "s"] = { } } + local plural = (type or "addon") .. "s" + local result = { [plural] = { } } for j,addon in ipairs(common.grep(system_bottle:all_addons(), function(p) return (not type or p.type == type) and (not id or p.id:find(id)) end)) do max_id = math.max(max_id, #addon.id) local repo = addon.repository - table.insert(result[(type or "addon") .. "s"], { + table.insert(result[plural], { id = addon.id, status = addon.repository and (addon:is_installed(system_bottle) and "installed" or (system_bottle.lite_xl:is_compatible(addon) and "available" or "incompatible")) or (addon:is_bundled(system_bottle) and "bundled" or (addon:is_core(system_bottle) and "core" or (addon:is_upgradable(system_bottle) and "upgradable" or "orphan"))), version = "" .. addon.version, @@ -1509,12 +1510,12 @@ local function lpm_addon_list(type, id) end if JSON then io.stdout:write(json.encode(result) .. "\n") - elseif #result.addons > 0 then + elseif #result[plural] > 0 then if not VERBOSE then print(string.format("%" .. max_id .."s | %10s | %10s | %10s | %s", "ID", "Version", "Type", "ModVer", "Status")) print(string.format("%" .. max_id .."s | %10s | %10s | %10s | %s", string.rep("-", max_id), "-------", "----", "------", "-----------")) end - for i, addon in ipairs(common.sort(result.addons, function(a,b) return a.id < b.id end)) do + for i, addon in ipairs(common.sort(result[plural], function(a,b) return a.id < b.id end)) do if VERBOSE then if i ~= 0 then print("---------------------------") end print("ID: " .. addon.id) @@ -1869,8 +1870,8 @@ in any circumstance unless explicitly supplied. os.exit(0) end if ARGS[2] == "download" then - local file = common.get(ARGS[3]); - print(file) + local file = common.get(ARGS[3], ARGS[4]); + if file then print(file) end os.exit(0) end if ARGS[2] == "extract" then |