AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix Windows build errors introduced by zip.extract() commit

Browse Source
This commit is contained in:
Jason Perkins 2015-07-31 16:50:36 -04:00
parent 6f2d3b9f18
commit aa31909d1d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/host/http.c
View File

@ -47,8 +47,8 @@ static int curl_progress_cb(void* userdata, double dltotal, double dlnow,
/* retrieve the lua progress callback we saved before */ /* retrieve the lua progress callback we saved before */
lua_rawgeti(L, LUA_REGISTRYINDEX, state->RefIndex); lua_rawgeti(L, LUA_REGISTRYINDEX, state->RefIndex);
lua_pushnumber(L, dltotal); lua_pushnumber(L, (lua_Number)dltotal);
lua_pushnumber(L, dlnow); lua_pushnumber(L, (lua_Number)dlnow);
lua_pcall(L, 2, LUA_MULTRET, 0); lua_pcall(L, 2, LUA_MULTRET, 0);
return 0; return 0;

14
src/host/zip_extract.c
View File

@ -93,7 +93,7 @@ extern int do_mkdir(const char* path);
static void parse_path(const char* full_name, char* filename, char* directory) static void parse_path(const char* full_name, char* filename, char* directory)
{ {
char *ssc; const char *ssc;
size_t orig_length = strlen(full_name); size_t orig_length = strlen(full_name);
size_t l = 0; size_t l = 0;
size_t dir_size; size_t dir_size;
@ -142,15 +142,17 @@ static int extract(const char* src, const char* destination)
for (i = 0, entries = zip_get_num_entries(z_archive, 0); i < entries; ++i) for (i = 0, entries = zip_get_num_entries(z_archive, 0); i < entries; ++i)
{ {
zip_uint8_t opsys;
zip_uint32_t attrib;
const char* full_name;
struct zip_file* zf = zip_fopen_index(z_archive, i, 0); struct zip_file* zf = zip_fopen_index(z_archive, i, 0);
if (!zf) if (!zf)
continue; continue;
zip_uint8_t opsys;
zip_uint32_t attrib;
zip_file_get_external_attributes(z_archive, i, 0, &opsys, &attrib); zip_file_get_external_attributes(z_archive, i, 0, &opsys, &attrib);
const char* full_name = zip_get_name(z_archive, i, 0); full_name = zip_get_name(z_archive, i, 0);
sprintf(appended_full_name, "%s/%s", destination, full_name); sprintf(appended_full_name, "%s/%s", destination, full_name);
parse_path(appended_full_name, filename, directory); parse_path(appended_full_name, filename, directory);
@ -161,7 +163,7 @@ static int extract(const char* src, const char* destination)
{ {
bytes_read = zip_fread(zf, buffer, sizeof(buffer)); bytes_read = zip_fread(zf, buffer, sizeof(buffer));
buffer[bytes_read] = '\0'; buffer[bytes_read] = '\0';
if (write_link(appended_full_name, buffer, bytes_read) != 0) if (write_link(appended_full_name, buffer, (size_t)bytes_read) != 0)
{ {
printf(" Failed to create symbolic link [%s->%s]\n", appended_full_name, buffer); printf(" Failed to create symbolic link [%s->%s]\n", appended_full_name, buffer);
return -1; return -1;
@ -222,7 +224,7 @@ int zip_extract(lua_State* L)
int res = extract(src, dst); int res = extract(src, dst);
lua_pushnumber(L, res); lua_pushnumber(L, (lua_Number)res);
return 1; return 1;
} }