From: Jeff Trawick Date: Tue, 9 May 2000 20:25:00 +0000 (+0000) Subject: generic EBCDIC support code, changes to rfc1413.c to use APR X-Git-Tag: APACHE_2_0_ALPHA_4~178 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69e47b9ddbf340391eafa467b753715d16cc9765;p=apache generic EBCDIC support code, changes to rfc1413.c to use APR translation in its EBCDIC support git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85171 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/util_ebcdic.h b/include/util_ebcdic.h new file mode 100644 index 0000000000..21360e2bf9 --- /dev/null +++ b/include/util_ebcdic.h @@ -0,0 +1,81 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + +#ifndef APACHE_UTIL_EBCDIC_H +#define APACHE_UTIL_EBCDIC_H + +#ifdef CHARSET_EBCDIC + +#ifdef __cplusplus +extern "C" { +#endif + +#include "apr_xlate.h" + +extern ap_xlate_t *hdrs_to_ascii, *hdrs_from_ascii; +extern ap_xlate_t *locale_to_ascii, *locale_from_ascii; + +ap_status_t ap_init_ebcdic(ap_pool_t *); + +#ifdef __cplusplus +} +#endif + +#endif /* CHARSET_EBCDIC */ + +#endif /* !APACHE_UTIL_EBCDIC_H */ diff --git a/server/Makefile.in b/server/Makefile.in index 9fb0dc51f8..a42954cc51 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -6,7 +6,7 @@ LTLIBRARY_SOURCES = \ uri_delims.h test_char.h \ buff.c http_config.c http_core.c http_log.c http_main.c \ http_protocol.c http_request.c http_vhost.c util.c util_date.c \ - util_script.c util_uri.c util_md5.c util_cfgtree.c \ + util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \ rfc1413.c http_connection.c iol_file.c listen.c include $(top_srcdir)/build/ltlib.mk diff --git a/server/main.c b/server/main.c index 0e5f0b5c50..1e87e79cad 100644 --- a/server/main.c +++ b/server/main.c @@ -63,6 +63,7 @@ #include "http_log.h" #include "http_config.h" #include "util_uri.h" +#include "util_ebcdic.h" #include "apr_getopt.h" #include "ap_mpm.h" @@ -304,7 +305,13 @@ API_EXPORT_NONSTD(int) main(int argc, char *argv[]) pglobal = process->pool; pconf = process->pconf; ap_server_argv0 = process->short_name; - + +#ifdef CHARSET_EBCDIC + if (ap_init_ebcdic(pglobal) != APR_SUCCESS) { + destroy_and_exit_process(process, 1); + } +#endif + ap_util_uri_init(); g_pHookPool=pconf; diff --git a/server/rfc1413.c b/server/rfc1413.c index 16f7b4db3f..4228e08f25 100644 --- a/server/rfc1413.c +++ b/server/rfc1413.c @@ -84,6 +84,7 @@ #include "http_log.h" /* for aplog_error */ #include "rfc1413.h" #include "http_main.h" /* set_callback_and_alarm */ +#include "util_ebcdic.h" #include "apr_network_io.h" #include @@ -116,6 +117,9 @@ static int get_rfc1413(ap_socket_t *sock, const char *local_ip, char *cp; char buffer[RFC1413_MAXDATA + 1]; int buflen; +#ifdef CHARSET_EBCDIC + ap_size_t inbytes_left, outbytes_left; +#endif /* * Bind the local and remote ends of the query socket to the same @@ -150,11 +154,13 @@ static int get_rfc1413(ap_socket_t *sock, const char *local_ip, /* send the data */ buflen = ap_snprintf(buffer, sizeof(buffer), "%u,%u\r\n", sav_rmt_port, sav_our_port); - - /* send query to server. Handle short write. */ #ifdef CHARSET_EBCDIC - ebcdic2ascii(&buffer, &buffer, buflen); + inbytes_left = outbytes_left = buflen; + ap_xlate_conv_buffer(hdrs_to_ascii, buffer, &inbytes_left, + buffer, &outbytes_left); #endif + + /* send query to server. Handle short write. */ i = 0; while(i < strlen(buffer)) { ap_ssize_t j = strlen(buffer + i); @@ -202,7 +208,9 @@ static int get_rfc1413(ap_socket_t *sock, const char *local_ip, /* RFC1413_USERLEN = 512 */ #ifdef CHARSET_EBCDIC - ascii2ebcdic(&buffer, &buffer, (size_t)i); + inbytes_left = outbytes_left = i; + ap_xlate_conv_buffer(hdrs_from_ascii, buffer, &inbytes_left, + buffer, &outbytes_left); #endif if (sscanf(buffer, "%u , %u : USERID :%*[^:]:%512s", &rmt_port, &our_port, user) != 3 || sav_rmt_port != rmt_port diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c new file mode 100644 index 0000000000..e1f5e4cebe --- /dev/null +++ b/server/util_ebcdic.c @@ -0,0 +1,103 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * Portions of this software are based upon public domain software + * originally written at the National Center for Supercomputing Applications, + * University of Illinois, Urbana-Champaign. + */ + +#define CORE_PRIVATE +#include "ap_config.h" + +#ifdef CHARSET_EBCDIC + +#include "httpd.h" +#include "http_log.h" +#include "util_ebcdic.h" + +ap_xlate_t *hdrs_to_ascii, *hdrs_from_ascii; +ap_xlate_t *locale_to_ascii, *locale_from_ascii; + +ap_status_t ap_init_ebcdic(ap_pool_t *pool) +{ + ap_status_t rv; + char buf[80]; + + rv = ap_xlate_open(&hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool); + if (rv) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, + "ap_xlate_open() failed"); + return rv; + } + + rv = ap_xlate_open(&hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool); + if (rv) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, + "ap_xlate_open() failed"); + return rv; + } + + locale_to_ascii = hdrs_to_ascii; /* TODO: "ISO8859-1" to APR_LOCALE_CHARSET */ + locale_from_ascii = hdrs_from_ascii; /* TODO: APR_LOCALE_CHARSET to "ISO8859-1" */ + + rv = ap_MD5InitEBCDIC(hdrs_to_ascii); + if (rv) { + ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, + "ap_MD5InitEBCDIC() failed"); + return rv; + } + + return APR_SUCCESS; +} + +#endif /* CHARSET_EBCDIC */