diff options
70 files changed, 255 insertions, 262 deletions
@@ -6,7 +6,7 @@ #if HAVE_CONFIG_H #include "cgi/cgi_config.h" #endif -#include "../unicode/unicode.h" +#include <unicode.h> #ifdef __cplusplus diff --git a/curses/cursesscreen.C b/curses/cursesscreen.C index 0b0458a..ede242c 100644 --- a/curses/cursesscreen.C +++ b/curses/cursesscreen.C @@ -46,7 +46,7 @@ int Curses::getColorCount() CursesScreen::KeyReader::KeyReader() - : h(iconv_open(libmail_u_ucs4_native, unicode_default_chset())), + : h(iconv_open(unicode_u_ucs4_native, unicode_default_chset())), winput_cnt(0) { if (h == (iconv_t)-1) diff --git a/gpglib/Makefile.am b/gpglib/Makefile.am index 3ea6fbd..ea048d4 100644 --- a/gpglib/Makefile.am +++ b/gpglib/Makefile.am @@ -17,17 +17,17 @@ libgpg_la_SOURCES=checksign.c delete.c export.c fork.c genkey.c gpg.c gpglib.h\ sign.c tempname.c tempname.h testgpg_SOURCES=testgpg.c -testgpg_LDADD=libgpg.la ../unicode/libunicode.la ../numlib/libnumlib.la +testgpg_LDADD=libgpg.la ../numlib/libnumlib.la -lunicode testgpg_DEPENDENCIES=$(testgpg_LDADD) testgpg_LDFLAGS=-static mimegpg_SOURCES=mimegpg.c mimegpg_LDADD=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ ../rfc822/libencode.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode mimegpg_DEPENDENCIES=libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la\ ../rfc822/libencode.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode BUILT_SOURCES=gpg.h mimegpg.html mimegpg.1 EXTRA_DIST=mimegpg.html mimegpg.1 README.html diff --git a/gpglib/checksign.c b/gpglib/checksign.c index a5333ba..62143cd 100644 --- a/gpglib/checksign.c +++ b/gpglib/checksign.c @@ -12,11 +12,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/delete.c b/gpglib/delete.c index 53943c9..1ecf66b 100644 --- a/gpglib/delete.c +++ b/gpglib/delete.c @@ -12,11 +12,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/export.c b/gpglib/export.c index 66a4a05..c8cf5d7 100644 --- a/gpglib/export.c +++ b/gpglib/export.c @@ -14,11 +14,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/genkey.c b/gpglib/genkey.c index 9e72f1c..1703e3c 100644 --- a/gpglib/genkey.c +++ b/gpglib/genkey.c @@ -14,11 +14,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; @@ -57,19 +56,19 @@ int libmail_gpg_genkey(const char *gpgdir, char *argvec[4]; int rc; - name_u=libmail_u_convert_toutf8(name, charset, NULL); + name_u=unicode_convert_toutf8(name, charset, NULL); if (!name_u) return (-1); - addr_u=libmail_u_convert_toutf8(addr, charset, NULL); + addr_u=unicode_convert_toutf8(addr, charset, NULL); if (!addr_u) { free(name_u); return (-1); } - comment_u=libmail_u_convert_toutf8(comment, charset, NULL); + comment_u=unicode_convert_toutf8(comment, charset, NULL); if (!comment_u) return (-1); diff --git a/gpglib/import.c b/gpglib/import.c index b3cdd38..32de753 100644 --- a/gpglib/import.c +++ b/gpglib/import.c @@ -12,11 +12,11 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/list.c b/gpglib/list.c index 7b58355..146c05b 100644 --- a/gpglib/list.c +++ b/gpglib/list.c @@ -16,11 +16,10 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> - +#include <unicode.h> #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; @@ -389,7 +388,7 @@ static int dolist_callback(char *line, void *vp1, return (-1); } - userid=libmail_u_convert_fromutf8(userid, vp->charset, NULL); + userid=unicode_convert_fromutf8(userid, vp->charset, NULL); if (!userid) return (-1); @@ -541,7 +540,7 @@ int libmail_gpg_listgroups(const char *gpgdir, if (*p == 0) continue; - q=libmail_u_convert_fromutf8(p, voidarg->charset, NULL); + q=unicode_convert_fromutf8(p, voidarg->charset, NULL); if (!q) continue; diff --git a/gpglib/sign.c b/gpglib/sign.c index a92a504..9bbfec4 100644 --- a/gpglib/sign.c +++ b/gpglib/sign.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <unicode.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> @@ -18,7 +19,6 @@ #include "gpg.h" #include "gpglib.h" -#include "unicode/unicode.h" #include "numlib/numlib.h" extern int libmail_gpg_stdin, libmail_gpg_stdout, libmail_gpg_stderr; diff --git a/gpglib/testgpg.c b/gpglib/testgpg.c index a08620b..942abd4 100644 --- a/gpglib/testgpg.c +++ b/gpglib/testgpg.c @@ -8,7 +8,7 @@ #include "config.h" #include "gpglib.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include <stdio.h> diff --git a/imap/Makefile.am b/imap/Makefile.am index 0c544f6..4510f36 100644 --- a/imap/Makefile.am +++ b/imap/Makefile.am @@ -53,7 +53,7 @@ libimapd_la_SOURCES=mainloop.c imaptoken.c imaptoken.h imapwrite.c \ imapwrite.h capability.c externalauth.c smap.c smapsnapshot.c libimapd_la_LIBADD= ../rfc2045/librfc2045.la ../maildir/libmaildir.la \ ../rfc822/librfc822.la ../liblock/liblock.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode libimapd_la_LDFLAGS=-static imaplogin_SOURCES=imaplogin.c authenticate_auth.c proxy.c proxy.h diff --git a/imap/imapd.c b/imap/imapd.c index 497850d..ad9f455 100644 --- a/imap/imapd.c +++ b/imap/imapd.c @@ -85,7 +85,7 @@ #include "maildir/maildirinfo.h" #include "maildir/loginexec.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "maildir/maildirkeywords.h" #include "courierauth.h" @@ -4115,14 +4115,14 @@ int folder_rename(struct maildir_info *mi1, static int validate_charset(const char *tag, char **charset) { - libmail_u_convert_handle_t conv; + unicode_convert_handle_t conv; unicode_char *ucptr; size_t ucsize; if (*charset == NULL) *charset=my_strdup("ISO-8859-1"); - conv=libmail_u_convert_tou_init(*charset, &ucptr, &ucsize, 1); + conv=unicode_convert_tou_init(*charset, &ucptr, &ucsize, 1); if (!conv) { @@ -4130,7 +4130,7 @@ static int validate_charset(const char *tag, char **charset) writes(" NO [BADCHARSET] The requested character set is not supported.\r\n"); return (-1); } - if (libmail_u_convert_deinit(conv, NULL) == 0) + if (unicode_convert_deinit(conv, NULL) == 0) free(ucptr); return (0); } diff --git a/imap/mailboxlist.c b/imap/mailboxlist.c index a204ebf..f65fa31 100644 --- a/imap/mailboxlist.c +++ b/imap/mailboxlist.c @@ -64,7 +64,7 @@ #include "maildir/maildiraclt.h" #include "maildir/maildirnewshared.h" #include "maildir/maildirinfo.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "courierauth.h" diff --git a/imap/search.c b/imap/search.c index e532dcd..e14e5a9 100644 --- a/imap/search.c +++ b/imap/search.c @@ -22,7 +22,7 @@ #include "rfc822/rfc822hdr.h" #include "rfc822/rfc2047.h" #include "rfc2045/rfc2045.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include "searchinfo.h" #include "imapwrite.h" @@ -883,7 +883,7 @@ static int fill_search_header_done(const char *name, void *arg) struct searchinfo *sip; int issubject=rfc822hdr_namecmp(name, "subject"); size_t j; - libmail_u_convert_handle_t conv; + unicode_convert_handle_t conv; unicode_char *ucptr; size_t ucsize; int rc; @@ -929,16 +929,16 @@ static int fill_search_header_done(const char *name, void *arg) maildir_search_reset(&sip->sei); - conv=libmail_u_convert_tou_init("utf-8", &ucptr, + conv=unicode_convert_tou_init("utf-8", &ucptr, &ucsize, 0); if (!conv) break; - rc=libmail_u_convert(conv, decodeinfo->utf8buf, + rc=unicode_convert(conv, decodeinfo->utf8buf, decodeinfo->utf8buflen-1); - if (libmail_u_convert_deinit(conv, NULL)) + if (unicode_convert_deinit(conv, NULL)) break; if (rc) @@ -972,7 +972,7 @@ static int fill_search_header_done(const char *name, void *arg) struct fill_search_body_info { struct searchinfo *si; - libmail_u_convert_handle_t toucs4_handle; + unicode_convert_handle_t toucs4_handle; }; @@ -1003,12 +1003,12 @@ static void fill_search_body(struct searchinfo *si, decodeinfo.si=si; if ((decodeinfo.toucs4_handle= - libmail_u_convert_init("utf-8", - libmail_u_ucs4_native, + unicode_convert_init("utf-8", + unicode_u_ucs4_native, fill_search_body_ucs4, &decodeinfo)) == NULL) { - write_error_exit("libmail_u_convert_init"); + write_error_exit("unicode_convert_init"); } for (sip=decodeinfo.si; sip; sip=sip->next) @@ -1019,7 +1019,7 @@ static void fill_search_body(struct searchinfo *si, break; } - libmail_u_convert_deinit(decodeinfo.toucs4_handle, NULL); + unicode_convert_deinit(decodeinfo.toucs4_handle, NULL); rfc2045src_deinit(src); } @@ -1029,7 +1029,7 @@ static int fill_search_body_utf8(const char *str, size_t n, void *arg) struct fill_search_body_info *decodeinfo= (struct fill_search_body_info *)arg; - return libmail_u_convert(decodeinfo->toucs4_handle, str, n); + return unicode_convert(decodeinfo->toucs4_handle, str, n); } static int fill_search_body_ucs4(const char *str, size_t n, void *arg) diff --git a/imap/searchinfo.c b/imap/searchinfo.c index 0f43ad2..c96d16b 100644 --- a/imap/searchinfo.c +++ b/imap/searchinfo.c @@ -11,7 +11,7 @@ #include <string.h> #include <ctype.h> #include <errno.h> -#include "unicode/unicode.h" +#include <unicode.h> #include "searchinfo.h" #include "imapwrite.h" #include "imaptoken.h" diff --git a/imap/smap.c b/imap/smap.c index 20a7c2c..9fe3253 100644 --- a/imap/smap.c +++ b/imap/smap.c @@ -59,7 +59,7 @@ #include "maildir/maildiraclt.h" #include "maildir/maildirnewshared.h" #include "maildir/maildirinfo.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "rfc2045/rfc2045.h" #include "rfc822/rfc822.h" diff --git a/imap/thread.c b/imap/thread.c index 0670f22..81cd15a 100644 --- a/imap/thread.c +++ b/imap/thread.c @@ -17,7 +17,7 @@ #include "rfc822/rfc822.h" #include "rfc822/rfc2047.h" #include "rfc822/imaprefs.h" -#include "unicode/unicode.h" +#include <unicode.h> static void thread_os_callback(struct searchinfo *, struct searchinfo *, int, unsigned long, void *); diff --git a/libmail/addressbook.C b/libmail/addressbook.C index ca62ffc..0c19652 100644 --- a/libmail/addressbook.C +++ b/libmail/addressbook.C @@ -142,7 +142,7 @@ void mail::addressbook::setIndex(size_t messageNumber, if (newEntry.nickname.size() == 0) newEntry.nickname="(none)"; - char *p=libmail_u_convert_tobuf(newEntry + char *p=unicode_convert_tobuf(newEntry .nickname .c_str(), "utf-8", diff --git a/libmail/imapfolders.C b/libmail/imapfolders.C index 2a3fab5..cdc6031 100644 --- a/libmail/imapfolders.C +++ b/libmail/imapfolders.C @@ -427,7 +427,7 @@ bool mail::imapCREATE::taggedMessage(mail::imap &imapAccount, string msgname, // The folder name should be utf7-encoded { - char *p=libmail_u_convert_toutf8(encodedname.c_str(), + char *p=unicode_convert_toutf8(encodedname.c_str(), unicode_default_chset(), NULL); @@ -443,7 +443,7 @@ bool mail::imapCREATE::taggedMessage(mail::imap &imapAccount, string msgname, free(p); - p=libmail_u_convert_tobuf(encodedname.c_str(), + p=unicode_convert_tobuf(encodedname.c_str(), unicode_default_chset(), unicode_x_imap_modutf7, NULL); diff --git a/libmail/imaplisthandler.C b/libmail/imaplisthandler.C index cc0dc09..50de05d 100644 --- a/libmail/imaplisthandler.C +++ b/libmail/imaplisthandler.C @@ -77,7 +77,7 @@ string mail::imap::translatePath(string path) { if (!smap) { - char *p=libmail_u_convert_tobuf(path.c_str(), + char *p=unicode_convert_tobuf(path.c_str(), unicode_default_chset(), unicode_x_imap_modutf7, NULL); @@ -120,19 +120,19 @@ string mail::imap::translatePath(string path) unicode_char *uc; size_t ucsize; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; - if ((h=libmail_u_convert_tou_init(unicode_default_chset(), + if ((h=unicode_convert_tou_init(unicode_default_chset(), &uc, &ucsize, 1)) == NULL) { uc=NULL; } else { - libmail_u_convert(h, component.c_str(), + unicode_convert(h, component.c_str(), component.size()); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) uc=NULL; } @@ -197,11 +197,11 @@ string mail::imap::translatePath(string path) char *p; size_t psize; - if ((h=libmail_u_convert_fromu_init("utf-8", &p, &psize, 1)) + if ((h=unicode_convert_fromu_init("utf-8", &p, &psize, 1)) != NULL) { - libmail_u_convert_uc(h, &ucvec[0], ucvec.size()); - if (libmail_u_convert_deinit(h, NULL)) + unicode_convert_uc(h, &ucvec[0], ucvec.size()); + if (unicode_convert_deinit(h, NULL)) p=NULL; } @@ -434,7 +434,7 @@ void mail::imapLIST::get_name(mail::imap &imapAccount, Token t) if (pfixLength <= nameVal.length()) nameVal.erase(0, pfixLength); } - char *p=libmail_u_convert_tobuf(nameVal.c_str(), + char *p=unicode_convert_tobuf(nameVal.c_str(), unicode_x_imap_modutf7, unicode_default_chset(), NULL); diff --git a/libmail/mail.C b/libmail/mail.C index 81bc499..e70e9a7 100644 --- a/libmail/mail.C +++ b/libmail/mail.C @@ -670,7 +670,7 @@ string toutf8(string s) { string u; - char *p=libmail_u_convert_toutf8(s.c_str(), + char *p=unicode_convert_toutf8(s.c_str(), unicode_default_chset(), NULL); try { @@ -687,7 +687,7 @@ string fromutf8(string s) { string u; - char *p=libmail_u_convert_fromutf8(s.c_str(), unicode_default_chset(), + char *p=unicode_convert_fromutf8(s.c_str(), unicode_default_chset(), NULL); try { @@ -732,19 +732,19 @@ string mail::mbox::translatePathCommon(string path, unicode_char *uc; size_t ucsize; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; - if ((h=libmail_u_convert_tou_init(unicode_default_chset(), + if ((h=unicode_convert_tou_init(unicode_default_chset(), &uc, &ucsize, 1)) == NULL) { uc=NULL; } else { - libmail_u_convert(h, component.c_str(), + unicode_convert(h, component.c_str(), component.size()); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) uc=NULL; } diff --git a/libmail/maildirfolder.C b/libmail/maildirfolder.C index 9c54e31..32f755d 100644 --- a/libmail/maildirfolder.C +++ b/libmail/maildirfolder.C @@ -58,7 +58,7 @@ mail::maildir::folder::folder(mail::maildir *maildirArg, // Convert the name of the folder from modified UTF-7 // (Courier compatibility) to the current charset. - char *s=libmail_u_convert_tobuf(name.c_str(), + char *s=unicode_convert_tobuf(name.c_str(), unicode_x_imap_modutf7, unicode_default_chset(), NULL); @@ -544,7 +544,7 @@ void mail::maildir::folder::createSubFolder(string name, bool isDirectory, // to modified UTF-7 (Courier-IMAP compatibility), with the following // blacklisted characters: - char *p=libmail_u_convert_tobuf(name.c_str(), unicode_default_chset(), + char *p=unicode_convert_tobuf(name.c_str(), unicode_default_chset(), unicode_x_imap_modutf7 " ./~:", NULL); if (!p) @@ -729,7 +729,7 @@ void mail::maildir::folder::renameFolder(const mail::folder *newParent, // to modified UTF-7 (Courier-IMAP compatibility), with the following // blacklisted characters: - char *s=libmail_u_convert_tobuf(newName.c_str(), + char *s=unicode_convert_tobuf(newName.c_str(), unicode_default_chset(), unicode_x_imap_modutf7 " ./~:", NULL); diff --git a/libmail/mboxfolder.C b/libmail/mboxfolder.C index d75f15b..e78c3f0 100644 --- a/libmail/mboxfolder.C +++ b/libmail/mboxfolder.C @@ -76,7 +76,7 @@ string mail::mbox::folder::defaultName(string path) path=string(c, e); - char *p=libmail_u_convert_tobuf(path.c_str(), + char *p=unicode_convert_tobuf(path.c_str(), unicode_x_imap_modutf7, unicode_default_chset(), NULL); @@ -450,7 +450,7 @@ void mail::mbox::folder::createSubFolder(string name, { string fpath; - char *p=libmail_u_convert_tobuf(name.c_str(), unicode_default_chset(), + char *p=unicode_convert_tobuf(name.c_str(), unicode_default_chset(), unicode_x_imap_modutf7 " ./~:", NULL); if (!p) diff --git a/libmail/nntp.C b/libmail/nntp.C index b7a51c5..2b86580 100644 --- a/libmail/nntp.C +++ b/libmail/nntp.C @@ -1101,16 +1101,16 @@ void mail::nntp::searchMessages(const searchParams &searchInfo, { unicode_char *uc; size_t ucsize; - libmail_u_convert_handle_t - h(libmail_u_convert_tou_init(searchInfo.charset.c_str(), + unicode_convert_handle_t + h(unicode_convert_tou_init(searchInfo.charset.c_str(), &uc, &ucsize, 0)); if (h) { - libmail_u_convert(h, searchInfo.param2.c_str(), + unicode_convert(h, searchInfo.param2.c_str(), searchInfo.param2.size()); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) uc=NULL; } else @@ -1135,13 +1135,13 @@ void mail::nntp::searchMessages(const searchParams &searchInfo, char *p; size_t psize; - h=libmail_u_convert_fromu_init("iso-8859-1", + h=unicode_convert_fromu_init("iso-8859-1", &p, &psize, 1); if (h) { - libmail_u_convert_uc(h, uc, ucsize); - if (libmail_u_convert_deinit(h, NULL)) + unicode_convert_uc(h, uc, ucsize); + if (unicode_convert_deinit(h, NULL)) p=NULL; } else diff --git a/libmail/search.C b/libmail/search.C index 0895f2e..42d504b 100644 --- a/libmail/search.C +++ b/libmail/search.C @@ -352,7 +352,7 @@ mail::searchOneMessage::~searchOneMessage() void mail::searchOneMessage::go() { - char *c=libmail_u_convert_tocase(searchInfo.param2.c_str(), + char *c=unicode_convert_tocase(searchInfo.param2.c_str(), searchInfo.charset.c_str(), unicode_uc, NULL); @@ -372,7 +372,7 @@ void mail::searchOneMessage::go() LIBMAIL_THROW(LIBMAIL_THROW_EMPTY); } - c=libmail_u_convert_tocase(searchInfo.param1.c_str(), + c=unicode_convert_tocase(searchInfo.param1.c_str(), "iso-8859-1", unicode_uc, NULL); @@ -611,7 +611,7 @@ void mail::searchOneMessage::checkNextHeader() } searchEngine.begin(bodyCharset.c_str(), - libmail_u_ucs4_native); + unicode_u_ucs4_native); switch (searchInfo.criteria) { case searchParams::header: @@ -893,7 +893,7 @@ void mail::searchOneMessage::search(string text) unicode_char *uc; size_t ucsize; - if (libmail_u_convert_tou_tobuf(value, + if (unicode_convert_tou_tobuf(value, strlen(value), "utf-8", &uc, diff --git a/maildir/Makefile.am b/maildir/Makefile.am index cabd14b..fe8e575 100644 --- a/maildir/Makefile.am +++ b/maildir/Makefile.am @@ -57,17 +57,17 @@ deliverquota_LDADD=libmaildir.la ../rfc822/librfc822.la ../numlib/libnumlib.la deliverquota_LDFLAGS=-static maildirmake_SOURCES=maildirmake.c -maildirmake_DEPENDENCIES=libmaildir.la ../unicode/libunicode.la \ +maildirmake_DEPENDENCIES=libmaildir.la \ ../numlib/libnumlib.la \ ../rfc822/librfc822.la -maildirmake_LDADD=libmaildir.la ../unicode/libunicode.la \ +maildirmake_LDADD=libmaildir.la \ ../numlib/libnumlib.la \ - ../rfc822/librfc822.la + ../rfc822/librfc822.la -lunicode maildirmake_LDFLAGS=-static testmaildirfilter_SOURCES=maildirfiltertypelist.h testmaildirfilter.c -testmaildirfilter_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la ../unicode/libunicode.la -testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la ../unicode/libunicode.la @LIBPCRE@ +testmaildirfilter_DEPENDENCIES=libmaildir.la ../numlib/libnumlib.la +testmaildirfilter_LDADD=libmaildir.la ../numlib/libnumlib.la -lunicode @LIBPCRE@ testmaildirfilter_LDFLAGS=-static maildirkwtest_SOURCES=maildirkwtest.c @@ -97,8 +97,8 @@ maildiraclttest_DEPENDENCIES=libmaildir.la ../liblock/liblock.la \ maildiraclttest_LDFLAGS=-static testmaildirsearch_SOURCES=testmaildirsearch.c -testmaildirsearch_LDADD=libmaildir.la ../unicode/libunicode.la -testmaildirsearch_DEPENDENCIES=libmaildir.la ../unicode/libunicode.la +testmaildirsearch_LDADD=libmaildir.la -lunicode +testmaildirsearch_DEPENDENCIES=libmaildir.la EXTRA_DIST=README.maildirquota.html README.maildirquota.txt \ README.imapkeywords.html \ diff --git a/maildir/maildirfilter.c b/maildir/maildirfilter.c index d994998..96b2b80 100644 --- a/maildir/maildirfilter.c +++ b/maildir/maildirfilter.c @@ -11,7 +11,7 @@ #include "autoresponse.h" #include "numlib/numlib.h" -#include "unicode/unicode.h" +#include <unicode.h> #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -105,7 +105,7 @@ int maildir_filter_ruleupdate(struct maildirfilter *r, char *value_utf8; int rc; - name_utf8=libmail_u_convert_toutf8(name ? name:"", charset, NULL); + name_utf8=unicode_convert_toutf8(name ? name:"", charset, NULL); if (!name_utf8) { @@ -113,7 +113,7 @@ int maildir_filter_ruleupdate(struct maildirfilter *r, return -1; } - header_utf8=libmail_u_convert_toutf8(header ? header:"", charset, NULL); + header_utf8=unicode_convert_toutf8(header ? header:"", charset, NULL); if (!header_utf8) { @@ -122,7 +122,7 @@ int maildir_filter_ruleupdate(struct maildirfilter *r, return -1; } - value_utf8=libmail_u_convert_toutf8(value ? value:"", charset, NULL); + value_utf8=unicode_convert_toutf8(value ? value:"", charset, NULL); if (!value_utf8) { diff --git a/maildir/maildirinfo.c b/maildir/maildirinfo.c index cb2d530..f38b484 100644 --- a/maildir/maildirinfo.c +++ b/maildir/maildirinfo.c @@ -37,7 +37,7 @@ #include "maildirmisc.h" #include "maildirnewshared.h" -#include "unicode/unicode.h" +#include <unicode.h> void maildir_info_destroy(struct maildir_info *info) { @@ -351,7 +351,7 @@ int maildir_info_imap_find(struct maildir_info *info, const char *path, */ owner_utf8= - libmail_u_convert_tobuf(info->owner, + unicode_convert_tobuf(info->owner, unicode_x_imap_modutf7, "utf-8", NULL); @@ -438,7 +438,7 @@ static char *smaptoUtf7(char **ptr) while ((n=*ptr++) != NULL && *n) { - char *p=libmail_u_convert_tobuf(n, "utf-8", + char *p=unicode_convert_tobuf(n, "utf-8", unicode_x_imap_modutf7 " ./~:", NULL); @@ -512,7 +512,7 @@ char **maildir_smapfn_fromutf7(const char *modutf7) break; } - fn[n]=libmail_u_convert_tobuf(q, + fn[n]=unicode_convert_tobuf(q, unicode_x_imap_modutf7 " ./~:", "utf-8", NULL); q += i; @@ -861,7 +861,7 @@ static size_t munge_complex(const char *, char *); char *maildir_info_imapmunge(const char *name) { - char *n=libmail_u_convert_tobuf(name, "utf8", + char *n=unicode_convert_tobuf(name, "utf8", unicode_x_imap_modutf7, NULL); char *p; size_t cnt; diff --git a/maildir/maildirmake.c b/maildir/maildirmake.c index 001032c..5173e25 100644 --- a/maildir/maildirmake.c +++ b/maildir/maildirmake.c @@ -27,7 +27,7 @@ #include "maildirmisc.h" #include "maildirsharedrc.h" #include "maildirquota.h" -#include "unicode/unicode.h" +#include <unicode.h> static void usage() { @@ -226,7 +226,7 @@ char *tmp=0; if (*p == 0 && argn+1 < argc) p=argv[++argn]; - folder=libmail_u_convert_tobuf(p, + folder=unicode_convert_tobuf(p, unicode_default_chset(), unicode_x_imap_modutf7, &converr); diff --git a/maildir/maildirsearch.c b/maildir/maildirsearch.c index 689f0de..40b7409 100644 --- a/maildir/maildirsearch.c +++ b/maildir/maildirsearch.c @@ -77,7 +77,7 @@ int maildir_search_start_str_chset(struct maildir_searchengine *engine, unicode_char *ucptr; size_t ucsize; - libmail_u_convert_handle_t h=libmail_u_convert_tou_init(chset, &ucptr, + unicode_convert_handle_t h=unicode_convert_tou_init(chset, &ucptr, &ucsize, 1); size_t i, j; int rc; @@ -85,13 +85,13 @@ int maildir_search_start_str_chset(struct maildir_searchengine *engine, if (h == NULL) return -1; - if (libmail_u_convert(h, string, strlen(string))) + if (unicode_convert(h, string, strlen(string))) { - libmail_u_convert_deinit(h, NULL); + unicode_convert_deinit(h, NULL); return -1; } - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) return -1; for (i=j=0; ucptr[i]; ) diff --git a/maildir/maildirsearch.h b/maildir/maildirsearch.h index fd4bfea..cb50a14 100644 --- a/maildir/maildirsearch.h +++ b/maildir/maildirsearch.h @@ -36,7 +36,7 @@ #include "config.h" -#include "../unicode/unicode.h" +#include <unicode.h> #include <string.h> #include <stdlib.h> diff --git a/maildir/testmaildirsearch.c b/maildir/testmaildirsearch.c index 7b16f06..504304d 100644 --- a/maildir/testmaildirsearch.c +++ b/maildir/testmaildirsearch.c @@ -13,25 +13,25 @@ static int testmaildirsearch(const char *chset, const char *needle, unicode_char *ucptr; size_t ucsize; size_t i; - libmail_u_convert_handle_t h=libmail_u_convert_tou_init(chset, &ucptr, + unicode_convert_handle_t h=unicode_convert_tou_init(chset, &ucptr, &ucsize, 1); if (h == NULL) { - perror("libmail_u_convert_tou_init"); + perror("unicode_convert_tou_init"); return 1; } - if (libmail_u_convert(h, haystack, strlen(haystack))) + if (unicode_convert(h, haystack, strlen(haystack))) { - libmail_u_convert_deinit(h, NULL); - perror("libmail_u_convert_tou"); + unicode_convert_deinit(h, NULL); + perror("unicode_convert_tou"); return 1; } - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) { - perror("libmail_u_convert_deinit"); + perror("unicode_convert_deinit"); return 1; } diff --git a/maildrop/Makefile.am b/maildrop/Makefile.am index 662833b..d37d054 100644 --- a/maildrop/Makefile.am +++ b/maildrop/Makefile.am @@ -29,9 +29,8 @@ libmdcommon_la_SOURCES=alarm.C alarm.h alarmsleep.C alarmsleep.h alarmtimer.C \ libmdcommon_la_LIBADD=../maildir/libmaildir.la \ ../rfc2045/librfc2045.la \ ../rfc822/librfc822.la \ - ../unicode/libunicode.la \ ../numlib/libnumlib.la ../liblock/liblock.la \ - $(DBLIB) + $(DBLIB) -lunicode libmdcommon_la_LDFLAGS=-static @@ -60,10 +59,10 @@ noinst_PROGRAMS=maildrop reformail mailbot mailbot_SOURCES=mailbot.c mailbot_DEPENDENCIES=../rfc2045/librfc2045.la \ ../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) + ../numlib/libnumlib.la $(DBLIB) mailbot_LDADD=../rfc2045/librfc2045.la \ ../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) + ../numlib/libnumlib.la $(DBLIB) -lunicode mailbot_LDFLAGS = -static if HAVE_LIBIDN diff --git a/maildrop/mailbot.c b/maildrop/mailbot.c index dc8d43f..5fbb860 100644 --- a/maildrop/mailbot.c +++ b/maildrop/mailbot.c @@ -7,7 +7,7 @@ #include "dbobj.h" #include "liblock/config.h" #include "liblock/liblock.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include <string.h> #include <stdlib.h> @@ -606,9 +606,9 @@ int main(int argc, char **argv) if (optarg && *optarg) { - char *p=libmail_u_convert_tobuf("", + char *p=unicode_convert_tobuf("", optarg, - libmail_u_ucs4_native, + unicode_u_ucs4_native, NULL); if (!p) @@ -887,9 +887,9 @@ int main(int argc, char **argv) char *p=NULL; if (charset) - p=libmail_u_convert_tobuf("", + p=unicode_convert_tobuf("", charset, - libmail_u_ucs4_native, + unicode_u_ucs4_native, NULL); if (!p) diff --git a/pcp/Makefile.am b/pcp/Makefile.am index 7d9fb84..d2f6a60 100644 --- a/pcp/Makefile.am +++ b/pcp/Makefile.am @@ -26,22 +26,22 @@ libpcp_la_LDFLAGS=-static pcp_SOURCES=pcp.c pcp_DEPENDENCIES=libpcp.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ - ../unicode/libunicode.la ../numlib/libnumlib.la + ../numlib/libnumlib.la -pcp_LDADD=$(pcp_DEPENDENCIES) @LIBINTL@ @EFENCE@ @NETLIBS@ +pcp_LDADD=$(pcp_DEPENDENCIES) -lunicode @LIBINTL@ @EFENCE@ @NETLIBS@ pcpd_SOURCES=pcpd.c pcpdauth.c pcpdauth.h pcpdauthme.c pcpdauthtoken.c \ pcpdauthtoken.h pcpdtimer.c pcpdtimer.h COMMONLIBS=libpcp.la ../maildir/libmaildir.la \ ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ - ../unicode/libunicode.la ../numlib/libnumlib.la \ + ../numlib/libnumlib.la \ ../random128/librandom128.la ../libhmac/libhmac.la \ ../md5/libmd5.la ../sha1/libsha1.la\ ../liblock/liblock.la pcpd_DEPENDENCIES=$(COMMONLIBS) -pcpd_LDADD=$(COMMONLIBS) @LDAUTH@ -lcourierauth @LIBINTL@ @EFENCE@ @NETLIBS@ +pcpd_LDADD=$(COMMONLIBS) @LDAUTH@ -lunicode -lcourierauth @LIBINTL@ @EFENCE@ @NETLIBS@ calendardir.h: config.status echo '#define CALENDARDIR "$(calendardir)"' >calendardir.h @@ -29,7 +29,7 @@ #include <rfc822/rfc822hdr.h> #include <rfc2045/rfc2045.h> #include <rfc2045/rfc2045charset.h> -#include <unicode/unicode.h> +#include <unicode.h> #include <numlib/numlib.h> #define PCP_ERRMSG(s) gettext(s) diff --git a/rfc2045/Makefile.am b/rfc2045/Makefile.am index ee75b2e..7a4ccbf 100644 --- a/rfc2045/Makefile.am +++ b/rfc2045/Makefile.am @@ -31,23 +31,23 @@ librfc2045_la_SOURCES=rfc2045.c rfc2045.h rfc2045src.h \ reformime_SOURCES=reformime.c reformime_LDADD = librfc2045.la ../rfc822/libencode.la ../rfc822/librfc822.la \ - ../unicode/libunicode.la ../numlib/libnumlib.la + ../numlib/libnumlib.la -lunicode reformime_DEPENDENCIES = $(reformime_LDADD) reformime_LDFLAGS=-static makemime_SOURCES=makemime.c -makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../unicode/libunicode.la ../numlib/libnumlib.la ../unicode/libunicode.la +makemime_LDADD = ../rfc822/libencode.la ../rfc822/librfc822.la librfc2045.la ../numlib/libnumlib.la -lunicode makemime_DEPENDENCIES=$(makemime_LDADD) makemime_LDFLAGS=-static headercheck_SOURCES=headercheck.c headercheck_LDADD=librfc2045.la ../rfc822/librfc822.la ../numlib/libnumlib.la \ - ../unicode/libunicode.la + -lunicode headercheck_DEPENDENCIES=$(headercheck_LDADD) headercheck_LDFLAGS=-static testrfc3676parser_SOURCES=testrfc3676parser.c -testrfc3676parser_LDADD=librfc2045.la ../unicode/libunicode.la +testrfc3676parser_LDADD=librfc2045.la -lunicode testrfc3676parser_DEPENDENCIES=$(testrfc3676parser_LDADD) if HAVE_SGML diff --git a/rfc2045/reformime.c b/rfc2045/reformime.c index 26396cb..2e447d1 100644 --- a/rfc2045/reformime.c +++ b/rfc2045/reformime.c @@ -31,7 +31,7 @@ #include "rfc822/rfc822.h" #include "rfc822/rfc2047.h" #include "rfc2045charset.h" -#include "unicode/unicode.h" +#include <unicode.h> #if HAVE_UNISTD_H #include <unistd.h> @@ -978,9 +978,9 @@ int rc=0; optarg=argv[argn++]; if (optarg && *optarg) { - char *p=libmail_u_convert_tobuf("", + char *p=unicode_convert_tobuf("", optarg, - libmail_u_ucs4_native, + unicode_u_ucs4_native, NULL); if (!p) diff --git a/rfc2045/rfc2045decodemimesectionu.c b/rfc2045/rfc2045decodemimesectionu.c index 3711b1e..1fc9e74 100644 --- a/rfc2045/rfc2045decodemimesectionu.c +++ b/rfc2045/rfc2045decodemimesectionu.c @@ -5,7 +5,7 @@ #include "rfc2045_config.h" #include "rfc2045.h" -#include "../unicode/unicode.h" +#include <unicode.h> #include <stdio.h> #include <unistd.h> #include <iconv.h> @@ -32,7 +32,7 @@ int rfc2045_decodetextmimesection(struct rfc2045src *src, const char *dummy; const char *src_chset; - libmail_u_convert_handle_t ci; + unicode_convert_handle_t ci; int rc; int dummy_flag; @@ -43,7 +43,7 @@ int rfc2045_decodetextmimesection(struct rfc2045src *src, *conv_err=0; - if ((ci=libmail_u_convert_init(src_chset, mychset, handler, voidarg)) + if ((ci=unicode_convert_init(src_chset, mychset, handler, voidarg)) == NULL) { *conv_err=1; @@ -53,7 +53,7 @@ int rfc2045_decodetextmimesection(struct rfc2045src *src, rc=rfc2045_decodemimesection(src, rfc, &myhandler, &ci); dummy_flag=0; - if (libmail_u_convert_deinit(ci, &dummy_flag)) + if (unicode_convert_deinit(ci, &dummy_flag)) rc= -1; if (dummy_flag) @@ -63,6 +63,6 @@ int rfc2045_decodetextmimesection(struct rfc2045src *src, static int myhandler(const char *cp, size_t cnt, void *voidarg) { - return libmail_u_convert(*(libmail_u_convert_handle_t *) + return unicode_convert(*(unicode_convert_handle_t *) voidarg, cp, cnt); } diff --git a/rfc2045/rfc2045reply.c b/rfc2045/rfc2045reply.c index 0692fb0..3ec0728 100644 --- a/rfc2045/rfc2045reply.c +++ b/rfc2045/rfc2045reply.c @@ -10,7 +10,7 @@ #include "rfc822/rfc2047.h" #include "rfc2045charset.h" #include "rfc822/rfc822.h" -#include "unicode/unicode.h" +#include <unicode.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -241,7 +241,7 @@ struct replyinfostruct { int start_line; int isflowed; size_t trailing_spaces; - libmail_u_convert_handle_t u_handle; + unicode_convert_handle_t u_handle; }; @@ -283,7 +283,7 @@ static int reply_begin(size_t quote_level, */ s->quote_level=quote_level+s->quote_level_adjust; - s->u_handle=libmail_u_convert_init(libmail_u_ucs4_native, + s->u_handle=unicode_convert_init(unicode_u_ucs4_native, s->ri->charset, output_reply, s); @@ -300,7 +300,7 @@ static int reply_begin(size_t quote_level, for (i=0; i<s->quote_level; i++) { - libmail_u_convert_uc(s->u_handle, "eChar, 1); + unicode_convert_uc(s->u_handle, "eChar, 1); } } return 0; @@ -337,14 +337,14 @@ static int reply_contents(const unicode_char *txt, */ if ((s->quote_level > 0 && *txt != '>') || *txt == ' ') - libmail_u_convert_uc(s->u_handle, + unicode_convert_uc(s->u_handle, &spaceChar, 1); } else { if (s->quote_level > 0 || *txt == ' ' || *txt == '>') - libmail_u_convert_uc(s->u_handle, + unicode_convert_uc(s->u_handle, &spaceChar, 1); } s->start_line=0; @@ -367,11 +367,11 @@ static int reply_contents(const unicode_char *txt, { while (s->trailing_spaces) { - libmail_u_convert_uc(s->u_handle, &spaceChar, 1); + unicode_convert_uc(s->u_handle, &spaceChar, 1); --s->trailing_spaces; } - libmail_u_convert_uc(s->u_handle, txt, nonspc_cnt); + unicode_convert_uc(s->u_handle, txt, nonspc_cnt); } s->trailing_spaces += txt_size - nonspc_cnt; @@ -383,9 +383,9 @@ static int reply_end(void *arg) unicode_char newLine='\n'; struct replyinfostruct *s=(struct replyinfostruct *)arg; - libmail_u_convert_uc(s->u_handle, &newLine, 1); + unicode_convert_uc(s->u_handle, &newLine, 1); - libmail_u_convert_deinit(s->u_handle, NULL); + unicode_convert_deinit(s->u_handle, NULL); return 0; } @@ -403,11 +403,11 @@ static int reply_wrap(void *arg) while (s->trailing_spaces) { - libmail_u_convert_uc(s->u_handle, &spaceChar, 1); + unicode_convert_uc(s->u_handle, &spaceChar, 1); --s->trailing_spaces; } - libmail_u_convert_uc(s->u_handle, &spaceChar, 1); + unicode_convert_uc(s->u_handle, &spaceChar, 1); reply_end(s); reply_begin(s->quote_level-s->quote_level_adjust, s); /* Undo the adjustment in reply_begin() */ diff --git a/rfc2045/rfc2231.c b/rfc2045/rfc2231.c index f0908e8..22c0c50 100644 --- a/rfc2045/rfc2231.c +++ b/rfc2045/rfc2231.c @@ -15,7 +15,7 @@ #include <ctype.h> #include "rfc2045.h" #include "rfc822/rfc822.h" -#include "unicode/unicode.h" +#include <unicode.h> /* ** Deallocate a link list of rfc2231param structures. @@ -316,7 +316,7 @@ static int conv_unicode(char **text, const char *fromChset, if (!fromChset || !*fromChset) return 0; - p=libmail_u_convert_tobuf(*text, fromChset, toChset, &err); + p=unicode_convert_tobuf(*text, fromChset, toChset, &err); if (p && err) { diff --git a/rfc2045/rfc3676parser.c b/rfc2045/rfc3676parser.c index 332d22b..0a458f4 100644 --- a/rfc2045/rfc3676parser.c +++ b/rfc2045/rfc3676parser.c @@ -50,7 +50,7 @@ static int nonflowed_line_process(int linebreak_opportunity, struct rfc3676_parser_struct { struct rfc3676_parser_info info; - libmail_u_convert_handle_t uhandle; + unicode_convert_handle_t uhandle; int errflag; @@ -172,8 +172,8 @@ rfc3676_parser_t rfc3676parser_init(const struct rfc3676_parser_info *info) return NULL; handle->info=*info; - if ((handle->uhandle=libmail_u_convert_init(info->charset, - libmail_u_ucs4_native, + if ((handle->uhandle=unicode_convert_init(info->charset, + unicode_u_ucs4_native, parse_unicode, handle)) == NULL) { @@ -214,7 +214,7 @@ int rfc3676parser(rfc3676_parser_t handle, /* Convert to unicode and invoke parse_unicode() */ - return libmail_u_convert(handle->uhandle, txt, txt_cnt); + return unicode_convert(handle->uhandle, txt, txt_cnt); } /* @@ -268,7 +268,7 @@ int rfc3676parser_deinit(rfc3676_parser_t handle, int *errptr) { /* Finish unicode conversion */ - int rc=libmail_u_convert_deinit(handle->uhandle, errptr); + int rc=unicode_convert_deinit(handle->uhandle, errptr); if (rc == 0) rc=handle->errflag; diff --git a/rfc2045/rfc3676parser.h b/rfc2045/rfc3676parser.h index 6125082..95811b5 100644 --- a/rfc2045/rfc3676parser.h +++ b/rfc2045/rfc3676parser.h @@ -9,7 +9,7 @@ */ #include "rfc2045/rfc2045_config.h" -#include "unicode/unicode.h" +#include <unicode.h> #include <stdlib.h> #include <string.h> diff --git a/rfc822/Makefile.am b/rfc822/Makefile.am index cda7f9d..ec41e4c 100644 --- a/rfc822/Makefile.am +++ b/rfc822/Makefile.am @@ -23,13 +23,13 @@ noinst_DATA=$(BUILT_SOURCES) noinst_PROGRAMS=testsuite reftest testsuite_SOURCES=testsuite.c -testsuite_DEPENDENCIES=librfc822.la ../unicode/libunicode.la -testsuite_LDADD=librfc822.la ../unicode/libunicode.la +testsuite_DEPENDENCIES=librfc822.la +testsuite_LDADD=librfc822.la -lunicode testsuite_LDFLAGS=-static reftest_SOURCES=reftest.c imaprefs.h -reftest_DEPENDENCIES=librfc822.la ../unicode/libunicode.la -reftest_LDADD=librfc822.la ../unicode/libunicode.la +reftest_DEPENDENCIES=librfc822.la +reftest_LDADD=librfc822.la -lunicode reftest_LDFLAGS=-static EXTRA_DIST=testsuite.txt reftest.txt $(BUILT_SOURCES) diff --git a/rfc822/encodeautodetect.c b/rfc822/encodeautodetect.c index ad1ebc6..194c91b 100644 --- a/rfc822/encodeautodetect.c +++ b/rfc822/encodeautodetect.c @@ -8,7 +8,7 @@ #include "encode.h" #include <string.h> #include <stdlib.h> -#include "../unicode/unicode.h" +#include <unicode.h> static const char *libmail_encode_autodetect(int use7bit, int (*func)(void *), void *arg, diff --git a/rfc822/rfc2047.c b/rfc822/rfc2047.c index f80e862..872c557 100644 --- a/rfc822/rfc2047.c +++ b/rfc822/rfc2047.c @@ -9,10 +9,10 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#include <unicode.h> #include "rfc822hdr.h" #include "rfc2047.h" -#include "../unicode/unicode.h" #if LIBIDN #include <idna.h> #include <stringprep.h> @@ -97,7 +97,7 @@ static char *rfc822_encode_domain_int(const char *pfix, char *rfc822_encode_domain(const char *address, const char *charset) { - char *p=libmail_u_convert_tobuf(address, charset, "utf-8", NULL); + char *p=unicode_convert_tobuf(address, charset, "utf-8", NULL); char *cp, *q; if (!p) @@ -506,7 +506,7 @@ static int do_encode_words_method(const unicode_char *uc, } } - if ((rc=libmail_u_convert_fromu_tobuf(uc, j, charset, + if ((rc=unicode_convert_fromu_tobuf(uc, j, charset, &p, &psize, NULL)) != 0) return rc; @@ -555,7 +555,7 @@ static int do_encode_words(const unicode_char *uc, ** Convert from unicode */ - if ((rc=libmail_u_convert_fromu_tobuf(uc, ucsize, charset, + if ((rc=unicode_convert_fromu_tobuf(uc, ucsize, charset, &p, &psize, NULL)) != 0) return rc; @@ -675,7 +675,7 @@ char *rfc2047_encode_str(const char *str, const char *charset, /* Convert string to unicode */ - if (libmail_u_convert_tou_tobuf(str, strlen(str), charset, + if (unicode_convert_tou_tobuf(str, strlen(str), charset, &uc, &ucsize, &err)) return NULL; diff --git a/rfc822/rfc2047u.c b/rfc822/rfc2047u.c index c1bc48b..dc2244e 100644 --- a/rfc822/rfc2047u.c +++ b/rfc822/rfc2047u.c @@ -9,10 +9,10 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#include <unicode.h> #include "rfc822hdr.h" #include "rfc2047.h" -#include "../unicode/unicode.h" #if LIBIDN #include <idna.h> @@ -93,7 +93,7 @@ static void rfc822_display_addr_cb(const char *chset, memcpy(buf, content, cnt); buf[cnt]=0; - ptr=libmail_u_convert_tobuf(buf, chset, s->chset, NULL); + ptr=unicode_convert_tobuf(buf, chset, s->chset, NULL); free(buf); if (ptr) @@ -356,7 +356,7 @@ int rfc822_display_addr_str(const char *tok, (*print_func)(p, strlen(p), ptr); else { - char *q=libmail_u_convert_tobuf(utf8_ptr, + char *q=unicode_convert_tobuf(utf8_ptr, "utf-8", chset, NULL); if (q) @@ -474,7 +474,7 @@ int rfc2047_print_unicodeaddr(const struct rfc822a *a, if (strchr(RFC822_SPECIALS, nbuf.bufptr[i])) break; - cpbuf=libmail_u_convert_tobuf(nbuf.bufptr, "utf-8", charset, + cpbuf=unicode_convert_tobuf(nbuf.bufptr, "utf-8", charset, NULL); if (!cpbuf) diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am index ef7ad69..49f769c 100644 --- a/sqwebmail/Makefile.am +++ b/sqwebmail/Makefile.am @@ -36,11 +36,10 @@ COMMONDEPENDENCIES=$(LIBOBJS) ../pcp/libpcp.la ../maildir/libmaildir.la \ ../http11/libhttp11.la ../cgi/libcgi.la \ ../ldapaddressbook/libaddressbook.la \ ../gpglib/libgpg.la \ - ../unicode/libunicode.la \ ../random128/librandom128.la ../md5/libmd5.la \ ../numlib/libnumlib.la \ @dblibrary@ -COMMONLDADD=$(COMMONDEPENDENCIES) `cat ../pcp/pcp.libs` +COMMONLDADD=$(COMMONDEPENDENCIES) `cat ../pcp/pcp.libs` -lunicode noinst_LTLIBRARIES=libwebmail.la diff --git a/sqwebmail/acl.c b/sqwebmail/acl.c index 46bc9ec..8c89d98 100644 --- a/sqwebmail/acl.c +++ b/sqwebmail/acl.c @@ -27,7 +27,6 @@ #include "maildir/maildirmisc.h" #include "maildir/maildircreate.h" #include "maildir/maildirwatch.h" -#include "unicode/unicode.h" #include "htmllibdir.h" #if HAVE_UNISTD_H @@ -57,7 +56,7 @@ #include <utime.h> #endif -#include "unicode/unicode.h" +#include <unicode.h> #include "strftime.h" @@ -417,7 +416,7 @@ static void doupdate() if (entity) { char *val= - libmail_u_convert_toutf8(entity, + unicode_convert_toutf8(entity, sqwebmail_content_charset, NULL); @@ -476,7 +475,7 @@ static void doupdate() static void p_ident_name(const char *identifier) { - char *val=libmail_u_convert_fromutf8(identifier, + char *val=unicode_convert_fromutf8(identifier, sqwebmail_content_charset, NULL); diff --git a/sqwebmail/addressbook.c b/sqwebmail/addressbook.c index 75c1aa8..d59d55b 100644 --- a/sqwebmail/addressbook.c +++ b/sqwebmail/addressbook.c @@ -21,7 +21,7 @@ #define ADDRESSBOOK "sqwebmail-addressbook" #define TOUTF8(what) \ - libmail_u_convert_toutf8((what), sqwebmail_content_charset, NULL) + unicode_convert_toutf8((what), sqwebmail_content_charset, NULL) extern const char *sqwebmail_content_charset; @@ -453,7 +453,7 @@ void ab_listselect_fp(FILE *w) for (i=0; i<acnt; i++) { - char *p=libmail_u_convert_fromutf8(aa[i]->name, + char *p=unicode_convert_fromutf8(aa[i]->name, sqwebmail_content_charset, NULL); @@ -579,7 +579,7 @@ static int ab_addrselect_cb(const char *a, const char *n, void *vp) static void ab_show_utf8(const char *p) { int err; - char *p_s=libmail_u_convert_fromutf8(p, sqwebmail_content_charset, + char *p_s=unicode_convert_fromutf8(p, sqwebmail_content_charset, &err); if (!p_s) @@ -992,7 +992,7 @@ int replace_index=0; { int err; char *edit_name_native= - libmail_u_convert_fromutf8(edit_name, + unicode_convert_fromutf8(edit_name, sqwebmail_content_charset, &err); @@ -1014,7 +1014,7 @@ int replace_index=0; { int err; char *edit_addr_native= - libmail_u_convert_fromutf8(edit_addr, + unicode_convert_fromutf8(edit_addr, sqwebmail_content_charset, &err); diff --git a/sqwebmail/attachments.c b/sqwebmail/attachments.c index 629b438..92a6787 100644 --- a/sqwebmail/attachments.c +++ b/sqwebmail/attachments.c @@ -45,7 +45,7 @@ #include "maildir/maildirmisc.h" #include "htmllibdir.h" -#include "unicode/unicode.h" +#include <unicode.h> extern char *newmsg_alladdrs(FILE *); extern void newmsg_copy_content_headers(FILE *fp); diff --git a/sqwebmail/auth.c b/sqwebmail/auth.c index 5a3b9e7..1c37a04 100644 --- a/sqwebmail/auth.c +++ b/sqwebmail/auth.c @@ -39,7 +39,7 @@ extern int check_sqwebpass(const char *); extern char *sqwebmail_content_charset, *sqwebmail_system_charset; -#include "unicode/unicode.h" +#include <unicode.h> const char *myhostname() { @@ -278,7 +278,7 @@ static char *uhdrbuf=0; if (authcharset[0] && sqwebmail_content_charset && *sqwebmail_content_charset - && (ufullname=libmail_u_convert_toutf8(fullname, authcharset,NULL))) + && (ufullname=unicode_convert_toutf8(fullname, authcharset,NULL))) fullname = ufullname; l=sizeof("\"\" <>")+strlen(address)+strlen(fullname); @@ -316,7 +316,7 @@ static char *uhdrbuf=0; if (ufullname) free(ufullname); if (uhdrbuf) free(uhdrbuf); - if ((uhdrbuf=libmail_u_convert_fromutf8(hdrbuf, + if ((uhdrbuf=unicode_convert_fromutf8(hdrbuf, sqwebmail_content_charset, NULL)) != NULL) return (uhdrbuf); diff --git a/sqwebmail/autoresponse.c b/sqwebmail/autoresponse.c index c14e345..e5fdfee 100644 --- a/sqwebmail/autoresponse.c +++ b/sqwebmail/autoresponse.c @@ -10,7 +10,7 @@ #include "autoresponse.h" #include "maildir/autoresponse.h" #include "mailfilter.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "sqwebmail.h" #include "htmllibdir.h" #include "maildir.h" @@ -146,11 +146,11 @@ const char *autoresp_text2=getarg("TEXT2"); else { struct show_textarea_info info; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; show_textarea_init(&info, 0); - h=libmail_u_convert_init("utf-8", + h=unicode_convert_init("utf-8", sqwebmail_content_charset, show_autoresponse_trampoline, &info); @@ -162,9 +162,9 @@ const char *autoresp_text2=getarg("TEXT2"); while ((i=fread(buf, 1, sizeof(buf), fp)) > 0) { - libmail_u_convert(h, buf, i); + unicode_convert(h, buf, i); } - libmail_u_convert_deinit(h, NULL); + unicode_convert_deinit(h, NULL); } } diff --git a/sqwebmail/filter.c b/sqwebmail/filter.c index fed2554..d9f2813 100644 --- a/sqwebmail/filter.c +++ b/sqwebmail/filter.c @@ -29,7 +29,7 @@ void filter_start(struct filter_info *info, void *arg) { info->conversion_error=0; - info->handle=libmail_u_convert_init(libmail_u_ucs4_native, + info->handle=unicode_convert_init(unicode_u_ucs4_native, charset, converted_text, info); @@ -79,12 +79,12 @@ void filter(struct filter_info *info, unicode_char nl='\n'; if (prev < i) - libmail_u_convert_uc + unicode_convert_uc (info->handle, ptr+prev, i-prev); prev=i; - libmail_u_convert_uc(info->handle, + unicode_convert_uc(info->handle, &nl, 1); info->u_w=0; } @@ -112,7 +112,7 @@ void filter(struct filter_info *info, } if (prev < i) - libmail_u_convert_uc(info->handle, ptr+prev, i-prev); + unicode_convert_uc(info->handle, ptr+prev, i-prev); prev=++i; if (!p) @@ -122,7 +122,7 @@ void filter(struct filter_info *info, { unicode_char uc= *p++; - libmail_u_convert_uc(info->handle, &uc, 1); + unicode_convert_uc(info->handle, &uc, 1); } } } @@ -130,14 +130,14 @@ void filter(struct filter_info *info, void filter_passthru(struct filter_info *info, const unicode_char *ptr, size_t cnt) { - libmail_u_convert_uc(info->handle, ptr, cnt); + unicode_convert_uc(info->handle, ptr, cnt); } void filter_end(struct filter_info *info) { if (info->handle) { - libmail_u_convert_deinit(info->handle, + unicode_convert_deinit(info->handle, &info->conversion_error); info->handle=NULL; } diff --git a/sqwebmail/filter.h b/sqwebmail/filter.h index f68fa0b..2a90e6c 100644 --- a/sqwebmail/filter.h +++ b/sqwebmail/filter.h @@ -39,10 +39,10 @@ #include <stdlib.h> -#include "unicode/unicode.h" +#include <unicode.h> struct filter_info { - libmail_u_convert_handle_t handle; + unicode_convert_handle_t handle; int conversion_error; diff --git a/sqwebmail/folder.c b/sqwebmail/folder.c index fb4a7db..04af2cb 100644 --- a/sqwebmail/folder.c +++ b/sqwebmail/folder.c @@ -68,7 +68,7 @@ #endif #include <errno.h> -#include "unicode/unicode.h" +#include <unicode.h> #include <unistd.h> #if HAVE_WCHAR_H @@ -190,7 +190,7 @@ int in_utf8; printf("%s", lab); origff=ff=in_utf8 ? - libmail_u_convert_fromutf8(f, + unicode_convert_fromutf8(f, sqwebmail_content_charset, NULL) : folder_fromutf7(f); @@ -721,7 +721,7 @@ static void show_msg_match_str(const char *prefix, { char *p; - p=libmail_u_convert_fromutf8(utf8match, sqwebmail_content_charset, + p=unicode_convert_fromutf8(utf8match, sqwebmail_content_charset, NULL); if (p) @@ -3719,18 +3719,18 @@ static char *truncate_at(const char *str, size_t n; size_t cols, tp=0; char *retbuf; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; int chopped=0; if (!str) return NULL; - h=libmail_u_convert_tou_init("utf-8", &uc, &n, 1); + h=unicode_convert_tou_init("utf-8", &uc, &n, 1); if (h) { - libmail_u_convert(h, str, strlen(str)); - libmail_u_convert_deinit(h, NULL); + unicode_convert(h, str, strlen(str)); + unicode_convert_deinit(h, NULL); } else { @@ -3764,12 +3764,12 @@ static char *truncate_at(const char *str, tp += 3; } - h=libmail_u_convert_fromu_init(charset, &retbuf, &cols, 1); + h=unicode_convert_fromu_init(charset, &retbuf, &cols, 1); if (h) { - libmail_u_convert_uc(h, uc, tp); - libmail_u_convert_deinit(h, NULL); + unicode_convert_uc(h, uc, tp); + unicode_convert_deinit(h, NULL); } else { diff --git a/sqwebmail/gpg.c b/sqwebmail/gpg.c index f07d605..60a325b 100644 --- a/sqwebmail/gpg.c +++ b/sqwebmail/gpg.c @@ -12,7 +12,7 @@ #include "pref.h" #include "cgi/cgi.h" #include "gpglib/gpglib.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include "rfc822/rfc822.h" #include "htmllibdir.h" diff --git a/sqwebmail/html.c b/sqwebmail/html.c index 8c2c316..f9d91e1 100644 --- a/sqwebmail/html.c +++ b/sqwebmail/html.c @@ -8,7 +8,7 @@ #include "html.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "rfc2045/rfc2045.h" #include <stdlib.h> #include <string.h> @@ -1290,15 +1290,15 @@ static char *resolve_url(struct htmlfilter_info *p) size_t size; char *cp; - libmail_u_convert_handle_t h= - libmail_u_convert_fromu_init("utf-8", &buf, &size, 1); + unicode_convert_handle_t h= + unicode_convert_fromu_init("utf-8", &buf, &size, 1); if (h) { - libmail_u_convert_uc(h, unicode_buf_ptr(&p->value), + unicode_convert_uc(h, unicode_buf_ptr(&p->value), unicode_buf_len(&p->value)); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) buf=NULL; } else diff --git a/sqwebmail/html.h b/sqwebmail/html.h index 3f66376..2d10a68 100644 --- a/sqwebmail/html.h +++ b/sqwebmail/html.h @@ -3,7 +3,7 @@ #ifndef html_h #define html_h -#include "unicode/unicode.h" +#include <unicode.h> /* ** Copyright 2011 Double Precision, Inc. See COPYING for diff --git a/sqwebmail/ldaplist.c b/sqwebmail/ldaplist.c index e584294..9bc5f6a 100644 --- a/sqwebmail/ldaplist.c +++ b/sqwebmail/ldaplist.c @@ -35,7 +35,7 @@ extern void output_attrencoded_oknl_fp(const char *, FILE *); extern const char *sqwebmail_content_charset; -#include "unicode/unicode.h" +#include <unicode.h> void ldaplist() { @@ -157,7 +157,7 @@ static char *getfilter() if (!*p) return NULL; - return libmail_u_convert_toutf8(p, sqwebmail_content_charset, NULL); + return unicode_convert_toutf8(p, sqwebmail_content_charset, NULL); } struct search_info { @@ -198,7 +198,7 @@ static int parsesearch(const char *cn, const char *mail, char *cn_native; - cn_native=libmail_u_convert_fromutf8(cn, sqwebmail_content_charset, + cn_native=unicode_convert_fromutf8(cn, sqwebmail_content_charset, NULL); if (cn_native) diff --git a/sqwebmail/maildir.c b/sqwebmail/maildir.c index 2ed17be..5c6a016 100644 --- a/sqwebmail/maildir.c +++ b/sqwebmail/maildir.c @@ -38,7 +38,6 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif -#include "unicode/unicode.h" #if HAVE_DIRENT_H #include <dirent.h> @@ -63,7 +62,7 @@ #include <utime.h> #endif -#include "unicode/unicode.h" +#include <unicode.h> #include "strftime.h" @@ -2085,7 +2084,7 @@ static void execute_maildir_search(const char *dirname, if (pos >= all_cnt) return; - utf8str=libmail_u_convert_toutf8(searchtxt, charset, NULL); + utf8str=unicode_convert_toutf8(searchtxt, charset, NULL); if (!utf8str) return; @@ -2118,19 +2117,19 @@ static void execute_maildir_search(const char *dirname, int rc=-1; unicode_char *ustr; size_t ustr_size; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; maildir_search_init(&se); - h=libmail_u_convert_tou_init("utf-8", + h=unicode_convert_tou_init("utf-8", &ustr, &ustr_size, 1); if (h) { - libmail_u_convert(h, utf8str, strlen(utf8str)); - if (libmail_u_convert_deinit(h, NULL) == 0) + unicode_convert(h, utf8str, strlen(utf8str)); + if (unicode_convert_deinit(h, NULL) == 0) { size_t n; @@ -2321,7 +2320,7 @@ static int do_search_utf8(struct searchresults *res) { unicode_char *uc=NULL; size_t n; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; if (res->utf8buf_cnt == 0) return 0; @@ -2332,15 +2331,15 @@ static int do_search_utf8(struct searchresults *res) res->utf8buf[res->utf8buf_cnt]=0; res->utf8buf_cnt=0; - h=libmail_u_convert_tou_init("utf-8", + h=unicode_convert_tou_init("utf-8", &uc, &n, 1); if (h) { - libmail_u_convert(h, res->utf8buf, strlen(res->utf8buf)); - if (libmail_u_convert_deinit(h, NULL) == 0) + unicode_convert(h, res->utf8buf, strlen(res->utf8buf)); + if (unicode_convert_deinit(h, NULL) == 0) ; else uc=NULL; @@ -2524,18 +2523,18 @@ static char *match_conv(const unicode_char *uc) { char *cbuf; size_t csize; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; size_t i; - if ((h=libmail_u_convert_fromu_init("utf-8", &cbuf, &csize, 1)) == NULL) + if ((h=unicode_convert_fromu_init("utf-8", &cbuf, &csize, 1)) == NULL) return NULL; for (i=0; uc[i]; ++i) ; - libmail_u_convert_uc(h, uc, i); + unicode_convert_uc(h, uc, i); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) return NULL; return cbuf; } @@ -3913,7 +3912,7 @@ char *folder_toutf7(const char *foldername) char *p; int converr; - p=libmail_u_convert_tobuf(foldername, sqwebmail_content_charset, + p=unicode_convert_tobuf(foldername, sqwebmail_content_charset, unicode_x_imap_modutf7, &converr); if (p && converr) @@ -3936,7 +3935,7 @@ char *folder_fromutf7(const char *foldername) char *p; int converr; - p=libmail_u_convert_tobuf(foldername, + p=unicode_convert_tobuf(foldername, unicode_x_imap_modutf7, sqwebmail_content_charset, &converr); diff --git a/sqwebmail/mailfilter.c b/sqwebmail/mailfilter.c index c58c593..d0f8c70 100644 --- a/sqwebmail/mailfilter.c +++ b/sqwebmail/mailfilter.c @@ -68,7 +68,7 @@ unsigned cnt; for (cnt=0, r=mf.first; r; r=r->next, ++cnt) { - char *p=libmail_u_convert_fromutf8(r->rulename_utf8, + char *p=unicode_convert_fromutf8(r->rulename_utf8, sqwebmail_content_charset, NULL); @@ -209,7 +209,7 @@ struct maildirfilterrule *r; if (namebuf) free(namebuf); p=r->rulename_utf8 ? r->rulename_utf8:""; - namebuf=libmail_u_convert_fromutf8(p, sqwebmail_content_charset, + namebuf=unicode_convert_fromutf8(p, sqwebmail_content_charset, NULL); if (!namebuf) enomem(); @@ -222,7 +222,7 @@ struct maildirfilterrule *r; if (r->flags & MFR_BODY) p=""; if (headernamebuf) free(headernamebuf); - headernamebuf=libmail_u_convert_fromutf8(p, + headernamebuf=unicode_convert_fromutf8(p, sqwebmail_content_charset, NULL); if (!headernamebuf) enomem(); @@ -242,7 +242,7 @@ struct maildirfilterrule *r; if (headervaluebuf) free(headervaluebuf); headervaluebuf= - libmail_u_convert_fromutf8(p, + unicode_convert_fromutf8(p, sqwebmail_content_charset, NULL); if (!headervaluebuf) enomem(); diff --git a/sqwebmail/msg2html.c b/sqwebmail/msg2html.c index f57ca83..4aa9eea 100644 --- a/sqwebmail/msg2html.c +++ b/sqwebmail/msg2html.c @@ -9,7 +9,7 @@ #include "msg2html.h" #include "buf.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "numlib/numlib.h" #include "gpglib/gpglib.h" #include "cgi/cgi.h" @@ -477,7 +477,7 @@ static int showmsgrfc822_header(const char *output_chset, int conv_err; - if (libmail_u_convert_tou_tobuf(p, strlen(p), chset, + if (unicode_convert_tou_tobuf(p, strlen(p), chset, &uc, &ucsize, &conv_err)) { @@ -927,7 +927,7 @@ static int text_to_stdout(const char *p, size_t n, void *dummy) static void convert_unicode(const unicode_char *uc, size_t n, void *dummy) { - libmail_u_convert_uc(*(libmail_u_convert_handle_t *)dummy, uc, n); + unicode_convert_uc(*(unicode_convert_handle_t *)dummy, uc, n); } static int htmlfilter_stub(const char *ptr, size_t cnt, void *voidptr) @@ -1130,7 +1130,7 @@ static void showtexthtml(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id, const char *mime_charset, *dummy_s; struct htmlfilter_info *hf_info; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; id=id; @@ -1142,7 +1142,7 @@ static void showtexthtml(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id, rfc2045_mimeinfo(rfc, &dummy_s, &dummy_s, &mime_charset); - h=libmail_u_convert_init(libmail_u_ucs4_native, + h=unicode_convert_init(unicode_u_ucs4_native, info->output_character_set, text_to_stdout, NULL); @@ -1191,7 +1191,7 @@ static void showtexthtml(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id, int conv_err; rfc2045_decodetextmimesection(src, rfc, - libmail_u_ucs4_native, + unicode_u_ucs4_native, &conv_err, &htmlfilter_stub, hf_info); @@ -1203,7 +1203,7 @@ static void showtexthtml(FILE *fp, struct rfc2045 *rfc, struct rfc2045id *id, } htmlfilter_free(hf_info); - libmail_u_convert_deinit(h, NULL); + unicode_convert_deinit(h, NULL); printf("</td></tr>"); } diff --git a/sqwebmail/newmsg.c b/sqwebmail/newmsg.c index a81477a..8fdb7ce 100644 --- a/sqwebmail/newmsg.c +++ b/sqwebmail/newmsg.c @@ -42,7 +42,7 @@ #endif #include <errno.h> #include "htmllibdir.h" -#include "unicode/unicode.h" +#include <unicode.h> extern const char *sqwebmail_content_charset; extern int spell_start(const char *); diff --git a/sqwebmail/newmsg.h b/sqwebmail/newmsg.h index 37be835..8666f37 100644 --- a/sqwebmail/newmsg.h +++ b/sqwebmail/newmsg.h @@ -8,7 +8,7 @@ #undef VERSION #include "config.h" #endif -#include "unicode/unicode.h" +#include <unicode.h> /* ** Copyright 1998 - 2011 Double Precision, Inc. See COPYING for ** distribution information. diff --git a/sqwebmail/newmsg_create.c b/sqwebmail/newmsg_create.c index 5053d47..e4e4382 100644 --- a/sqwebmail/newmsg_create.c +++ b/sqwebmail/newmsg_create.c @@ -28,7 +28,7 @@ #include "gpglib/gpglib.h" #include "http11/http11.h" #include "htmllibdir.h" -#include "unicode/unicode.h" +#include <unicode.h> #include "courierauth.h" #include <stdlib.h> @@ -306,8 +306,8 @@ static void do_save_u_line(struct wrap_info *uw, char *cbuf; size_t csize; - libmail_u_convert_handle_t h= - libmail_u_convert_fromu_init(uw->output_chset, + unicode_convert_handle_t h= + unicode_convert_fromu_init(uw->output_chset, &cbuf, &csize, 0); @@ -317,23 +317,23 @@ static void do_save_u_line(struct wrap_info *uw, if (ucsize) { if (uc[0] == ' ') - libmail_u_convert_uc(h, uc, 1); + unicode_convert_uc(h, uc, 1); /* Space stuff */ - libmail_u_convert_uc(h, uc, ucsize); + unicode_convert_uc(h, uc, ucsize); } if (flowed) { unicode_char spc=' '; - libmail_u_convert_uc(h, &spc, 1); + unicode_convert_uc(h, &spc, 1); } { unicode_char nl='\n'; - libmail_u_convert_uc(h, &nl, 1); + unicode_convert_uc(h, &nl, 1); } - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) cbuf=NULL; } else @@ -437,21 +437,21 @@ void wrap_text(struct wrap_info *uw, { unicode_char *uc; size_t ucsize; - libmail_u_convert_handle_t h; + unicode_convert_handle_t h; j=i; while (i<newmsg_size && newmsg[i] != '\n') ++i; - h=libmail_u_convert_tou_init(sqwebmail_content_charset, + h=unicode_convert_tou_init(sqwebmail_content_charset, &uc, &ucsize, 0); if (h) { - libmail_u_convert(h, newmsg+j, i-j); + unicode_convert(h, newmsg+j, i-j); - if (libmail_u_convert_deinit(h, NULL)) + if (unicode_convert_deinit(h, NULL)) uc=NULL; } else diff --git a/sqwebmail/pref.c b/sqwebmail/pref.c index 39b8610..ca5d74d 100644 --- a/sqwebmail/pref.c +++ b/sqwebmail/pref.c @@ -355,7 +355,7 @@ void pref_setprefs() if ((fp=fopen(SIGNATURE, "w")) != NULL) { char *sig_utf8= - libmail_u_convert_toutf8(cgi("signature"), + unicode_convert_toutf8(cgi("signature"), sqwebmail_content_charset, NULL); @@ -557,7 +557,7 @@ char *pref_getfile(FILE *fp) utf8_buf[st.st_size]=0; fclose(fp); - sig_buf=libmail_u_convert_fromutf8(utf8_buf, + sig_buf=unicode_convert_fromutf8(utf8_buf, sqwebmail_content_charset, NULL); free(utf8_buf); diff --git a/sqwebmail/sqispell.c b/sqwebmail/sqispell.c index e695353..3e72873 100644 --- a/sqwebmail/sqispell.c +++ b/sqwebmail/sqispell.c @@ -392,7 +392,7 @@ static void show_part(const char *ptr, size_t cnt) size_t ucsize; int conv_err; - if (libmail_u_convert_tou_tobuf(ptr, cnt, + if (unicode_convert_tou_tobuf(ptr, cnt, sqwebmail_content_charset, &uc, &ucsize, diff --git a/sqwebmail/strftime.c b/sqwebmail/strftime.c index 0456874..20cb6e2 100644 --- a/sqwebmail/strftime.c +++ b/sqwebmail/strftime.c @@ -4,7 +4,7 @@ #include <string.h> #include <time.h> #include "sqwebmail.h" -#include "unicode/unicode.h" +#include <unicode.h> extern const char *sqwebmail_system_charset; extern const char *sqwebmail_content_charset; @@ -24,7 +24,7 @@ size_t strftime_unicode(char *s, size_t max, const char *fmt, && strcasecmp(sqwebmail_system_charset, "ASCII")) { int err; - char *sfmt=libmail_u_convert_tobuf(fmt, + char *sfmt=unicode_convert_tobuf(fmt, sqwebmail_content_charset, sqwebmail_system_charset, &err); @@ -41,7 +41,7 @@ size_t strftime_unicode(char *s, size_t max, const char *fmt, sbuf[sizeof(sbuf)-1] = 0; free(sfmt); - buf=libmail_u_convert_tobuf(sbuf, + buf=unicode_convert_tobuf(sbuf, sqwebmail_system_charset, sqwebmail_content_charset, &err); |