You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/06/23 15:53:30 UTC
cvs commit: xml-xerces/c/tests Makefile.incl
tng 01/06/23 06:53:30
Modified: c/obj Makefile.in
c/samples Makefile.incl
c/src/util/Platforms/OS390 OS390PlatformUtils.cpp
c/tests Makefile.incl
Log:
OS390 Platform Changes.
Revision Changes Path
1.19 +2 -2 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2000/09/11 18:43:37 1.18
+++ Makefile.in 2001/06/23 13:53:29 1.19
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.in,v 1.18 2000/09/11 18:43:37 aruna1 Exp $
+# $Id: Makefile.in,v 1.19 2001/06/23 13:53:29 tng Exp $
#
###################################################################
@@ -82,7 +82,7 @@
LIB=${XERCESCROOT}/lib
## OS390BATCH
ifeq (${OS390BATCH},1)
-BATCH_TARGET = "//'${LOADMOD}(IXM4C33)'"
+BATCH_TARGET = "//'${LOADMOD}(IXM4C35)'"
endif
ifneq (${PLATFORM}, OS400)
LIBNAME=libxerces-c
1.30 +2 -2 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.incl 2001/06/09 18:08:06 1.29
+++ Makefile.incl 2001/06/23 13:53:29 1.30
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.29 2001/06/09 18:08:06 jberry Exp $
+# $Id: Makefile.incl,v 1.30 2001/06/23 13:53:29 tng Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -238,7 +238,7 @@
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C33)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C35)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
1.17 +33 -5 xml-xerces/c/src/util/Platforms/OS390/OS390PlatformUtils.cpp
Index: OS390PlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/OS390/OS390PlatformUtils.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OS390PlatformUtils.cpp 2000/09/13 22:01:12 1.16
+++ OS390PlatformUtils.cpp 2001/06/23 13:53:29 1.17
@@ -55,7 +55,7 @@
*/
/*
- * $Id: OS390PlatformUtils.cpp,v 1.16 2000/09/13 22:01:12 aruna1 Exp $
+ * $Id: OS390PlatformUtils.cpp,v 1.17 2001/06/23 13:53:29 tng Exp $
*/
@@ -155,6 +155,12 @@
void XMLPlatformUtils::platformInit()
{
+// The next conditional section is to turn on support for allowing
+// the NEL character as a valid whitespace character. Once this is
+// enabled the parser is non-compliant with the XML standard.
+#if defined XML_ALLOW_NELWS
+ XMLPlatformUtils::recognizeNEL(true);
+#endif
}
// ---------------------------------------------------------------------------
@@ -294,8 +300,8 @@
// path/path2/filename => //path.path2.filename
char* datasetName = new char[ strlen(tmpFileName) + 5 ];
+ ArrayJanitor<char> janText((char*)datasetName);
char *datasetPos = datasetName, *tmpPos = tmpFileName;
- FileHandle retVal;
// We are in EBCDIC mode here
// Specify "//" to indicate that the filename refers to a non-POSIX file
@@ -352,9 +358,20 @@
retVal = (FILE*)fopen( datasetName , "rb" );
- delete [] datasetName;
}
#endif
+
+ // fix for file:// protocol
+ // the tmpFileName has a prefix of //absolute path
+ // for example, file:////u/.... instead of file:///u/....
+ // the fopen() on OS/390 cannot open a //u/... POSIX file
+ if (retVal == NULL) {
+ if ((tmpFileName[0] == '/') && (tmpFileName[1] == '/')) {
+ char *srcName = tmpFileName + 1; // points past the first '/'
+ retVal = (FILE*)fopen( srcName , "rb" );
+ }
+ }
+
if( retVal == NULL )
return 0;
return retVal;
@@ -377,8 +394,8 @@
// path/path2/filename => //path.path2.filename
char* datasetName = new char[ strlen(fileName) + 5 ];
+ ArrayJanitor<char> janText((char*)datasetName);
char *datasetPos = datasetName, *tmpPos = (char *)fileName;
- FileHandle retVal;
// We are in EBCDIC mode here
// Specify "//" to indicate that the filename refers to a non-POSIX file
@@ -435,9 +452,20 @@
retVal = (FILE*)fopen( datasetName , "rb" );
- delete [] datasetName;
}
#endif
+
+ // fix for file:// protocol
+ // the fileName has a prefix of //absolute path
+ // for example, file:////u/.... instead of file:///u/....
+ // the fopen() on OS/390 cannot open a //u/... POSIX file
+ if (retVal == NULL) {
+ if ((fileName[0] == '/') && (fileName[1] == '/')) {
+ const char *srcName = fileName + 1; // points past the first '/'
+ retVal = (FILE*)fopen( srcName , "rb" );
+ }
+ }
+
if( retVal == NULL )
return 0;
return retVal;
1.14 +2 -2 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.incl 2001/06/09 18:06:50 1.13
+++ Makefile.incl 2001/06/23 13:53:30 1.14
@@ -55,7 +55,7 @@
#
#
-# $Id: Makefile.incl,v 1.13 2001/06/09 18:06:50 jberry Exp $
+# $Id: Makefile.incl,v 1.14 2001/06/23 13:53:30 tng Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -197,7 +197,7 @@
OS390SIDEDECK=.x
## OS390BATCH
ifeq (${OS390BATCH},1)
-LIBRARY_NAMES="//'${LOADEXP}(IXM4C33)'"
+LIBRARY_NAMES="//'${LOADEXP}(IXM4C35)'"
else
LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${VER}${OS390SIDEDECK}
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org