From cvs-return-2857-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Fri Feb 01 06:31:22 2002 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 58596 invoked by uid 500); 1 Feb 2002 06:31:21 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 58585 invoked from network); 1 Feb 2002 06:31:21 -0000 Date: 1 Feb 2002 06:31:20 -0000 Message-ID: <20020201063120.74698.qmail@icarus.apache.org> From: gstein@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/file_io/unix copy.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N gstein 02/01/31 22:31:20 Modified: file_io/unix copy.c Log: some style changes. other tweaks. Revision Changes Path 1.2 +27 -30 apr/file_io/unix/copy.c Index: copy.c =================================================================== RCS file: /home/cvs/apr/file_io/unix/copy.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- copy.c 1 Feb 2002 04:43:22 -0000 1.1 +++ copy.c 1 Feb 2002 06:31:20 -0000 1.2 @@ -55,25 +55,22 @@ #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) +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); @@ -92,11 +89,13 @@ 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); + while (1) { + char buf[BUFSIZ]; + apr_size_t bytes_this_time = sizeof(buf); + apr_status_t read_err; + apr_status_t write_err; /* Read 'em. */ read_err = apr_file_read(s, buf, &bytes_this_time); @@ -115,39 +114,37 @@ } if (read_err && APR_STATUS_IS_EOF(read_err)) { - status = apr_file_close (s); + 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 the results of this close: an error, or success */ + return apr_file_close(d); } } - - return APR_SUCCESS; + /* NOTREACHED */ } -APR_DECLARE(apr_status_t) apr_file_copy(const char *from_path, +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); + 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, +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); + return apr_file_transfer_contents(from_path, to_path, + (APR_WRITE | APR_CREATE | APR_APPEND), + perms, + pool); }