
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
142 lines
3.9 KiB
C
142 lines
3.9 KiB
C
/* javanio.c -- implementations of functions in javanio.h.
|
|
Copyright (C) 2006 Free Software Foundation, Inc.
|
|
|
|
This file is a part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or (at
|
|
your option) any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
|
|
USA
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
/*
|
|
* Note, because these functions are trivial, and should be inlined,
|
|
* we include this file in the header, and do not compile it.
|
|
*/
|
|
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/select.h>
|
|
#include <sys/uio.h>
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_read (int fd, void *buf, size_t nbytes)
|
|
{
|
|
return read (fd, buf, nbytes);
|
|
}
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_readv (int fd, const struct iovec *iov, int iovcnt)
|
|
{
|
|
return readv (fd, iov, iovcnt);
|
|
}
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_write (int fd, const void *buf, size_t nbytes)
|
|
{
|
|
return write (fd, buf, nbytes);
|
|
}
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_writev (int fd, const struct iovec *iov, size_t iovcnt)
|
|
{
|
|
return writev (fd, iov, iovcnt);
|
|
}
|
|
|
|
CPNIO_EXPORT int
|
|
cpnio_socket (int domain, int type, int protocol)
|
|
{
|
|
return socket (domain, type, protocol);
|
|
}
|
|
|
|
CPNIO_EXPORT int
|
|
cpnio_connect (int fd, const struct sockaddr *addr, socklen_t addrlen)
|
|
{
|
|
return connect (fd, addr, addrlen);
|
|
}
|
|
|
|
CPNIO_EXPORT int
|
|
cpnio_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
|
|
{
|
|
fd_set rset;
|
|
struct timeval tv;
|
|
socklen_t tvlen = sizeof(tv);
|
|
int ret;
|
|
|
|
tv.tv_sec = 0;
|
|
tv.tv_usec = 0;
|
|
getsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, &tv, &tvlen);
|
|
if (tv.tv_sec > 0 || tv.tv_usec > 0)
|
|
{
|
|
FD_ZERO(&rset);
|
|
FD_SET(fd,&rset);
|
|
ret = select (fd+1,&rset,NULL,NULL,&tv);
|
|
if (ret == 0)
|
|
{
|
|
errno = EAGAIN;
|
|
return -1;
|
|
}
|
|
}
|
|
return accept (fd, addr, addrlen);
|
|
}
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_sendto (int fd, const void *msg, size_t len, int flags,
|
|
const struct sockaddr *to, socklen_t tolen)
|
|
{
|
|
return sendto (fd, msg, len, flags, to, tolen);
|
|
}
|
|
|
|
CPNIO_EXPORT ssize_t
|
|
cpnio_recvfrom (int fd, void *buf, size_t len, int flags,
|
|
struct sockaddr *from, socklen_t *fromlen)
|
|
{
|
|
return recvfrom (fd, buf, len, flags, from, fromlen);
|
|
}
|
|
|
|
CPNIO_EXPORT int
|
|
cpnio_fcntl (int fd, int cmd, long arg)
|
|
{
|
|
#ifdef HAVE_FCNTL
|
|
return fcntl (fd, cmd, arg);
|
|
#else
|
|
errno = ENOSUP;
|
|
return -1;
|
|
#endif /* HAVE_FCNTL */
|
|
}
|
|
|
|
CPNIO_EXPORT int
|
|
cpnio_select (int nfds, fd_set *readfds, fd_set *writefds,
|
|
fd_set *excepfds, struct timeval *timeo)
|
|
{
|
|
return select (nfds, readfds, writefds, excepfds, timeo);
|
|
}
|