[kaffe] CVS kaffe (doogie): Convert stat() back to lstat(), and call KREMOVE unconditionally.

Kaffe CVS cvs-commits at kaffe.org
Sat Dec 25 22:46:33 PST 2004


PatchSet 5724 
Date: 2004/12/26 05:52:31
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
Convert stat() back to lstat(), and call KREMOVE unconditionally.

Members: 
	kaffe/kaffevm/systems/unix-jthreads/syscalls.c:1.15->1.16 
	kaffe/kaffevm/systems/unix-pthreads/syscalls.c:1.24->1.25 
	libraries/clib/io/File.c:1.25->1.26 

Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/syscalls.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/syscalls.c:1.15 kaffe/kaffe/kaffevm/systems/unix-jthreads/syscalls.c:1.16
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/syscalls.c:1.15	Sun Dec 19 22:46:29 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/syscalls.c	Sun Dec 26 05:52:31 2004
@@ -108,7 +108,7 @@
 	int rc = 0;
 
 	jthread_spinon(0);
-	if (lstat(path, sb) == -1) {
+	if (stat(path, sb) == -1) {
 		rc = errno;
 	}
 	jthread_spinoff(0);
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/syscalls.c
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/syscalls.c:1.24 kaffe/kaffe/kaffevm/systems/unix-pthreads/syscalls.c:1.25
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/syscalls.c:1.24	Mon Dec 20 02:29:52 2004
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/syscalls.c	Sun Dec 26 05:52:33 2004
@@ -233,7 +233,7 @@
 {
 	int rc = 0;
 
-	if (lstat(path, sb) == -1) {
+	if (stat(path, sb) == -1) {
 		rc = errno;
 	}
 	return (rc);
Index: kaffe/libraries/clib/io/File.c
diff -u kaffe/libraries/clib/io/File.c:1.25 kaffe/libraries/clib/io/File.c:1.26
--- kaffe/libraries/clib/io/File.c:1.25	Mon Dec 20 03:40:01 2004
+++ kaffe/libraries/clib/io/File.c	Sun Dec 26 05:52:34 2004
@@ -188,10 +188,7 @@
 	
 	stringJava2CBuf(fileName, str, sizeof(str));
 
-	if (java_io_VMFile_isDirectory(fileName))
-	  r = KRMDIR(str);
-	else
-	  r = KREMOVE(str);
+	r = KREMOVE(str);
 	return(r != 0 ? 0 : 1);
 }
 




More information about the kaffe mailing list