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

Comparing libeio/eio.c (file contents):
Revision 1.143 by root, Sat Dec 3 16:33:46 2016 UTC vs.
Revision 1.156 by root, Thu Nov 29 19:47:33 2018 UTC

1/* 1/*
2 * libeio implementation 2 * libeio implementation
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016 Marc Alexander Lehmann <libeio@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2017,2018 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 *
… …
231 #define D_NAME(entp) entp.cFileName 231 #define D_NAME(entp) entp.cFileName
232 #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)
233 233
234#else 234#else
235 235
236 #include <sys/ioctl.h>
236 #include <sys/time.h> 237 #include <sys/time.h>
237 #include <sys/select.h> 238 #include <sys/select.h>
238 #include <unistd.h> 239 #include <unistd.h>
239 #include <signal.h> 240 #include <signal.h>
240 #include <dirent.h> 241 #include <dirent.h>
… …
299# else 300# else
300# error sendfile support requested but not available 301# error sendfile support requested but not available
301# endif 302# endif
302#endif 303#endif
303 304
305#if HAVE_RENAMEAT2
306# include <sys/syscall.h>
307# include <linux/fs.h>
308#endif
309
304#ifndef D_TYPE 310#ifndef D_TYPE
305# define D_TYPE(de) 0 311# define D_TYPE(de) 0
306#endif 312#endif
307#ifndef D_INO 313#ifndef D_INO
308# define D_INO(de) 0 314# define D_INO(de) 0
… …
316# define NAME_MAX 4096 322# define NAME_MAX 4096
317#endif 323#endif
318 324
319/* used for readlink etc. */ 325/* used for readlink etc. */
320#ifndef PATH_MAX 326#ifndef PATH_MAX
321# define PATH_MAX 4096 327# define PATH_MAX 0
322#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)
323 351
324/* buffer size for various temporary buffers */ 352/* buffer size for various temporary buffers */
325#define EIO_BUFSIZE 65536 353#define EIO_BUFSIZE 65536
326 354
327#define dBUF \ 355#define dBUF \
… …
338struct etp_tmpbuf; 366struct etp_tmpbuf;
339 367
340#if _POSIX_VERSION >= 200809L 368#if _POSIX_VERSION >= 200809L
341 #define HAVE_AT 1 369 #define HAVE_AT 1
342 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD) 370 #define WD2FD(wd) ((wd) ? (wd)->fd : AT_FDCWD)
343 #ifndef O_SEARCH
344 #define O_SEARCH O_RDONLY
345 #endif
346#else 371#else
347 #define HAVE_AT 0 372 #define HAVE_AT 0
348 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);
349#endif 374#endif
350 375
… …
540 return etp_poll (EIO_POOL); 565 return etp_poll (EIO_POOL);
541} 566}
542 567
543/*****************************************************************************/ 568/*****************************************************************************/
544/* 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}
545 585
546#ifndef HAVE_UTIMES 586#ifndef HAVE_UTIMES
547 587
548# undef utimes 588# undef utimes
549# define utimes(path,times) eio__utimes (path, times) 589# define utimes(path,times) eio__utimes (path, times)
… …
862 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7 902 #if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
863 extern int mallopt (int, int); 903 extern int mallopt (int, int);
864 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 */
865 #endif 905 #endif
866 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
867 if (EIO_MCL_CURRENT != MCL_CURRENT 913 if (EIO_MCL_CURRENT != MCL_CURRENT
868 || EIO_MCL_FUTURE != MCL_FUTURE) 914 || EIO_MCL_FUTURE != MCL_FUTURE
915 || EIO_MCL_ONFAULT != MCL_ONFAULT)
869 { 916 {
870 flags = 0 917 flags = 0
871 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0) 918 | (flags & EIO_MCL_CURRENT ? MCL_CURRENT : 0)
872 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0); 919 | (flags & EIO_MCL_FUTURE ? MCL_FUTURE : 0)
920 | (flags & EIO_MCL_ONFAULT ? MCL_ONFAULT : 0)
921 ;
873 } 922 }
874 923
875 return mlockall (flags); 924 return mlockall (flags);
876} 925}
877#endif 926#endif
… …
928 intptr_t end = addr + len; 977 intptr_t end = addr + len;
929 intptr_t page = eio_pagesize (); 978 intptr_t page = eio_pagesize ();
930 979
931 if (addr < end) 980 if (addr < end)
932 if (flags & EIO_MT_MODIFY) /* modify */ 981 if (flags & EIO_MT_MODIFY) /* modify */
933 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));
934 else 983 else
935 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));
936 } 985 }
937 986
938 return 0; 987 return 0;
939} 988}
940 989
… …
974 1023
975 errno = ENOENT; 1024 errno = ENOENT;
976 if (!*rel) 1025 if (!*rel)
977 return -1; 1026 return -1;
978 1027
979 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 1028 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
980#ifdef _WIN32 1029#ifdef _WIN32
981 if (_access (rel, 4) != 0) 1030 if (_access (rel, 4) != 0)
982 return -1; 1031 return -1;
983 1032
984 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 1033 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
985 1034
986 errno = ENAMETOOLONG; 1035 errno = ENAMETOOLONG;
987 if (symlinks >= PATH_MAX * 3) 1036 if (symlinks >= EIO_PATH_MAX * 3)
988 return -1; 1037 return -1;
989 1038
990 errno = EIO; 1039 errno = EIO;
991 if (symlinks <= 0) 1040 if (symlinks <= 0)
992 return -1; 1041 return -1;
993 1042
994 return symlinks; 1043 return symlinks;
995 1044
996#else 1045#else
997 tmp1 = res + PATH_MAX; 1046 tmp1 = res + EIO_PATH_MAX;
998 tmp2 = tmp1 + PATH_MAX; 1047 tmp2 = tmp1 + EIO_PATH_MAX;
999 1048
1000#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 */
1001#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1050#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1002 /* on linux we may be able to ask the kernel */ 1051 /* on linux we may be able to ask the kernel */
1003 { 1052 {
1004 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);
1005 1054
1006 if (fd >= 0) 1055 if (fd >= 0)
1007 { 1056 {
1008 sprintf (tmp1, "/proc/self/fd/%d", fd); 1057 sprintf (tmp1, "/proc/self/fd/%d", fd);
1009 req->result = readlink (tmp1, res, PATH_MAX); 1058 req->result = readlink (tmp1, res, EIO_PATH_MAX);
1010 /* 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 */
1011 close (fd); 1060 eio__close (fd);
1012 1061
1013 if (req->result > 0) 1062 if (req->result > 0)
1014 goto done; 1063 goto done;
1015 } 1064 }
1016 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)
… …
1027 if (wd == EIO_INVALID_WD) 1076 if (wd == EIO_INVALID_WD)
1028 return -1; 1077 return -1;
1029 1078
1030 if (wd == EIO_CWD) 1079 if (wd == EIO_CWD)
1031 { 1080 {
1032 if (!getcwd (res, PATH_MAX)) 1081 if (!getcwd (res, EIO_PATH_MAX))
1033 return -1; 1082 return -1;
1034 1083
1035 len = strlen (res); 1084 len = strlen (res);
1036 } 1085 }
1037 else 1086 else
… …
1084 1133
1085 /* zero-terminate, for readlink */ 1134 /* zero-terminate, for readlink */
1086 res [len + 1] = 0; 1135 res [len + 1] = 0;
1087 1136
1088 /* now check if it's a symlink */ 1137 /* now check if it's a symlink */
1089 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1138 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1090 1139
1091 if (linklen < 0) 1140 if (linklen < 0)
1092 { 1141 {
1093 if (errno != EINVAL) 1142 if (errno != EINVAL)
1094 return -1; 1143 return -1;
… …
1100 { 1149 {
1101 /* yay, it was a symlink - build new path in tmp2 */ 1150 /* yay, it was a symlink - build new path in tmp2 */
1102 int rellen = strlen (rel); 1151 int rellen = strlen (rel);
1103 1152
1104 errno = ENAMETOOLONG; 1153 errno = ENAMETOOLONG;
1105 if (linklen + 1 + rellen >= PATH_MAX) 1154 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1106 return -1; 1155 return -1;
1107 1156
1108 errno = ELOOP; 1157 errno = ELOOP;
1109 if (!--symlinks) 1158 if (!--symlinks)
1110 return -1; 1159 return -1;
… …
1364 return; 1413 return;
1365 } 1414 }
1366 } 1415 }
1367#else 1416#else
1368 #if HAVE_AT 1417 #if HAVE_AT
1369 if (req->wd)
1370 { 1418 {
1371 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);
1372 1420
1373 if (fd < 0) 1421 if (fd < 0)
1422 return;
1423
1424 dirp = fdopendir (fd);
1425
1426 if (!dirp)
1427 {
1428 silent_close (fd);
1374 return; 1429 return;
1375
1376 dirp = fdopendir (fd);
1377
1378 if (!dirp)
1379 close (fd);
1380 } 1430 }
1381 else 1431 }
1382 dirp = opendir (req->ptr1);
1383 #else 1432 #else
1384 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;
1385 #endif 1437 #endif
1386
1387 if (!dirp)
1388 return;
1389#endif 1438#endif
1390 1439
1391 if (req->flags & EIO_FLAG_PTR1_FREE) 1440 if (req->flags & EIO_FLAG_PTR1_FREE)
1392 free (req->ptr1); 1441 free (req->ptr1);
1393 1442
… …
1628 1677
1629 if (len < 0) 1678 if (len < 0)
1630 return EIO_INVALID_WD; 1679 return EIO_INVALID_WD;
1631 1680
1632#if HAVE_AT 1681#if HAVE_AT
1633 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);
1634 1683
1635 if (fd < 0) 1684 if (fd < 0)
1636 return EIO_INVALID_WD; 1685 return EIO_INVALID_WD;
1637#endif 1686#endif
1638 1687
… …
1650} 1699}
1651 1700
1652eio_wd 1701eio_wd
1653eio_wd_open_sync (eio_wd wd, const char *path) 1702eio_wd_open_sync (eio_wd wd, const char *path)
1654{ 1703{
1655 struct etp_tmpbuf tmpbuf = { }; 1704 struct etp_tmpbuf tmpbuf = { 0 };
1656 wd = eio__wd_open_sync (&tmpbuf, wd, path); 1705 wd = eio__wd_open_sync (&tmpbuf, wd, path);
1657 free (tmpbuf.ptr); 1706 free (tmpbuf.ptr);
1658 1707
1659 return wd; 1708 return wd;
1660} 1709}
… …
1663eio_wd_close_sync (eio_wd wd) 1712eio_wd_close_sync (eio_wd wd)
1664{ 1713{
1665 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1714 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1666 { 1715 {
1667 #if HAVE_AT 1716 #if HAVE_AT
1668 close (wd->fd); 1717 eio__close (wd->fd);
1669 #endif 1718 #endif
1670 free (wd); 1719 free (wd);
1671 } 1720 }
1672} 1721}
1673 1722
1674#if HAVE_AT 1723#if HAVE_AT
1675 1724
1725static int
1726eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1727{
1728#if HAVE_RENAMEAT2
1729 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1730#else
1731 if (flags)
1732 return EIO_ENOSYS ();
1733
1734 return renameat (olddirfd, oldpath, newdirfd, newpath);
1735#endif
1736}
1737
1676/* they forgot these */ 1738/* they forgot these */
1677 1739
1678static int 1740static int
1679eio__truncateat (int dirfd, const char *path, off_t length) 1741eio__truncateat (int dirfd, const char *path, off_t length)
1680{ 1742{
1681 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC); 1743 int fd = openat (dirfd, path, O_WRONLY | O_CLOEXEC | O_NONBLOCK);
1682 int res; 1744 int res;
1683 1745
1684 if (fd < 0) 1746 if (fd < 0)
1685 return fd; 1747 return fd;
1686 1748
1687 res = ftruncate (fd, length); 1749 res = ftruncate (fd, length);
1688 close (fd); 1750 silent_close (fd);
1689 return res; 1751 return res;
1690} 1752}
1691 1753
1692static int 1754static int
1693eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1755eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
1694{ 1756{
1695 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC); 1757 int fd = openat (dirfd, path, O_SEARCH | O_CLOEXEC | O_NONBLOCK);
1696 int res; 1758 int res;
1697 1759
1698 if (fd < 0) 1760 if (fd < 0)
1699 return fd; 1761 return fd;
1700 1762
1701 res = fstatvfs (fd, buf); 1763 res = fstatvfs (fd, buf);
1702 close (fd); 1764 silent_close (fd);
1703 return res; 1765 return res;
1704
1705} 1766}
1706 1767
1707#endif 1768#endif
1708 1769
1709/*****************************************************************************/ 1770/*****************************************************************************/
… …
1717 req->ptr2 = malloc (len); \ 1778 req->ptr2 = malloc (len); \
1718 if (!req->ptr2) \ 1779 if (!req->ptr2) \
1719 { \ 1780 { \
1720 errno = ENOMEM; \ 1781 errno = ENOMEM; \
1721 req->result = -1; \ 1782 req->result = -1; \
1722 break; \ 1783 goto alloc_fail; \
1723 } \ 1784 } \
1724 } 1785 }
1725 1786
1726/*****************************************************************************/ 1787/*****************************************************************************/
1788
1789static void
1790eio__slurp (int fd, eio_req *req)
1791{
1792 req->result = fd;
1793
1794 if (fd < 0)
1795 return;
1796
1797 if (req->offs < 0 || !req->size) /* do we need the size? */
1798 {
1799 off_t size = lseek (fd, 0, SEEK_END);
1800
1801 if (req->offs < 0)
1802 req->offs += size;
1803
1804 if (!req->size)
1805 req->size = size - req->offs;
1806 }
1807
1808 ALLOC (req->size);
1809 req->result = pread (fd, req->ptr2, req->size, req->offs);
1810
1811 silent_close (fd);
1812
1813alloc_fail:
1814 ;
1815}
1727 1816
1728int ecb_cold 1817int ecb_cold
1729eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1818eio_init (void (*want_poll)(void), void (*done_poll)(void))
1730{ 1819{
1731 eio_want_poll_cb = want_poll; 1820 eio_want_poll_cb = want_poll;
… …
1829 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1918 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; 1919 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; 1920 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; 1921 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; 1922 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1923 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1834 1924
1835 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1925 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 */ 1926 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1) 1927 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str) 1928 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1929 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1930 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1931 case EIO_RENAME: req->result = eio__renameat2 (
1932 dirfd,
1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1933 /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1) 1934 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1843 ? rename (req->wd->str, req->ptr2) 1935 WD2FD ((eio_wd)req->int3),
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1936 req->ptr2,
1937 req->int2
1938 );
1939 break;
1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1940 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; 1941 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; 1942 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)); 1943 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1944 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1945 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1946 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1947 if (req->result == EIO_PATH_MAX)
1948 {
1949 req->result = -1;
1950 errno = ENAMETOOLONG;
1951 }
1952 break;
1852 case EIO_UTIME: 1953 case EIO_UTIME:
1853 case EIO_FUTIME: 1954 case EIO_FUTIME:
1854 { 1955 {
1855 struct timespec ts[2]; 1956 struct timespec ts[2];
1856 struct timespec *times; 1957 struct timespec *times;
… …
1881 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1982 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1882 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1983 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; 1984 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1884 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1985 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; 1986 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1987 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1886 1988
1887 case EIO_UNLINK: req->result = unlink (path ); break; 1989 case EIO_UNLINK: req->result = unlink (path ); break;
1888 case EIO_RMDIR: req->result = rmdir (path ); break; 1990 case EIO_RMDIR: req->result = rmdir (path ); break;
1889 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1991 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1890 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1992 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; 1993 case EIO_LINK: req->result = link (path , req->ptr2); break;
1892 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1994 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; 1995 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)); 1996 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1997 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1998 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1999 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
2000 if (req->result == EIO_PATH_MAX)
2001 {
2002 req->result = -1;
2003 errno = ENAMETOOLONG;
2004 }
2005 break;
1898 2006
1899 case EIO_UTIME: 2007 case EIO_UTIME:
1900 case EIO_FUTIME: 2008 case EIO_FUTIME:
1901 { 2009 {
1902 struct timeval tv[2]; 2010 struct timeval tv[2];
… …
1937 2045
1938 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2046 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; 2047 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; 2048 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1941 2049
1942 case EIO_CLOSE: req->result = close (req->int1); break; 2050 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2051 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1944 case EIO_SYNC: req->result = 0; sync (); break; 2052 case EIO_SYNC: req->result = 0; sync (); break;
1945 case EIO_FSYNC: req->result = fsync (req->int1); break; 2053 case EIO_FSYNC: req->result = fsync (req->int1); break;
1946 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2054 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1947 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2055 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
1985 default: 2093 default:
1986 req->result = EIO_ENOSYS (); 2094 req->result = EIO_ENOSYS ();
1987 break; 2095 break;
1988 } 2096 }
1989 2097
2098alloc_fail:
1990 req->errorno = errno; 2099 req->errorno = errno;
1991} 2100}
1992 2101
1993#ifndef EIO_NO_WRAPPERS 2102#ifndef EIO_NO_WRAPPERS
1994 2103
… …
2247eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) 2356eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2248{ 2357{
2249 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2358 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2250} 2359}
2251 2360
2361eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2362{
2363 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2364}
2365
2252eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2366eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2253{ 2367{
2254 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2368 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2255} 2369}
2256 2370

Diff Legend

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