jerenkrantz 02/01/31 20:43:22
Added: file_io/unix copy.c Log: Add apr_file_copy() and apr_file_append() functions. These are written in terms of APR itself, so each platform just uses the one function. A future improvement would use CopyFile(Ex) on Windows and sendfile() on sendfile-capable systems. Also add apr_file_attrs_set() for setting file attributes in a logical fashion, rather than based on (Posix) permission bits. This is not (yet) implemented for Windows, and still needs a way to turn *off* the readonly and executable modes. Submitted by: Philip Martin <[EMAIL PROTECTED]> Revision Changes Path 1.1 apr/file_io/unix/copy.c Index: copy.c =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2002 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 "fileio.h" #include "apr_file_io.h" static apr_status_t apr_file_transfer_contents(const char *from_path, const char *to_path, apr_int32_t flags, apr_fileperms_t to_perms, apr_pool_t *pool) { apr_file_t *s = NULL, *d = NULL; /* init to null important for APR */ apr_status_t status; apr_status_t read_err, write_err; apr_finfo_t finfo; apr_fileperms_t perms; char buf[BUFSIZ]; /* Open source file. */ status = apr_file_open(&s, from_path, APR_READ, APR_OS_DEFAULT, pool); if (status) return status; /* Get its size. */ if (to_perms == APR_FILE_SOURCE_PERMS) { status = apr_file_info_get(&finfo, APR_FINFO_PROT, s); if (status) { apr_file_close(s); /* toss any error */ return status; } perms = finfo.protection; } else perms = to_perms; /* Open dest file. */ status = apr_file_open(&d, to_path, flags, perms, pool); if (status) { apr_file_close(s); /* toss any error */ return status; } /* Copy bytes till the cows come home. */ read_err = 0; while (!APR_STATUS_IS_EOF(read_err)) { apr_size_t bytes_this_time = sizeof (buf); /* Read 'em. */ read_err = apr_file_read(s, buf, &bytes_this_time); if (read_err && !APR_STATUS_IS_EOF(read_err)) { apr_file_close(s); /* toss any error */ apr_file_close(d); /* toss any error */ return read_err; } /* Write 'em. */ write_err = apr_file_write_full(d, buf, bytes_this_time, NULL); if (write_err) { apr_file_close(s); /* toss any error */ apr_file_close(d); /* toss any error */ return write_err; } if (read_err && APR_STATUS_IS_EOF(read_err)) { status = apr_file_close (s); if (status) { apr_file_close(d); /* toss any error */ return status; } status = apr_file_close (d); if (status) return status; } } return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_file_copy(const char *from_path, const char *to_path, apr_fileperms_t perms, apr_pool_t *pool) { return apr_file_transfer_contents(from_path, to_path, (APR_WRITE | APR_CREATE | APR_TRUNCATE), perms, pool); } APR_DECLARE(apr_status_t) apr_file_append(const char *from_path, const char *to_path, apr_fileperms_t perms, apr_pool_t *pool) { return apr_file_transfer_contents(from_path, to_path, (APR_WRITE | APR_CREATE | APR_APPEND), perms, pool); }
