mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util-src/Makefile, util-src/encodings.c{,pp}: Port ICU code to C, rename encodings.cpp back to .c and amend the Makefile accordingly

Browse source
This commit is contained in:
Matthew Wild 2010-12-17 22:32:21 +00:00
parent b18b85670f
commit 1f3e0e60e4
2 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util-src/Makefile
View file

@ -13,11 +13,11 @@ LD?=gcc
.SUFFIXES: .c .o .so .SUFFIXES: .c .o .so
encodings.o: encodings.o:
$(CXX) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.cpp $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
encodings.so: encodings.o encodings.so: encodings.o
MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
$(CXX) $(LDFLAGS) $(IDNA_LIBS) -o encodings.so encodings.o -lcrypto $(CC) $(LDFLAGS) $(IDNA_LIBS) -o encodings.so encodings.o -lcrypto
.c.o: .c.o:
$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $< $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $<

80
util-src/encodings.cpp → util-src/encodings.c
View file

@ -15,15 +15,12 @@
// Newer MSVC compilers deprecate strcpy as unsafe, but we use it in a safe way // Newer MSVC compilers deprecate strcpy as unsafe, but we use it in a safe way
#define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE
extern "C" {
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "lua.h" #include "lua.h"
#include "lauxlib.h" #include "lauxlib.h"
}
/***************** BASE64 *****************/
#define LUALIB_API extern "C" /***************** BASE64 *****************/
static const char code[]= static const char code[]=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@ -122,9 +119,9 @@ static const luaL_Reg Reg_base64[] =
/***************** STRINGPREP *****************/ /***************** STRINGPREP *****************/
#ifndef USE_STRINGPREP_ICU #ifndef USE_STRINGPREP_ICU
/****************** libidn ********************/ /****************** libidn ********************/
extern "C" {
#include <stringprep.h> #include <stringprep.h>
}
static int stringprep_prep(lua_State *L, const Stringprep_profile *profile) static int stringprep_prep(lua_State *L, const Stringprep_profile *profile)
{ {
size_t len; size_t len;
@ -170,36 +167,41 @@ static const luaL_Reg Reg_stringprep[] =
#else #else
#include <unicode/usprep.h> #include <unicode/usprep.h>
#include <unicode/unistr.h> #include <unicode/ustring.h>
#include <unicode/utrace.h> #include <unicode/utrace.h>
static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile) static int icu_stringprep_prep(lua_State *L, const UStringPrepProfile *profile)
{ {
size_t len; size_t input_len;
const char *s; int32_t unprepped_len, prepped_len, output_len;
UnicodeString ustr; const char *input;
UErrorCode err = U_ZERO_ERROR;
UChar dest[1024];
char output[1024]; char output[1024];
UChar unprepped[1024]; /* Temporary unicode buffer (1024 characters) */
UChar prepped[1024];
UErrorCode err = U_ZERO_ERROR;
if(!lua_isstring(L, 1)) { if(!lua_isstring(L, 1)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} }
s = lua_tolstring(L, 1, &len); input = lua_tolstring(L, 1, &input_len);
if (len >= 1024) { if (input_len >= 1024) {
lua_pushnil(L); lua_pushnil(L);
return 1; // TODO return error message return 1;
} }
ustr = UnicodeString::fromUTF8(s); u_strFromUTF8(unprepped, 1024, &unprepped_len, input, input_len, &err);
len = usprep_prepare(profile, ustr.getBuffer(), ustr.length(), dest, 1024, 0, NULL, &err); prepped_len = usprep_prepare(profile, unprepped, unprepped_len, prepped, 1024, 0, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
CheckedArrayByteSink output_sink(output, 1024); u_strToUTF8(output, 1024, &output_len, prepped, prepped_len, &err);
UnicodeString dest_str(TRUE, dest, len); if(output_len < 1024)
dest_str.toUTF8(output_sink); lua_pushlstring(L, output, output_len);
lua_pushstring(L, output); else
lua_pushnil(L);
return 1; return 1;
} }
} }
@ -242,8 +244,10 @@ static const luaL_Reg Reg_stringprep[] =
/***************** IDNA *****************/ /***************** IDNA *****************/
#ifndef USE_STRINGPREP_ICU #ifndef USE_STRINGPREP_ICU
/****************** libidn ********************/ /****************** libidn ********************/
#include <idna.h> #include <idna.h>
#include <idn-free.h> #include <idn-free.h>
static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
{ {
size_t len; size_t len;
@ -284,23 +288,24 @@ static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */
static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
{ {
size_t len; size_t len;
int32_t out_len; int32_t ulen, dest_len, output_len;
const char *s = luaL_checklstring(L, 1, &len); const char *s = luaL_checklstring(L, 1, &len);
UnicodeString ustr; UChar ustr[1024];
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
UChar dest[1024]; UChar dest[1024];
char output[1024]; char output[1024];
ustr = UnicodeString::fromUTF8(s); u_strFromUTF8(ustr, 1024, &ulen, s, len, &err);
out_len = uidna_IDNToASCII(ustr.getBuffer(), ustr.length(), dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err); dest_len = uidna_IDNToASCII(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
CheckedArrayByteSink output_sink(output, 1024); u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err);
UnicodeString dest_str(TRUE, dest, out_len); if(output_len < 1024)
dest_str.toUTF8(output_sink); lua_pushlstring(L, output, output_len);
lua_pushstring(L, output); else
lua_pushnil(L);
return 1; return 1;
} }
} }
@ -308,23 +313,24 @@ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */
static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */ static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */
{ {
size_t len; size_t len;
int32_t out_len; int32_t ulen, dest_len, output_len;
const char *s = luaL_checklstring(L, 1, &len); const char *s = luaL_checklstring(L, 1, &len);
UnicodeString ustr; UChar* ustr;
UErrorCode err = U_ZERO_ERROR; UErrorCode err = U_ZERO_ERROR;
UChar dest[1024]; UChar dest[1024];
char output[1024]; char output[1024];
ustr = UnicodeString::fromUTF8(s); u_strFromUTF8(ustr, 1024, &ulen, s, len, &err);
out_len = uidna_IDNToUnicode(ustr.getBuffer(), ustr.length(), dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err); dest_len = uidna_IDNToUnicode(ustr, ulen, dest, 1024, UIDNA_USE_STD3_RULES, NULL, &err);
if (U_FAILURE(err)) { if (U_FAILURE(err)) {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} else { } else {
CheckedArrayByteSink output_sink(output, 1024); u_strToUTF8(output, 1024, &output_len, dest, dest_len, &err);
UnicodeString dest_str(TRUE, dest, out_len); if(output_len < 1024)
dest_str.toUTF8(output_sink); lua_pushlstring(L, output, output_len);
lua_pushstring(L, output); else
lua_pushnil(L);
return 1; return 1;
} }
} }