summaryrefslogtreecommitdiffstats
path: root/rfc2045
diff options
context:
space:
mode:
Diffstat (limited to 'rfc2045')
-rw-r--r--rfc2045/Makefile.am8
-rw-r--r--rfc2045/reformime.c6
-rw-r--r--rfc2045/rfc2045decodemimesectionu.c10
-rw-r--r--rfc2045/rfc2045reply.c24
-rw-r--r--rfc2045/rfc2231.c4
-rw-r--r--rfc2045/rfc3676parser.c10
-rw-r--r--rfc2045/rfc3676parser.h2
7 files changed, 32 insertions, 32 deletions
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, &quoteChar, 1);
+ unicode_convert_uc(s->u_handle, &quoteChar, 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 02:36:09 +0000