Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Message-ID: <20060126214501.94540.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r372616 -
 /apr/apr/branches/0.9.x/file_io/win32/readwrite.c
Date: Thu, 26 Jan 2006 21:45:01 -0000
To: commits@apr.apache.org
From: rooneg@apache.org

Author: rooneg
Date: Thu Jan 26 13:44:59 2006
New Revision: 372616

URL: http://svn.apache.org/viewcvs?rev=372616&view=rev
Log:
Merge r314856 to 0.9.x.

Original log message:

Port r76283, the vformatter logic for unix/readwrite.c to handle arbitrary length strings, to the win32 code; one less test failure.

Modified:
    apr/apr/branches/0.9.x/file_io/win32/readwrite.c

Modified: apr/apr/branches/0.9.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/0.9.x/file_io/win32/readwrite.c?rev=372616&r1=372615&r2=372616&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/0.9.x/file_io/win32/readwrite.c Thu Jan 26 13:44:59 2006
@@ -451,32 +451,47 @@
     }
 }
 
-static int printf_flush(apr_vformatter_buff_t *vbuff)
+struct apr_file_printf_data {
+    apr_vformatter_buff_t vbuff;
+    apr_file_t *fptr;
+    char *buf;
+};
+
+static int file_printf_flush(apr_vformatter_buff_t *buff)
 {
-    /* I would love to print this stuff out to the file, but I will
-     * get that working later.  :)  For now, just return.
-     */
-    return -1;
+    struct apr_file_printf_data *data = (struct apr_file_printf_data *)buff;
+
+    if (apr_file_write_full(data->fptr, data->buf,
+                            data->vbuff.curpos - data->buf, NULL)) {
+        return -1;
+    }
+
+    data->vbuff.curpos = data->buf;
+    return 0;
 }
 
 APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
                                         const char *format, ...)
 {
-    int cc;
+    struct apr_file_printf_data data;
     va_list ap;
-    char *buf;
-    int len;
+    int count;
 
-    buf = malloc(HUGE_STRING_LEN);
-    if (buf == NULL) {
+    data.buf = malloc(HUGE_STRING_LEN);
+    if (data.buf == NULL) {
         return 0;
     }
+    data.vbuff.curpos = data.buf;
+    data.vbuff.endpos = data.buf + HUGE_STRING_LEN;
+    data.fptr = fptr;
     va_start(ap, format);
-    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
-    cc = apr_file_puts(buf, fptr);
-    va_end(ap);
-    free(buf);
-    return (cc == APR_SUCCESS) ? len : -1;
-}
+    count = apr_vformatter(file_printf_flush,
+                           (apr_vformatter_buff_t *)&data, format, ap);
+    /* apr_vformatter does not call flush for the last bits */
+    if (count >= 0) file_printf_flush((apr_vformatter_buff_t *)&data);
 
+    va_end(ap);
 
+    free(data.buf);
+    return count;
+}