From: Joe Orton <jorton@apache.org>
Date: Wed, 22 Sep 2004 19:47:51 +0000 (+0000)
Subject: * server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__
X-Git-Tag: 2.1.1~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df6a1b30c28f6a74199f0b273ccb3cb15ea17c4c;p=apache

* server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__
is an absolute path (as in a VPATH build), just log the basename.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105258 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/log.c b/server/log.c
index 0d6835a47f..4324944f9b 100644
--- a/server/log.c
+++ b/server/log.c
@@ -459,7 +459,14 @@ static void log_error_core(const char *file, int line, int level,
             }
             file = tmp;
         }
-#endif /*_OSD_POSIX*/
+#else /* _OSD_POSIX || WIN32 */
+        const char *p;
+        /* On Unix, __FILE__ may be an absolute path in a
+         * VPATH build. */
+        if (file[0] == '/' && (p = ap_strrchr_c(file, '/')) != NULL) {
+            file = p + 1;
+        }
+#endif /*_OSD_POSIX || WIN32 */
         len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
                             "%s(%d): ", file, line);
     }