From c96cc340bb857efb51d07dd193a8c8e55f824a8c Mon Sep 17 00:00:00 2001
From: "William A. Rowe Jr" <wrowe@apache.org>
Date: Sun, 25 Feb 2001 01:12:50 +0000
Subject: [PATCH]   Reconsidered the wisdom of this change... back to the
 drawing board.   The ap_ prefix is still good, IMHO

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88313 13f79535-47bb-0310-9956-ffa450edef68
---
 include/http_config.h |  8 ++++++++
 server/util.c         | 12 ++++++++++--
 support/httpd.exp     |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/include/http_config.h b/include/http_config.h
index 0948bb2913..f335bcf660 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -627,6 +627,14 @@ AP_DECLARE(ap_configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *des
  */
 AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, ap_configfile_t *cfp);
 
+/**
+ * Read one char from open configfile_t, increase line number upon LF 
+ * @param cfp The file to read from
+ * @return the character read
+ * @deffunc int ap_cfg_getc(ap_configfile_t *cfp)
+ */
+AP_DECLARE(int) ap_cfg_getc(ap_configfile_t *cfp);
+
 /**
  * Detach from open ap_configfile_t, calling the close handler
  * @param cfp The file to close
diff --git a/server/util.c b/server/util.c
index 398dfcdb3c..7ff05caa6e 100644
--- a/server/util.c
+++ b/server/util.c
@@ -935,8 +935,16 @@ AP_DECLARE(ap_configfile_t *) ap_pcfg_open_custom(apr_pool_t *p, const char *des
     new_cfg->line_number = 0;
     return new_cfg;
 }
-
-
+   
+/* Read one character from a configfile_t */
+AP_DECLARE(int) ap_cfg_getc(ap_configfile_t *cfp)
+{
+    register int ch = cfp->getch(cfp->param);
+    if (ch == LF) 
+        ++cfp->line_number;
+    return ch;
+}
+  
 /* Read one line from open ap_configfile_t, strip LF, increase line number */
 /* If custom handler does not define a getstr() function, read char by char */
 AP_DECLARE(int) ap_cfg_getline(char *buf, size_t bufsize, ap_configfile_t *cfp)
diff --git a/support/httpd.exp b/support/httpd.exp
index c21caba0c2..242140681b 100644
--- a/support/httpd.exp
+++ b/support/httpd.exp
@@ -91,6 +91,7 @@ ap_bucket_make_shared
 ap_bucket_split_shared
 ap_bwrite_core
 ap_cfg_closefile
+ap_cfg_getch
 ap_cfg_getline
 ap_chdir_file
 ap_check_cmd_context