diff options
| author | Mark Wielaard <mark@klomp.org> | 2007-03-28 09:48:06 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2007-03-28 09:48:06 +0000 |
| commit | 71be6a421ef3de3c883c90ea231346f7aea5bf42 (patch) | |
| tree | 28baa3e6addaada000bfb027ec138f0485482659 /native | |
| parent | 98c1154cb0f7f442890f7955bc6bae7999969279 (diff) | |
| download | classpath-71be6a421ef3de3c883c90ea231346f7aea5bf42.tar.gz | |
* native/jni/java-nio/Makefile.am (LIBADD): Don't add
libclasspathnative.
* native/jni/java-nio/gnu_java_nio_VMChannel.c
(Java_gnu_java_nio_VMChannel_open): Don't set and reset umask.
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/java-nio/Makefile.am | 1 | ||||
| -rw-r--r-- | native/jni/java-nio/gnu_java_nio_VMChannel.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am index 9f2db83f2..b657e044d 100644 --- a/native/jni/java-nio/Makefile.am +++ b/native/jni/java-nio/Makefile.am @@ -12,7 +12,6 @@ libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \ javanio.h libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \ - $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ $(LTLIBICONV) # Directly included through javanio.h diff --git a/native/jni/java-nio/gnu_java_nio_VMChannel.c b/native/jni/java-nio/gnu_java_nio_VMChannel.c index df62d16ed..6ff4ece80 100644 --- a/native/jni/java-nio/gnu_java_nio_VMChannel.c +++ b/native/jni/java-nio/gnu_java_nio_VMChannel.c @@ -1,5 +1,5 @@ /* gnu_java_nio_VMChannel.c - - Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -1609,8 +1609,6 @@ Java_gnu_java_nio_VMChannel_open (JNIEnv *env, int nmode = 0; int ret; const char *npath; - mode_t mask = umask (0); - umask (mask); if ((mode & CPNIO_READ) && (mode & CPNIO_WRITE)) nmode = O_RDWR; @@ -1630,7 +1628,7 @@ Java_gnu_java_nio_VMChannel_open (JNIEnv *env, /* NIODBG("path: %s; mode: %x", npath, nmode); */ - ret = open (npath, nmode, 0777 & ~mask); + ret = open (npath, nmode, 0666); /* NIODBG("ret: %d\n", ret); */ |