summaryrefslogtreecommitdiffstats
path: root/maildir
diff options
context:
space:
mode:
Diffstat (limited to 'maildir')
-rw-r--r--maildir/Makefile.am14
-rw-r--r--maildir/maildirfilter.c8
-rw-r--r--maildir/maildirinfo.c10
-rw-r--r--maildir/maildirmake.c4
-rw-r--r--maildir/maildirsearch.c8
-rw-r--r--maildir/maildirsearch.h2
-rw-r--r--maildir/testmaildirsearch.c14
7 files changed, 30 insertions, 30 deletions
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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-03 21:48:40 +0000