gstein 00/12/08 03:03:34
Added: src/buckets ap_buckets_util.c Log: Add a copy() function to the buckets. Also adds two utility functions: ap_bucket_split_any() and ap_bucket_copy_any(). Submitted by: Cliff Woolley <[EMAIL PROTECTED]> Revision Changes Path 1.1 apr-util/src/buckets/ap_buckets_util.c Index: ap_buckets_util.c =================================================================== /* ==================================================================== * 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 [EMAIL PROTECTED] * * 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 * <http://www.apache.org/>. */ #include "apr_lib.h" #include "ap_buckets.h" APR_DECLARE(apr_status_t) ap_bucket_split_any(ap_bucket *e, apr_off_t point) { apr_status_t rv; const char *str; apr_size_t len; /* try to split this bucket directly */ rv = ap_bucket_split(e, point); if (rv != APR_ENOTIMPL) { return rv; } /* if the bucket cannot be split, we must read from it, * changing its type to one that can be split */ if (point < 0) { return APR_EINVAL; } rv = ap_bucket_read(e, &str, &len, AP_BLOCK_READ); if (rv != APR_SUCCESS) { return rv; } if (point > len) { return APR_EINVAL; } return ap_bucket_split(e, point); } APR_DECLARE(apr_status_t) ap_bucket_copy_any(ap_bucket *e, ap_bucket **c) { apr_status_t rv; const char *str; apr_size_t len; /* try to copy the bucket directly */ rv = ap_bucket_copy(e, c); if (rv != APR_ENOTIMPL) { return rv; } /* if the bucket cannot be copied, we must read from it, * changing its type to one that can be copied */ rv = ap_bucket_read(e, &str, &len, AP_BLOCK_READ); if (rv != APR_SUCCESS) { return rv; } return ap_bucket_copy(e, c); }
