Author: hgomez
Date: Tue Apr 24 00:57:36 2007
New Revision: 531813
URL: http://svn.apache.org/viewvc?view=rev&rev=531813
Log:
Not more need for AS400 #ifdef since it use _REETRANT. Also make use of
file_exists() instead of stat
Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=531813&r1=531812&r2=531813
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Tue Apr 24 00:57:36 2007
@@ -249,7 +249,7 @@
const char *l = jk_map_get_string(m, name, def);
char **ar = NULL;
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
char *lasts;
#endif
@@ -269,7 +269,7 @@
* GS, in addition to VG's patch, we now need to
* strtok also by a "*"
*/
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
for (p = strtok_r(v, " \t,", &lasts);
p; p = strtok_r(NULL, " \t,", &lasts))
#else
@@ -305,7 +305,7 @@
{
const char *l = jk_map_get_string(m, name, def);
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
char *lasts;
#endif
@@ -326,7 +326,7 @@
* GS, in addition to VG's patch, we now need to
* strtok also by a "*"
*/
-#if defined(AS400) || defined(_REENTRANT)
+#ifdef _REENTRANT
for (p = strtok_r(v, " \t,", &lasts);
p; p = strtok_r(NULL, " \t,", &lasts))
#else
@@ -849,9 +849,8 @@
int rc = JK_FALSE;
if (m && f) {
- struct stat statbuf;
FILE *fp;
- if ((rc = stat(f, &statbuf)) == -1)
+ if (jk_file_exists(f) != JK_TRUE)
return JK_FALSE;
#if defined(AS400) && !defined(AS400_UTF8)
fp = fopen(f, "r, o_ccsid=0");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
