Index: src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.12
diff -u -r1.12 AbstractCvsTask.java
--- src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java	25 Apr 2002 12:14:49 -0000	1.12
+++ src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java	28 May 2002 20:16:49 -0000
@@ -276,17 +276,16 @@
          * Need a better cross platform integration with <cvspass>, so
          * use the same filename.
          */
-        /* But currently we cannot because 'cvs log' is not working
-         * with a pass file.
-        if(passFile == null){
+        if(passFile == null) {
 
-            File defaultPassFile = new File(System.getProperty("user.home") 
+            File defaultPassFile = new File(
+            	System.getProperty("cygwin.user.home",
+            		System.getProperty("user.home")) 
                 + File.separatorChar + ".cvspass");
 
             if(defaultPassFile.exists())
                 this.setPassfile(defaultPassFile);
         }
-         */
 
         if (passFile != null) {
             Environment.Variable var = new Environment.Variable();
@@ -468,7 +467,6 @@
     }
 
     public File getPassFile(){
-
         return this.passFile;
     }
 
@@ -477,7 +475,6 @@
     }
 
     public File getDest(){
-
         return this.dest;
     }
 
@@ -486,7 +483,6 @@
     }
 
     public String getPackage(){
-
         return this.cvsPackage;
     }
 
Index: src/main/org/apache/tools/ant/taskdefs/CVSPass.java
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
retrieving revision 1.13
diff -u -r1.13 CVSPass.java
--- src/main/org/apache/tools/ant/taskdefs/CVSPass.java	16 Apr 2002 07:15:18 -0000	1.13
+++ src/main/org/apache/tools/ant/taskdefs/CVSPass.java	28 May 2002 20:16:49 -0000
@@ -110,7 +110,10 @@
      * Create a CVS task using the default cvspass file location.
      */
     public CVSPass(){
-        passFile = new File(System.getProperty("user.home") + "/.cvspass");
+		passFile = new File(
+			System.getProperty("cygwin.user.home",
+				System.getProperty("user.home"))
+			+ File.separatorChar + ".cvspass");
     }
 
     /**
Index: src/script/ant
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/script/ant,v
retrieving revision 1.19
diff -u -r1.19 ant
--- src/script/ant	29 Apr 2002 21:35:16 -0000	1.19
+++ src/script/ant	28 May 2002 20:16:50 -0000
@@ -175,6 +175,7 @@
   JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+  ANT_OPTS="$ANT_OPTS -Dcygwin.user.home="`cygpath --path --windows "$HOME"`
 fi
 
 "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main $ANT_ARGS "$@"