You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/09/14 01:16:01 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util FileUtil.java
pier 00/09/13 16:16:01
Modified: src/share/org/apache/tomcat/util Tag: tomcat_32
FileUtil.java
Log:
Handle pathnames on NetWare.
Thanks to Mike Anderson <mm...@novell.com>.
Revision Changes Path
No revision
No revision
1.9.2.3 +16 -3 jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- FileUtil.java 2000/08/28 02:50:43 1.9.2.2
+++ FileUtil.java 2000/09/13 23:16:00 1.9.2.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v 1.9.2.2 2000/08/28 02:50:43 larryi Exp $
- * $Revision: 1.9.2.2 $
- * $Date: 2000/08/28 02:50:43 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/FileUtil.java,v 1.9.2.3 2000/09/13 23:16:00 pier Exp $
+ * $Revision: 1.9.2.3 $
+ * $Date: 2000/09/13 23:16:00 $
*
* ====================================================================
*
@@ -265,6 +265,12 @@
patchPath = sb.toString();
}
+ // fix path on NetWare
+ if (System.getProperty("os.name").startsWith("NetWare") &&
+ path.length() >=3 &&
+ path.indexOf(':') > 0)
+ patchPath = patchPath.replace('/', '\\');
+
return patchPath;
}
@@ -279,6 +285,13 @@
Character.isLetter(path.charAt(0)) &&
path.charAt(1) == ':')
return true;
+
+ // NetWare volume:
+ if (System.getProperty("os.name").startsWith("NetWare") &&
+ path.length() >=3 &&
+ path.indexOf(':') > 0)
+ return true;
+
return false;
}