#include <assert.h>
#include <stdio.h>
+#include <limits.h> /* NAME_MAX */
#include <errno.h>
#include <sys/types.h>
#ifdef HAVE_DIRENT_H
return -1;
}
-#ifdef HAVE_FDOPENDIR
+#ifdef HAVE_OPENAT
int fd = openat (dir, local_name, flags, mode);
# ifdef HAVE_FCNTL
if (fd != -1)
return FromWide (ent->d_name);
#else
struct dirent *ent;
-
- ent = readdir( (DIR *)dir );
- if( ent == NULL )
+ struct
+ {
+ struct dirent ent;
+ char buf[NAME_MAX + 1];
+ } buf;
+ int val = readdir_r (dir, &buf.ent, &ent);
+ if (val)
+ {
+ errno = val;
return NULL;
-
- return vlc_fix_readdir( ent->d_name );
+ }
+ return ent ? vlc_fix_readdir( ent->d_name ) : NULL;
#endif
}
else
return -1;
#else
- return _wrename (wold, wnew);
+ if (_wrename (wold, wnew) && errno == EACCES)
+ { /* Windows does not allow atomic file replacement */
+ if (_wremove (wnew))
+ {
+ errno = EACCES; /* restore errno */
+ return -1;
+ }
+ if (_wrename (wold, wnew))
+ return -1;
+ }
+ return 0;
#endif
#endif
return newfd;
}
+#include <vlc_network.h>
+
/**
* Creates a socket file descriptor. The new file descriptor has the
* close-on-exec flag set.
type |= SOCK_CLOEXEC;
if (nonblock)
type |= SOCK_NONBLOCK;
- fd = socket (pf, type | SOCK_NONBLOCK | SOCK_CLOEXEC, proto);
+ fd = socket (pf, type, proto);
if (fd != -1 || errno != EINVAL)
return fd;
#endif
return fd;
}
+
+/**
+ * Accepts an inbound connection request on a listening socket.
+ * The new file descriptor has the close-on-exec flag set.
+ * @param lfd listening socket file descriptor
+ * @param addr pointer to the peer address or NULL [OUT]
+ * @param alen pointer to the length of the peer address or NULL [OUT]
+ * @param nonblock whether to put the new socket in non-blocking mode
+ * @return a new file descriptor, or -1 on error.
+ */
+int vlc_accept (int lfd, struct sockaddr *addr, socklen_t *alen, bool nonblock)
+{
+#ifdef HAVE_ACCEPT4
+ int flags = SOCK_CLOEXEC;
+ if (nonblock)
+ flags |= SOCK_NONBLOCK;
+
+ do
+ {
+ int fd = accept4 (lfd, addr, alen, flags);
+ if (fd != -1)
+ return fd;
+ }
+ while (errno == EINTR);
+
+ if (errno != ENOSYS)
+ return -1;
+#endif
+#ifdef WIN32
+ errno = 0;
+#endif
+
+ do
+ {
+ int fd = accept (lfd, addr, alen);
+ if (fd != -1)
+ {
+#ifndef WIN32
+ fcntl (fd, F_SETFD, FD_CLOEXEC);
+ if (nonblock)
+ fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
+#else
+ if (nonblock)
+ ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
+#endif
+ return fd;
+ }
+ }
+ while (errno == EINTR);
+
+ return -1;
+}