Author: jerenkrantz Date: Tue Nov 16 16:34:36 2004 New Revision: 76067 Modified: apr/apr-iconv/branches/1.0.x/CHANGES apr/apr-iconv/branches/1.0.x/Makefile.in apr/apr-iconv/branches/1.0.x/ccs/Makefile.in apr/apr-iconv/branches/1.0.x/ces/Makefile.in apr/apr-iconv/branches/1.0.x/include/api_version.h apr/apr-iconv/branches/1.0.x/include/apr_iconv.h apr/apr-iconv/branches/1.0.x/lib/Makefile.in apr/apr-iconv/branches/1.0.x/lib/charset_alias.h apr/apr-iconv/branches/1.0.x/lib/iconv.h apr/apr-iconv/branches/1.0.x/util/Makefile.in Log: Merge in changes from trunk into 1.0.x apr-iconv branch. (Binary compatibility rules do not apply to apr-iconv.) Modified: apr/apr-iconv/branches/1.0.x/CHANGES ============================================================================== --- apr/apr-iconv/branches/1.0.x/CHANGES (original) +++ apr/apr-iconv/branches/1.0.x/CHANGES Tue Nov 16 16:34:36 2004 @@ -1,4 +1,6 @@ -Changes with APR-ICONV 1.0 +Changes with APR-ICONV 1.0.1 + +Changes with APR-ICONV 1.0.0 *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it consistent with the behaviour of apr and apr-util. [Graham Leggett] Modified: apr/apr-iconv/branches/1.0.x/Makefile.in ============================================================================== --- apr/apr-iconv/branches/1.0.x/Makefile.in (original) +++ apr/apr-iconv/branches/1.0.x/Makefile.in Tue Nov 16 16:34:36 2004 @@ -39,6 +39,12 @@ fi; \ (cd util; $(LIBTOOL) --mode=install cp iconv $(DESTDIR)$(exec_prefix)) +all: + (cd lib; $(MAKE)) + (cd ccs; $(MAKE)) + (cd ces; $(MAKE)) + (cd util; $(MAKE)) + docs: mkdir ./docs perl $(abs_srcdir)/build/scandoc.pl -i./build/default.pl -p./docs/ ./lib/*.h Modified: apr/apr-iconv/branches/1.0.x/ccs/Makefile.in ============================================================================== --- apr/apr-iconv/branches/1.0.x/ccs/Makefile.in (original) +++ apr/apr-iconv/branches/1.0.x/ccs/Makefile.in Tue Nov 16 16:34:36 2004 @@ -60,5 +60,8 @@ # bring in rules.mk for standard functionality @INCLUDE_RULES@ -%.la: %.lo +.SUFFIXES: +.SUFFIXES: .c .lo .o .la + +.lo.la: $(LIBTOOL) --mode=link $(COMPILE) -module -avoid-version -rpath @iconv_libdir@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $< Modified: apr/apr-iconv/branches/1.0.x/ces/Makefile.in ============================================================================== --- apr/apr-iconv/branches/1.0.x/ces/Makefile.in (original) +++ apr/apr-iconv/branches/1.0.x/ces/Makefile.in Tue Nov 16 16:34:36 2004 @@ -14,5 +14,8 @@ # bring in rules.mk for standard functionality @INCLUDE_RULES@ -%.la: %.lo +.SUFFIXES: +.SUFFIXES: .c .lo .o .la + +.lo.la: $(LIBTOOL) --mode=link $(COMPILE) -module -avoid-version -rpath @iconv_libdir@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $< Modified: apr/apr-iconv/branches/1.0.x/include/api_version.h ============================================================================== --- apr/apr-iconv/branches/1.0.x/include/api_version.h (original) +++ apr/apr-iconv/branches/1.0.x/include/api_version.h Tue Nov 16 16:34:36 2004 @@ -63,7 +63,14 @@ #define API_MINOR_VERSION 0 /** patch level */ -#define API_PATCH_VERSION 0 +#define API_PATCH_VERSION 1 + +/** + * This symbol is defined for internal, "development" copies of API. This + * symbol will be #undef'd for releases. + */ +#define API_IS_DEV_VERSION + /** The formatted string of API's version */ #define API_VERSION_STRING \ Modified: apr/apr-iconv/branches/1.0.x/include/apr_iconv.h ============================================================================== --- apr/apr-iconv/branches/1.0.x/include/apr_iconv.h (original) +++ apr/apr-iconv/branches/1.0.x/include/apr_iconv.h Tue Nov 16 16:34:36 2004 @@ -95,9 +95,34 @@ /* __BEGIN_DECLS */ -API_DECLARE(apr_status_t) apr_iconv_open(const char *, const char *, apr_pool_t *, apr_iconv_t *); -API_DECLARE(apr_status_t) apr_iconv(apr_iconv_t, const char **, apr_size_t *, char **, apr_size_t *, apr_size_t *); -API_DECLARE(apr_status_t) apr_iconv_close(apr_iconv_t, apr_pool_t *); +/** + * Create a conversion descriptor. + * @param to name of charset to convert to. + * @param from name of charset of the input bytes. + * @param pool pool to alloc memory. + * @param cd conversion descriptor created in pool. + */ +API_DECLARE(apr_status_t) apr_iconv_open(const char *to, const char *from, + apr_pool_t *pool, apr_iconv_t *cd); +/** + * Perform character set conversion. + * @param cd conversion descriptor created by apr_iconv_open(). + * @param inbuf input buffer. + * @param inbytesleft bytes to convert. + * @param outbuf output buffer. + * @param outbytesleft space (in bytes) available in outbuf. + * @param translated number of input bytes converted. + */ +API_DECLARE(apr_status_t) apr_iconv(apr_iconv_t cd, + const char **inbuf, apr_size_t *inbytesleft, + char **outbuf, apr_size_t *outbytesleft, + apr_size_t *translated); +/** + * Deallocate descriptor for character set conversion. + * @param cd conversion descriptor. + * @param pool pool used in the apr_iconv_open(). + */ +API_DECLARE(apr_status_t) apr_iconv_close(apr_iconv_t cd, apr_pool_t *pool); /* __END_DECLS */ Modified: apr/apr-iconv/branches/1.0.x/lib/Makefile.in ============================================================================== --- apr/apr-iconv/branches/1.0.x/lib/Makefile.in (original) +++ apr/apr-iconv/branches/1.0.x/lib/Makefile.in Tue Nov 16 16:34:36 2004 @@ -18,20 +18,28 @@ CLEAN_TARGETS = exports.c # May need to do something for apriconv.exports -TARGETS = iconv_module.lo iconv.lo iconv_int.lo iconv_uc.lo \ - iconv_ces.lo iconv_ces_euc.lo iconv_ces_iso2022.lo api_version.lo \ - exports.lo $(TARGET_LIB) +TARGETS = $(TARGET_LIB) -#OBJECTS= +OBJECTS_all = iconv_module.lo iconv.lo iconv_int.lo iconv_uc.lo \ + iconv_ces.lo iconv_ces_euc.lo iconv_ces_iso2022.lo api_version.lo \ + iconv_ccs.lo exports.lo # bring in rules.mk for standard functionality @INCLUDE_RULES@ +# replace build-outputs.mk +OBJECTS_unix = $(OBJECTS_all) + +OBJECTS_aix = $(OBJECTS_all) + +OBJECTS_beos = $(OBJECTS_all) + +OBJECTS_os2 = $(OBJECTS_all) + +OBJECTS_os390 = $(OBJECTS_all) +# end replace -$(TARGET_LIB): - @objects="`find $(SUBDIRS) -name '*.@APR_SO_EXT@' -print`"; \ - tmpcmd="$(LINK) @APR_LIB_TARGET@ $$objects"; \ - echo $$tmpcmd; \ - $$tmpcmd && touch $@ +$(TARGET_LIB): $(OBJECTS) + $(LINK) @APR_LIB_TARGET@ exports.c: $(AWK) -f $(abs_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@ Modified: apr/apr-iconv/branches/1.0.x/lib/charset_alias.h ============================================================================== --- apr/apr-iconv/branches/1.0.x/lib/charset_alias.h (original) +++ apr/apr-iconv/branches/1.0.x/lib/charset_alias.h Tue Nov 16 16:34:36 2004 @@ -17,6 +17,30 @@ } const charset_alias_list[] = { {"424", "cp424"}, {"437", "cp437"}, + {"646", "us-ascii"}, /* OSD_POSIX Alias */ + {"646ca", "iso-ir-121"}, /* OSD_POSIX Alias */ + {"646ca2", "iso-ir-122"}, /* OSD_POSIX Alias */ + {"646cu", "iso-ir-151"}, /* OSD_POSIX Alias */ + {"646de", "iso-ir-21"}, /* OSD_POSIX Alias */ + {"646dk", "iso646-dk"}, /* OSD_POSIX Alias */ + {"646es", "iso-ir-17"}, /* OSD_POSIX Alias */ + {"646es2", "iso-ir-85"}, /* OSD_POSIX Alias */ + {"646fi", "iso-ir-10"}, /* OSD_POSIX Alias */ + {"646fr", "iso-ir-69"}, /* OSD_POSIX Alias */ + {"646fr1", "iso-ir-25"}, /* OSD_POSIX Alias */ + {"646gb", "iso-ir-4"}, /* OSD_POSIX Alias */ + {"646hu", "iso-ir-86"}, /* OSD_POSIX Alias */ + {"646it", "iso-ir-15"}, /* OSD_POSIX Alias */ + {"646jp", "iso-ir-14"}, /* OSD_POSIX Alias */ + {"646kr", "iso646-kr"}, /* OSD_POSIX Alias */ + {"646no", "iso-ir-60"}, /* OSD_POSIX Alias */ + {"646no2", "iso-ir-61"}, /* OSD_POSIX Alias */ + {"646pt", "iso-ir-16"}, /* OSD_POSIX Alias */ + {"646pt2", "iso-ir-84"}, /* OSD_POSIX Alias */ + {"646se", "iso-ir-10"}, /* OSD_POSIX Alias */ + {"646se2", "iso-ir-11"}, /* OSD_POSIX Alias */ + {"646us", "us-ascii"}, /* OSD_POSIX Alias */ + {"646yu", "iso-ir-141"}, /* OSD_POSIX Alias */ {"850", "cp850"}, {"851", "cp851"}, {"852", "cp852"}, @@ -29,6 +53,7 @@ {"865", "cp865"}, {"866", "cp866"}, {"869", "cp869"}, + {"8859", "iso-8859-1"}, {"904", "cp904"}, {"ansi_x3.110-1983", "iso-ir-99"}, {"ansi_x3.4-1968", "us-ascii"}, @@ -147,6 +172,9 @@ {"ecma-114", "iso-8859-6"}, {"ecma-118", "iso-8859-7"}, {"ecma-cyrillic", "iso-ir-111"}, + {"edf04", "osd_ebcdic_df04_1"}, + {"edf04-1", "osd_ebcdic_df04_1"}, + {"edf04-15", "osd_ebcdic_df04_15"}, {"elot_928", "iso-8859-7"}, {"es", "iso-ir-17"}, {"es2", "iso-ir-85"}, @@ -248,6 +276,19 @@ {"iso646-se2", "iso-ir-11"}, {"iso646-us", "us-ascii"}, {"iso646-yu", "iso-ir-141"}, + {"iso8859-1", "iso-8859-1"}, /*name "ISO8859-1" is used by httpd-2.0*/ + {"iso8859-10", "iso-8859-10"}, + {"iso8859-13", "iso-8859-13"}, + {"iso8859-14", "iso-8859-14"}, + {"iso8859-15", "iso-8859-15"}, + {"iso8859-2", "iso-8859-2"}, + {"iso8859-3", "iso-8859-3"}, + {"iso8859-4", "iso-8859-4"}, + {"iso8859-5", "iso-8859-5"}, + {"iso8859-6", "iso-8859-6"}, + {"iso8859-7", "iso-8859-7"}, + {"iso8859-8", "iso-8859-8"}, + {"iso8859-9", "iso-8859-9"}, {"iso_10367-box", "iso-ir-155"}, {"iso_2033-1983", "iso-ir-98"}, {"iso_5427", "iso-ir-37"}, Modified: apr/apr-iconv/branches/1.0.x/lib/iconv.h ============================================================================== --- apr/apr-iconv/branches/1.0.x/lib/iconv.h (original) +++ apr/apr-iconv/branches/1.0.x/lib/iconv.h Tue Nov 16 16:34:36 2004 @@ -40,6 +40,9 @@ #define API_USE_BUILTIN_ALIASES /* Use the built-in charset alias table */ #else #include "apr_iconv_private.h" /* contains ICONV_DEFAULT_PATH */ +#ifdef _OSD_POSIX +#define API_USE_BUILTIN_ALIASES /* Use the built-in charset alias table */ +#endif #endif #include Modified: apr/apr-iconv/branches/1.0.x/util/Makefile.in ============================================================================== --- apr/apr-iconv/branches/1.0.x/util/Makefile.in (original) +++ apr/apr-iconv/branches/1.0.x/util/Makefile.in Tue Nov 16 16:34:36 2004 @@ -8,7 +8,8 @@ @INCLUDE_RULES@ iconv_OBJECTS = iconv.lo iconv_stream.lo -iconv_LDADD = ../lib/libapriconv.la @APR_LIBS@ +iconv_LDADD = ../lib/libapriconv.la +APR_LIBS = @APR_LIBS@ iconv: $(iconv_OBJECTS) $(iconv_LDADD) - $(LINK) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) + $(LINK) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS) $(APR_LIBS)