#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
if (fd != -1)
{
#ifndef WIN32
- fcntl (fd, F_SETFD, FD_CLOEXEC);
- if (nonblock)
- fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
+ 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 });
+ if (nonblock)
+ ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
#endif
return fd;
}