ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/eio.c
(Generate patch)

Comparing libeio/eio.c (file contents):
Revision 1.139 by root, Thu Jun 25 18:14:19 2015 UTC vs.
Revision 1.158 by root, Mon Mar 18 23:52:09 2019 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2017,2018,2019 Marc Alexander Lehmann <libeio@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
42#endif 42#endif
43 43
44#include "eio.h" 44#include "eio.h"
45#include "ecb.h" 45#include "ecb.h"
46 46
47#ifdef EIO_STACKSIZE
48# define X_STACKSIZE EIO_STACKSIZE
49#endif
50#include "xthread.h"
51
52#include <errno.h> 47#include <errno.h>
53#include <stddef.h> 48#include <stddef.h>
54#include <stdlib.h> 49#include <stdlib.h>
55#include <string.h> 50#include <string.h>
56#include <errno.h> 51#include <errno.h>
… …
122 #define chmod(path,mode) _chmod (path, mode) 117 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 118 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 119 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY) 120 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
126 121
122 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
123 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
127 #define fchmod(fd,mode) EIO_ENOSYS () 124 #define fchmod(fd,mode) EIO_ENOSYS ()
128 #define chown(path,uid,gid) EIO_ENOSYS () 125 #define chown(path,uid,gid) EIO_ENOSYS ()
129 #define fchown(fd,uid,gid) EIO_ENOSYS () 126 #define fchown(fd,uid,gid) EIO_ENOSYS ()
130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 127 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 128 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
204 /* we could even stat and see if it exists */ 201 /* we could even stat and see if it exists */
205 static int 202 static int
206 symlink (const char *old, const char *neu) 203 symlink (const char *old, const char *neu)
207 { 204 {
208 #if WINVER >= 0x0600 205 #if WINVER >= 0x0600
206 int flags;
207
208 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
209 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
210 * with directory first.
211 */
212 for (flags = 3; flags >= 0; --flags)
209 if (CreateSymbolicLink (neu, old, 1)) 213 if (CreateSymbolicLink (neu, old, flags))
210 return 0; 214 return 0;
211
212 if (CreateSymbolicLink (neu, old, 0))
213 return 0;
214 #endif 215 #endif
215 216
216 return EIO_ERRNO (ENOENT, -1); 217 return EIO_ERRNO (ENOENT, -1);
217 } 218 }
218 219
… …
230 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
231 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) 232 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
232 233
233#else 234#else
234 235
236 #include <sys/ioctl.h>
235 #include <sys/time.h> 237 #include <sys/time.h>
236 #include <sys/select.h> 238 #include <sys/select.h>
237 #include <unistd.h> 239 #include <unistd.h>
238 #include <signal.h> 240 #include <signal.h>
239 #include <dirent.h> 241 #include <dirent.h>
… …
281# include <utime.h> 283# include <utime.h>
282#endif 284#endif
283 285
284#if HAVE_SYS_SYSCALL_H 286#if HAVE_SYS_SYSCALL_H
285# include <sys/syscall.h> 287# include <sys/syscall.h>
286#endif
287
288#if HAVE_SYS_PRCTL_H
289# include <sys/prctl.h>
290#endif 288#endif
291 289
292#if HAVE_SENDFILE 290#if HAVE_SENDFILE
293# if __linux 291# if __linux
294# include <sys/sendfile.h> 292# include <sys/sendfile.h>
… …
302# else 300# else
303# error sendfile support requested but not available 301# error sendfile support requested but not available
304# endif 302# endif
305#endif 303#endif
306 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
307#ifndef D_TYPE 310#ifndef D_TYPE
308# define D_TYPE(de) 0 311# define D_TYPE(de) 0
309#endif 312#endif
310#ifndef D_INO 313#ifndef D_INO
311# define D_INO(de) 0 314# define D_INO(de) 0
… …
319# define NAME_MAX 4096 322# define NAME_MAX 4096
320#endif 323#endif
321 324
322/* used for readlink etc. */ 325/* used for readlink etc. */
323#ifndef PATH_MAX 326#ifndef PATH_MAX
324# define PATH_MAX 4096 327# define PATH_MAX 0
325#endif 328#endif
329
330#ifndef O_CLOEXEC
331 #define O_CLOEXEC 0
332#endif
333
334#ifndef O_NONBLOCK
335 #define O_NONBLOCK 0
336#endif
337
338#ifndef O_SEARCH
339 #define O_SEARCH O_RDONLY
340#endif
341
342#ifndef O_DIRECTORY
343 #define O_DIRECTORY 0
344#endif
345
346#ifndef EIO_PATH_MIN
347# define EIO_PATH_MIN 8160
348#endif
349
350#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
326 351
327/* buffer size for various temporary buffers */ 352/* buffer size for various temporary buffers */
328#define EIO_BUFSIZE 65536 353#define EIO_BUFSIZE 65536
329 354
330#define dBUF \ 355#define dBUF \
… …
341struct etp_tmpbuf; 366struct etp_tmpbuf;
342 367
343#if _POSIX_VERSION >= 200809L 368#if _POSIX_VERSION >= 200809L
344 #define HAVE_AT 1 369 #define HAVE_AT 1
345 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 370 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
346 #ifndef O_SEARCH
347 #define O_SEARCH O_RDONLY
348 #endif
349#else 371#else
350 #define HAVE_AT 0 372 #define HAVE_AT 0
351 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path); 373 static const char *wd_expand (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path);
352#endif 374#endif
353 375
… …
543 return etp_poll (EIO_POOL); 565 return etp_poll (EIO_POOL);
544} 566}
545 567
546/*****************************************************************************/ 568/*****************************************************************************/
547/* work around various missing functions */ 569/* work around various missing functions */
570
571#if HAVE_POSIX_CLOSE && !__linux
572# define eio__close(fd) posix_close (fd, 0)
573#else
574# define eio__close(fd) close (fd)
575#endif
576
577/* close() without disturbing errno */
578static void
579silent_close (int fd)
580{
581 int saved_errno = errno;
582 eio__close (fd);
583 errno = saved_errno;
584}
548 585
549#ifndef HAVE_UTIMES 586#ifndef HAVE_UTIMES
550 587
551# undef utimes 588# undef utimes
552# define utimes(path,times) eio__utimes (path, times) 589# define utimes(path,times) eio__utimes (path, times)
… …
865 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 902 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
866 extern int mallopt (int, int); 903 extern int mallopt (int, int);
867 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */ 904 mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
868 #endif 905 #endif
869 906
907 #ifndef MCL_ONFAULT
908 if (flags & EIO_MCL_ONFAULT)
909 return EIO_ERRNO (EINVAL, -1);
910 #define MCL_ONFAULT 4
911 #endif
912
870 if (EIO_MCL_CURRENT != MCL_CURRENT 913 if (EIO_MCL_CURRENT != MCL_CURRENT
871 || EIO_MCL_FUTURE != MCL_FUTURE) 914 || EIO_MCL_FUTURE != MCL_FUTURE
915 || EIO_MCL_ONFAULT != MCL_ONFAULT)
872 { 916 {
873 flags = 0 917 flags = 0
874 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) 918 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
875 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); 919 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0)
920 | (flags & EIO_MCL_ONFAULT ? MCL_ONFAULT : 0)
921 ;
876 } 922 }
877 923
878 return mlockall (flags); 924 return mlockall (flags);
879} 925}
880#endif 926#endif
… …
931 intptr_t end = addr + len; 977 intptr_t end = addr + len;
932 intptr_t page = eio_pagesize (); 978 intptr_t page = eio_pagesize ();
933 979
934 if (addr < end) 980 if (addr < end)
935 if (flags & EIO_MT_MODIFY) /* modify */ 981 if (flags & EIO_MT_MODIFY) /* modify */
936 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < len && !EIO_CANCELLED (req)); 982 do { *((volatile sig_atomic_t *)addr) |= 0; } while ((addr += page) < end && !EIO_CANCELLED (req));
937 else 983 else
938 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < len && !EIO_CANCELLED (req)); 984 do { *((volatile sig_atomic_t *)addr) ; } while ((addr += page) < end && !EIO_CANCELLED (req));
939 } 985 }
940 986
941 return 0; 987 return 0;
942} 988}
943 989
… …
977 1023
978 errno = ENOENT; 1024 errno = ENOENT;
979 if (!*rel) 1025 if (!*rel)
980 return -1; 1026 return -1;
981 1027
982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 1028 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
983#ifdef _WIN32 1029#ifdef _WIN32
984 if (_access (rel, 4) != 0) 1030 if (_access (rel, 4) != 0)
985 return -1; 1031 return -1;
986 1032
987 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 1033 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
988 1034
989 errno = ENAMETOOLONG; 1035 errno = ENAMETOOLONG;
990 if (symlinks >= PATH_MAX * 3) 1036 if (symlinks >= EIO_PATH_MAX * 3)
991 return -1; 1037 return -1;
992 1038
993 errno = EIO; 1039 errno = EIO;
994 if (symlinks <= 0) 1040 if (symlinks <= 0)
995 return -1; 1041 return -1;
996 1042
997 return symlinks; 1043 return symlinks;
998 1044
999#else 1045#else
1000 tmp1 = res + PATH_MAX; 1046 tmp1 = res + EIO_PATH_MAX;
1001 tmp2 = tmp1 + PATH_MAX; 1047 tmp2 = tmp1 + EIO_PATH_MAX;
1002 1048
1003#if 0 /* disabled, the musl way to do things is just too racy */ 1049#if 0 /* disabled, the musl way to do things is just too racy */
1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1050#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1005 /* on linux we may be able to ask the kernel */ 1051 /* on linux we may be able to ask the kernel */
1006 { 1052 {
1007 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1053 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1008 1054
1009 if (fd >= 0) 1055 if (fd >= 0)
1010 { 1056 {
1011 sprintf (tmp1, "/proc/self/fd/%d", fd); 1057 sprintf (tmp1, "/proc/self/fd/%d", fd);
1012 req->result = readlink (tmp1, res, PATH_MAX); 1058 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1013 /* here we should probably stat the open file and the disk file, to make sure they still match */ 1059 /* here we should probably stat the open file and the disk file, to make sure they still match */
1014 close (fd); 1060 eio__close (fd);
1015 1061
1016 if (req->result > 0) 1062 if (req->result > 0)
1017 goto done; 1063 goto done;
1018 } 1064 }
1019 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1065 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
… …
1030 if (wd == EIO_INVALID_WD) 1076 if (wd == EIO_INVALID_WD)
1031 return -1; 1077 return -1;
1032 1078
1033 if (wd == EIO_CWD) 1079 if (wd == EIO_CWD)
1034 { 1080 {
1035 if (!getcwd (res, PATH_MAX)) 1081 if (!getcwd (res, EIO_PATH_MAX))
1036 return -1; 1082 return -1;
1037 1083
1038 len = strlen (res); 1084 len = strlen (res);
1039 } 1085 }
1040 else 1086 else
… …
1087 1133
1088 /* zero-terminate, for readlink */ 1134 /* zero-terminate, for readlink */
1089 res [len + 1] = 0; 1135 res [len + 1] = 0;
1090 1136
1091 /* now check if it's a symlink */ 1137 /* now check if it's a symlink */
1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1138 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1093 1139
1094 if (linklen < 0) 1140 if (linklen < 0)
1095 { 1141 {
1096 if (errno != EINVAL) 1142 if (errno != EINVAL)
1097 return -1; 1143 return -1;
… …
1103 { 1149 {
1104 /* yay, it was a symlink - build new path in tmp2 */ 1150 /* yay, it was a symlink - build new path in tmp2 */
1105 int rellen = strlen (rel); 1151 int rellen = strlen (rel);
1106 1152
1107 errno = ENAMETOOLONG; 1153 errno = ENAMETOOLONG;
1108 if (linklen + 1 + rellen >= PATH_MAX) 1154 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1109 return -1; 1155 return -1;
1110 1156
1111 errno = ELOOP; 1157 errno = ELOOP;
1112 if (!--symlinks) 1158 if (!--symlinks)
1113 return -1; 1159 return -1;
… …
1367 return; 1413 return;
1368 } 1414 }
1369 } 1415 }
1370#else 1416#else
1371 #if HAVE_AT 1417 #if HAVE_AT
1372 if (req->wd)
1373 { 1418 {
1374 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1419 int fd = openat (WD2FD (req->wd), req->ptr1, O_CLOEXEC | O_SEARCH | O_DIRECTORY | O_NONBLOCK);
1375 1420
1376 if (fd < 0) 1421 if (fd < 0)
1422 return;
1423
1424 dirp = fdopendir (fd);
1425
1426 if (!dirp)
1427 {
1428 silent_close (fd);
1377 return; 1429 return;
1378
1379 dirp = fdopendir (fd);
1380
1381 if (!dirp)
1382 close (fd);
1383 } 1430 }
1384 else 1431 }
1385 dirp = opendir (req->ptr1);
1386 #else 1432 #else
1387 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1433 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
1434
1435 if (!dirp)
1436 return;
1388 #endif 1437 #endif
1389
1390 if (!dirp)
1391 return;
1392#endif 1438#endif
1393 1439
1394 if (req->flags & EIO_FLAG_PTR1_FREE) 1440 if (req->flags & EIO_FLAG_PTR1_FREE)
1395 free (req->ptr1); 1441 free (req->ptr1);
1396 1442
… …
1631 1677
1632 if (len < 0) 1678 if (len < 0)
1633 return EIO_INVALID_WD; 1679 return EIO_INVALID_WD;
1634 1680
1635#if HAVE_AT 1681#if HAVE_AT
1636 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY); 1682 fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY | O_NONBLOCK);
1683
1684 /* 0 is a valid fd, but we use it for EIO_CWD, so in the very unlikely */
1685 /* case of fd 0 being available (almost certainly an a pplication bug) */
1686 /* make sure we use another fd value */
1687 #if EIO_CWD
1688 error EIO_CWD must be 0
1689 #endif
1690 if (ecb_expect_false (fd == 0))
1691 {
1692 int fd2 = fcntl (fd, F_DUPFD_CLOEXEC ? F_DUPFD_CLOEXEC : F_DUPFD);
1693 fcntl (fd2, F_SETFD, FD_CLOEXEC);
1694 eio__close (fd);
1695 fd = fd2;
1696 }
1637 1697
1638 if (fd < 0) 1698 if (fd < 0)
1639 return EIO_INVALID_WD; 1699 return EIO_INVALID_WD;
1640#endif 1700#endif
1641 1701
… …
1653} 1713}
1654 1714
1655eio_wd 1715eio_wd
1656eio_wd_open_sync (eio_wd wd, const char *path) 1716eio_wd_open_sync (eio_wd wd, const char *path)
1657{ 1717{
1658 struct etp_tmpbuf tmpbuf = { }; 1718 struct etp_tmpbuf tmpbuf = { 0 };
1659 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1719 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1660 free (tmpbuf.ptr); 1720 free (tmpbuf.ptr);
1661 1721
1662 return wd; 1722 return wd;
1663} 1723}
… …
1666eio_wd_close_sync (eio_wd wd) 1726eio_wd_close_sync (eio_wd wd)
1667{ 1727{
1668 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1728 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1669 { 1729 {
1670 #if HAVE_AT 1730 #if HAVE_AT
1671 close (wd->fd); 1731 eio__close (wd->fd);
1672 #endif 1732 #endif
1673 free (wd); 1733 free (wd);
1674 } 1734 }
1675} 1735}
1676 1736
1677#if HAVE_AT 1737#if HAVE_AT
1678 1738
1739static int
1740eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1741{
1742#if HAVE_RENAMEAT2
1743 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1744#else
1745 if (flags)
1746 return EIO_ENOSYS ();
1747
1748 return renameat (olddirfd, oldpath, newdirfd, newpath);
1749#endif
1750}
1751
1679/* they forgot these */ 1752/* they forgot these */
1680 1753
1681static int 1754static int
1682eio__truncateat (int dirfd, const char *path, off_t length) 1755eio__truncateat (int dirfd, const char *path, off_t length)
1683{ 1756{
1684 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1757 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC | O_NONBLOCK);
1685 int res; 1758 int res;
1686 1759
1687 if (fd < 0) 1760 if (fd < 0)
1688 return fd; 1761 return fd;
1689 1762
1690 res = ftruncate (fd, length); 1763 res = ftruncate (fd, length);
1691 close (fd); 1764 silent_close (fd);
1692 return res; 1765 return res;
1693} 1766}
1694 1767
1695static int 1768static int
1696eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1769eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1697{ 1770{
1698 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC); 1771 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC | O_NONBLOCK);
1699 int res; 1772 int res;
1700 1773
1701 if (fd < 0) 1774 if (fd < 0)
1702 return fd; 1775 return fd;
1703 1776
1704 res = fstatvfs (fd, buf); 1777 res = fstatvfs (fd, buf);
1705 close (fd); 1778 silent_close (fd);
1706 return res; 1779 return res;
1707
1708} 1780}
1709 1781
1710#endif 1782#endif
1711 1783
1712/*****************************************************************************/ 1784/*****************************************************************************/
… …
1720 req->ptr2 = malloc (len); \ 1792 req->ptr2 = malloc (len); \
1721 if (!req->ptr2) \ 1793 if (!req->ptr2) \
1722 { \ 1794 { \
1723 errno = ENOMEM; \ 1795 errno = ENOMEM; \
1724 req->result = -1; \ 1796 req->result = -1; \
1725 break; \ 1797 goto alloc_fail; \
1726 } \ 1798 } \
1727 } 1799 }
1728 1800
1729/*****************************************************************************/ 1801/*****************************************************************************/
1802
1803static void
1804eio__slurp (int fd, eio_req *req)
1805{
1806 req->result = fd;
1807
1808 if (fd < 0)
1809 return;
1810
1811 if (req->offs < 0 || !req->size) /* do we need the size? */
1812 {
1813 off_t size = lseek (fd, 0, SEEK_END);
1814
1815 if (req->offs < 0)
1816 req->offs += size;
1817
1818 if (!req->size)
1819 req->size = size - req->offs;
1820 }
1821
1822 ALLOC (req->size);
1823 req->result = pread (fd, req->ptr2, req->size, req->offs);
1824
1825 silent_close (fd);
1826
1827alloc_fail:
1828 ;
1829}
1730 1830
1731int ecb_cold 1831int ecb_cold
1732eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1832eio_init (void (*want_poll)(void), void (*done_poll)(void))
1733{ 1833{
1734 eio_want_poll_cb = want_poll; 1834 eio_want_poll_cb = want_poll;
… …
1816 : read (req->int1, req->ptr2, req->size); break; 1916 : read (req->int1, req->ptr2, req->size); break;
1817 case EIO_WRITE: req->result = req->offs >= 0 1917 case EIO_WRITE: req->result = req->offs >= 0
1818 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1918 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1819 : write (req->int1, req->ptr2, req->size); break; 1919 : write (req->int1, req->ptr2, req->size); break;
1820 1920
1921 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1922 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1923
1821 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1924 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1822 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break; 1925 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1823 1926
1824#if HAVE_AT 1927#if HAVE_AT
1825 1928
… …
1829 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1932 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break;
1830 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break; 1933 case EIO_CHOWN: req->result = fchownat (dirfd, req->ptr1, req->int2, req->int3, 0); break;
1831 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break; 1934 case EIO_CHMOD: req->result = fchmodat (dirfd, req->ptr1, (mode_t)req->int2, 0); break;
1832 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break; 1935 case EIO_TRUNCATE: req->result = eio__truncateat (dirfd, req->ptr1, req->offs); break;
1833 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break; 1936 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1937 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1834 1938
1835 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1939 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break;
1836 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */ 1940 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1) 1941 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str) 1942 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1943 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1944 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1945 case EIO_RENAME: req->result = eio__renameat2 (
1946 dirfd,
1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1947 /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1) 1948 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1843 ? rename (req->wd->str, req->ptr2) 1949 WD2FD ((eio_wd)req->int3),
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1950 req->ptr2,
1951 req->int2
1952 );
1953 break;
1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1954 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break;
1846 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break; 1955 case EIO_SYMLINK: req->result = symlinkat (req->ptr1, dirfd, req->ptr2); break;
1847 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break; 1956 case EIO_MKNOD: req->result = mknodat (dirfd, req->ptr1, (mode_t)req->int2, (dev_t)req->offs); break;
1848 case EIO_READLINK: ALLOC (PATH_MAX);
1849 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, PATH_MAX); break;
1850 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 1957 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1958 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1959 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1960 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1961 if (req->result == EIO_PATH_MAX)
1962 {
1963 req->result = -1;
1964 errno = ENAMETOOLONG;
1965 }
1966 break;
1852 case EIO_UTIME: 1967 case EIO_UTIME:
1853 case EIO_FUTIME: 1968 case EIO_FUTIME:
1854 { 1969 {
1855 struct timespec ts[2]; 1970 struct timespec ts[2];
1856 struct timespec *times; 1971 struct timespec *times;
… …
1881 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1996 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1882 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1997 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break;
1883 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break; 1998 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1884 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1999 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break;
1885 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break; 2000 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
2001 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1886 2002
1887 case EIO_UNLINK: req->result = unlink (path ); break; 2003 case EIO_UNLINK: req->result = unlink (path ); break;
1888 case EIO_RMDIR: req->result = rmdir (path ); break; 2004 case EIO_RMDIR: req->result = rmdir (path ); break;
1889 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 2005 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1890 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 2006 case EIO_RENAME: req->result = req->int2 ? EIO_ENOSYS () : rename (path, req->ptr2); break;
1891 case EIO_LINK: req->result = link (path , req->ptr2); break; 2007 case EIO_LINK: req->result = link (path , req->ptr2); break;
1892 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 2008 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break;
1893 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break; 2009 case EIO_MKNOD: req->result = mknod (path , (mode_t)req->int2, (dev_t)req->offs); break;
1894 case EIO_READLINK: ALLOC (PATH_MAX);
1895 req->result = readlink (path, req->ptr2, PATH_MAX); break;
1896 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS)); 2010 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 2011 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
2012 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
2013 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
2014 if (req->result == EIO_PATH_MAX)
2015 {
2016 req->result = -1;
2017 errno = ENAMETOOLONG;
2018 }
2019 break;
1898 2020
1899 case EIO_UTIME: 2021 case EIO_UTIME:
1900 case EIO_FUTIME: 2022 case EIO_FUTIME:
1901 { 2023 {
1902 struct timeval tv[2]; 2024 struct timeval tv[2];
… …
1937 2059
1938 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2060 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break;
1939 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break; 2061 case EIO_FCHMOD: req->result = fchmod (req->int1, (mode_t)req->int2); break;
1940 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break; 2062 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1941 2063
1942 case EIO_CLOSE: req->result = close (req->int1); break; 2064 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2065 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1944 case EIO_SYNC: req->result = 0; sync (); break; 2066 case EIO_SYNC: req->result = 0; sync (); break;
1945 case EIO_FSYNC: req->result = fsync (req->int1); break; 2067 case EIO_FSYNC: req->result = fsync (req->int1); break;
1946 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2068 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1947 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2069 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
1985 default: 2107 default:
1986 req->result = EIO_ENOSYS (); 2108 req->result = EIO_ENOSYS ();
1987 break; 2109 break;
1988 } 2110 }
1989 2111
2112alloc_fail:
1990 req->errorno = errno; 2113 req->errorno = errno;
1991} 2114}
1992 2115
1993#ifndef EIO_NO_WRAPPERS 2116#ifndef EIO_NO_WRAPPERS
1994 2117
… …
2083} 2206}
2084 2207
2085eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2208eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2086{ 2209{
2087 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2210 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2211}
2212
2213eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2214{
2215 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2216}
2217
2218eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2219{
2220 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2088} 2221}
2089 2222
2090eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2223eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2091{ 2224{
2092 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2225 REQ (EIO_FSTAT); req->int1 = fd; SEND;
… …
2237eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2370eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2238{ 2371{
2239 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2372 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2240} 2373}
2241 2374
2375eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2376{
2377 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2378}
2379
2242eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2380eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2243{ 2381{
2244 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2382 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2245} 2383}
2246 2384
… …
2303eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count) 2441eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count)
2304{ 2442{
2305 return eio__sendfile (ofd, ifd, offset, count); 2443 return eio__sendfile (ofd, ifd, offset, count);
2306} 2444}
2307 2445
2446int eio_mlockall_sync (int flags)
2447{
2448 return eio__mlockall (flags);
2449}
2450

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines