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.148 by root, Tue Feb 20 06:05:19 2018 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 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>
… …
105#ifdef _WIN32 100#ifdef _WIN32
106 101
107 #undef PAGESIZE 102 #undef PAGESIZE
108 #define PAGESIZE 4096 /* GetSystemInfo? */ 103 #define PAGESIZE 4096 /* GetSystemInfo? */
109 104
105 #define O_CLOEXEC 0
106
110 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */ 107 /* TODO: look at how perl does stat (non-sloppy), unlink (ro-files), utime, link */
111 108
112 #ifdef EIO_STRUCT_STATI64 109 #ifdef EIO_STRUCT_STATI64
113 /* look at perl's non-sloppy stat */ 110 /* look at perl's non-sloppy stat */
114 #define stat(path,buf) _stati64 (path,buf) 111 #define stat(path,buf) _stati64 (path,buf)
… …
122 #define chmod(path,mode) _chmod (path, mode) 119 #define chmod(path,mode) _chmod (path, mode)
123 #define dup(fd) _dup (fd) 120 #define dup(fd) _dup (fd)
124 #define dup2(fd1,fd2) _dup2 (fd1, fd2) 121 #define dup2(fd1,fd2) _dup2 (fd1, fd2)
125 #define pipe(fds) _pipe (fds, 4096, O_BINARY) 122 #define pipe(fds) _pipe (fds, 4096, O_BINARY)
126 123
124 #define fcntl(fd,cmd,arg) EIO_ENOSYS ()
125 #define ioctl(fd,cmd,arg) EIO_ENOSYS ()
127 #define fchmod(fd,mode) EIO_ENOSYS () 126 #define fchmod(fd,mode) EIO_ENOSYS ()
128 #define chown(path,uid,gid) EIO_ENOSYS () 127 #define chown(path,uid,gid) EIO_ENOSYS ()
129 #define fchown(fd,uid,gid) EIO_ENOSYS () 128 #define fchown(fd,uid,gid) EIO_ENOSYS ()
130 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */ 129 #define truncate(path,offs) EIO_ENOSYS () /* far-miss: SetEndOfFile */
131 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */ 130 #define ftruncate(fd,offs) EIO_ENOSYS () /* near-miss: SetEndOfFile */
… …
204 /* we could even stat and see if it exists */ 203 /* we could even stat and see if it exists */
205 static int 204 static int
206 symlink (const char *old, const char *neu) 205 symlink (const char *old, const char *neu)
207 { 206 {
208 #if WINVER >= 0x0600 207 #if WINVER >= 0x0600
208 int flags;
209
210 /* This tries out all combinations of SYMBOLIC_LINK_FLAG_DIRECTORY
211 * and SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE,
212 * with directory first.
213 */
214 for (flags = 3; flags >= 0; --flags)
209 if (CreateSymbolicLink (neu, old, 1)) 215 if (CreateSymbolicLink (neu, old, flags))
210 return 0; 216 return 0;
211
212 if (CreateSymbolicLink (neu, old, 0))
213 return 0;
214 #endif 217 #endif
215 218
216 return EIO_ERRNO (ENOENT, -1); 219 return EIO_ERRNO (ENOENT, -1);
217 } 220 }
218 221
… …
230 #define D_NAME(entp) entp.cFileName 233 #define D_NAME(entp) entp.cFileName
231 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG) 234 #define D_TYPE(entp) (entp.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? DT_DIR : DT_REG)
232 235
233#else 236#else
234 237
238 #include <sys/ioctl.h>
235 #include <sys/time.h> 239 #include <sys/time.h>
236 #include <sys/select.h> 240 #include <sys/select.h>
237 #include <unistd.h> 241 #include <unistd.h>
238 #include <signal.h> 242 #include <signal.h>
239 #include <dirent.h> 243 #include <dirent.h>
… …
281# include <utime.h> 285# include <utime.h>
282#endif 286#endif
283 287
284#if HAVE_SYS_SYSCALL_H 288#if HAVE_SYS_SYSCALL_H
285# include <sys/syscall.h> 289# include <sys/syscall.h>
286#endif
287
288#if HAVE_SYS_PRCTL_H
289# include <sys/prctl.h>
290#endif 290#endif
291 291
292#if HAVE_SENDFILE 292#if HAVE_SENDFILE
293# if __linux 293# if __linux
294# include <sys/sendfile.h> 294# include <sys/sendfile.h>
… …
302# else 302# else
303# error sendfile support requested but not available 303# error sendfile support requested but not available
304# endif 304# endif
305#endif 305#endif
306 306
307#if HAVE_RENAMEAT2
308# include <sys/syscall.h>
309# include <linux/fs.h>
310#endif
311
307#ifndef D_TYPE 312#ifndef D_TYPE
308# define D_TYPE(de) 0 313# define D_TYPE(de) 0
309#endif 314#endif
310#ifndef D_INO 315#ifndef D_INO
311# define D_INO(de) 0 316# define D_INO(de) 0
… …
319# define NAME_MAX 4096 324# define NAME_MAX 4096
320#endif 325#endif
321 326
322/* used for readlink etc. */ 327/* used for readlink etc. */
323#ifndef PATH_MAX 328#ifndef PATH_MAX
324# define PATH_MAX 4096 329# define PATH_MAX 0
325#endif 330#endif
331
332#ifndef EIO_PATH_MIN
333# define EIO_PATH_MIN 8160
334#endif
335
336#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
326 337
327/* buffer size for various temporary buffers */ 338/* buffer size for various temporary buffers */
328#define EIO_BUFSIZE 65536 339#define EIO_BUFSIZE 65536
329 340
330#define dBUF \ 341#define dBUF \
… …
544} 555}
545 556
546/*****************************************************************************/ 557/*****************************************************************************/
547/* work around various missing functions */ 558/* work around various missing functions */
548 559
560#if HAVE_POSIX_CLOSE && !__linux
561# define eio__close(fd) posix_close (fd, 0)
562#else
563# define eio__close(fd) close (fd)
564#endif
565
566/* close() without disturbing errno */
567static void
568silent_close (int fd)
569{
570 int saved_errno = errno;
571 eio__close (fd);
572 errno = saved_errno;
573}
574
549#ifndef HAVE_UTIMES 575#ifndef HAVE_UTIMES
550 576
551# undef utimes 577# undef utimes
552# define utimes(path,times) eio__utimes (path, times) 578# define utimes(path,times) eio__utimes (path, times)
553 579
… …
977 1003
978 errno = ENOENT; 1004 errno = ENOENT;
979 if (!*rel) 1005 if (!*rel)
980 return -1; 1006 return -1;
981 1007
982 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 1008 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
983#ifdef _WIN32 1009#ifdef _WIN32
984 if (_access (rel, 4) != 0) 1010 if (_access (rel, 4) != 0)
985 return -1; 1011 return -1;
986 1012
987 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 1013 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
988 1014
989 errno = ENAMETOOLONG; 1015 errno = ENAMETOOLONG;
990 if (symlinks >= PATH_MAX * 3) 1016 if (symlinks >= EIO_PATH_MAX * 3)
991 return -1; 1017 return -1;
992 1018
993 errno = EIO; 1019 errno = EIO;
994 if (symlinks <= 0) 1020 if (symlinks <= 0)
995 return -1; 1021 return -1;
996 1022
997 return symlinks; 1023 return symlinks;
998 1024
999#else 1025#else
1000 tmp1 = res + PATH_MAX; 1026 tmp1 = res + EIO_PATH_MAX;
1001 tmp2 = tmp1 + PATH_MAX; 1027 tmp2 = tmp1 + EIO_PATH_MAX;
1002 1028
1003#if 0 /* disabled, the musl way to do things is just too racy */ 1029#if 0 /* disabled, the musl way to do things is just too racy */
1004#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1030#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1005 /* on linux we may be able to ask the kernel */ 1031 /* on linux we may be able to ask the kernel */
1006 { 1032 {
1007 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1033 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1008 1034
1009 if (fd >= 0) 1035 if (fd >= 0)
1010 { 1036 {
1011 sprintf (tmp1, "/proc/self/fd/%d", fd); 1037 sprintf (tmp1, "/proc/self/fd/%d", fd);
1012 req->result = readlink (tmp1, res, PATH_MAX); 1038 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 */ 1039 /* here we should probably stat the open file and the disk file, to make sure they still match */
1014 close (fd); 1040 eio__close (fd);
1015 1041
1016 if (req->result > 0) 1042 if (req->result > 0)
1017 goto done; 1043 goto done;
1018 } 1044 }
1019 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO) 1045 else if (errno == ELOOP || errno == ENAMETOOLONG || errno == ENOENT || errno == ENOTDIR || errno == EIO)
… …
1030 if (wd == EIO_INVALID_WD) 1056 if (wd == EIO_INVALID_WD)
1031 return -1; 1057 return -1;
1032 1058
1033 if (wd == EIO_CWD) 1059 if (wd == EIO_CWD)
1034 { 1060 {
1035 if (!getcwd (res, PATH_MAX)) 1061 if (!getcwd (res, EIO_PATH_MAX))
1036 return -1; 1062 return -1;
1037 1063
1038 len = strlen (res); 1064 len = strlen (res);
1039 } 1065 }
1040 else 1066 else
… …
1087 1113
1088 /* zero-terminate, for readlink */ 1114 /* zero-terminate, for readlink */
1089 res [len + 1] = 0; 1115 res [len + 1] = 0;
1090 1116
1091 /* now check if it's a symlink */ 1117 /* now check if it's a symlink */
1092 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1118 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1093 1119
1094 if (linklen < 0) 1120 if (linklen < 0)
1095 { 1121 {
1096 if (errno != EINVAL) 1122 if (errno != EINVAL)
1097 return -1; 1123 return -1;
… …
1103 { 1129 {
1104 /* yay, it was a symlink - build new path in tmp2 */ 1130 /* yay, it was a symlink - build new path in tmp2 */
1105 int rellen = strlen (rel); 1131 int rellen = strlen (rel);
1106 1132
1107 errno = ENAMETOOLONG; 1133 errno = ENAMETOOLONG;
1108 if (linklen + 1 + rellen >= PATH_MAX) 1134 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1109 return -1; 1135 return -1;
1110 1136
1111 errno = ELOOP; 1137 errno = ELOOP;
1112 if (!--symlinks) 1138 if (!--symlinks)
1113 return -1; 1139 return -1;
… …
1377 return; 1403 return;
1378 1404
1379 dirp = fdopendir (fd); 1405 dirp = fdopendir (fd);
1380 1406
1381 if (!dirp) 1407 if (!dirp)
1382 close (fd); 1408 silent_close (fd);
1383 } 1409 }
1384 else 1410 else
1385 dirp = opendir (req->ptr1); 1411 dirp = opendir (req->ptr1);
1386 #else 1412 #else
1387 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1)); 1413 dirp = opendir (wd_expand (&self->tmpbuf, req->wd, req->ptr1));
… …
1666eio_wd_close_sync (eio_wd wd) 1692eio_wd_close_sync (eio_wd wd)
1667{ 1693{
1668 if (wd != EIO_INVALID_WD && wd != EIO_CWD) 1694 if (wd != EIO_INVALID_WD && wd != EIO_CWD)
1669 { 1695 {
1670 #if HAVE_AT 1696 #if HAVE_AT
1671 close (wd->fd); 1697 eio__close (wd->fd);
1672 #endif 1698 #endif
1673 free (wd); 1699 free (wd);
1674 } 1700 }
1675} 1701}
1676 1702
1677#if HAVE_AT 1703#if HAVE_AT
1678 1704
1705static int
1706eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1707{
1708#if HAVE_RENAMEAT2
1709 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1710#else
1711 if (flags)
1712 return EIO_ENOSYS ();
1713
1714 return renameat (olddirfd, oldpath, newdirfd, newpath);
1715#endif
1716}
1717
1679/* they forgot these */ 1718/* they forgot these */
1680 1719
1681static int 1720static int
1682eio__truncateat (int dirfd, const char *path, off_t length) 1721eio__truncateat (int dirfd, const char *path, off_t length)
1683{ 1722{
… …
1686 1725
1687 if (fd < 0) 1726 if (fd < 0)
1688 return fd; 1727 return fd;
1689 1728
1690 res = ftruncate (fd, length); 1729 res = ftruncate (fd, length);
1691 close (fd); 1730 silent_close (fd);
1692 return res; 1731 return res;
1693} 1732}
1694 1733
1695static int 1734static int
1696eio__statvfsat (int dirfd, const char *path, struct statvfs *buf) 1735eio__statvfsat (int dirfd, const char *path, struct statvfs *buf)
… …
1700 1739
1701 if (fd < 0) 1740 if (fd < 0)
1702 return fd; 1741 return fd;
1703 1742
1704 res = fstatvfs (fd, buf); 1743 res = fstatvfs (fd, buf);
1705 close (fd); 1744 silent_close (fd);
1706 return res; 1745 return res;
1707
1708} 1746}
1709 1747
1710#endif 1748#endif
1711 1749
1712/*****************************************************************************/ 1750/*****************************************************************************/
… …
1720 req->ptr2 = malloc (len); \ 1758 req->ptr2 = malloc (len); \
1721 if (!req->ptr2) \ 1759 if (!req->ptr2) \
1722 { \ 1760 { \
1723 errno = ENOMEM; \ 1761 errno = ENOMEM; \
1724 req->result = -1; \ 1762 req->result = -1; \
1725 break; \ 1763 goto alloc_fail; \
1726 } \ 1764 } \
1727 } 1765 }
1728 1766
1729/*****************************************************************************/ 1767/*****************************************************************************/
1768
1769static void
1770eio__slurp (int fd, eio_req *req)
1771{
1772 req->result = fd;
1773
1774 if (fd < 0)
1775 return;
1776
1777 if (req->offs < 0 || !req->size) /* do we need the size? */
1778 {
1779 off_t size = lseek (fd, 0, SEEK_END);
1780
1781 if (req->offs < 0)
1782 req->offs += size;
1783
1784 if (!req->size)
1785 req->size = size - req->offs;
1786 }
1787
1788 ALLOC (req->size);
1789 req->result = pread (fd, req->ptr2, req->size, req->offs);
1790
1791 silent_close (fd);
1792
1793alloc_fail:
1794 ;
1795}
1730 1796
1731int ecb_cold 1797int ecb_cold
1732eio_init (void (*want_poll)(void), void (*done_poll)(void)) 1798eio_init (void (*want_poll)(void), void (*done_poll)(void))
1733{ 1799{
1734 eio_want_poll_cb = want_poll; 1800 eio_want_poll_cb = want_poll;
… …
1816 : read (req->int1, req->ptr2, req->size); break; 1882 : read (req->int1, req->ptr2, req->size); break;
1817 case EIO_WRITE: req->result = req->offs >= 0 1883 case EIO_WRITE: req->result = req->offs >= 0
1818 ? pwrite (req->int1, req->ptr2, req->size, req->offs) 1884 ? pwrite (req->int1, req->ptr2, req->size, req->offs)
1819 : write (req->int1, req->ptr2, req->size); break; 1885 : write (req->int1, req->ptr2, req->size); break;
1820 1886
1887 case EIO_FCNTL: req->result = fcntl (req->int1, (int) req->int2, req->ptr2); break;
1888 case EIO_IOCTL: req->result = ioctl (req->int1, (unsigned long)req->int2, req->ptr2); break;
1889
1821 case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; 1890 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; 1891 case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size); break;
1823 1892
1824#if HAVE_AT 1893#if HAVE_AT
1825 1894
… …
1829 req->result = fstatat (dirfd, req->ptr1, (EIO_STRUCT_STAT *)req->ptr2, AT_SYMLINK_NOFOLLOW); break; 1898 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; 1899 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; 1900 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; 1901 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; 1902 case EIO_OPEN: req->result = openat (dirfd, req->ptr1, req->int1, (mode_t)req->int2); break;
1903 case EIO_SLURP: eio__slurp ( openat (dirfd, req->ptr1, O_RDONLY | O_CLOEXEC), req); break;
1834 1904
1835 case EIO_UNLINK: req->result = unlinkat (dirfd, req->ptr1, 0); break; 1905 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 */ 1906 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1) 1907 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str) 1908 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1909 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1910 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1911 case EIO_RENAME: req->result = eio__renameat2 (
1912 dirfd,
1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1913 /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1) 1914 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1843 ? rename (req->wd->str, req->ptr2) 1915 WD2FD ((eio_wd)req->int3),
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1916 req->ptr2,
1917 req->int2
1918 );
1919 break;
1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1920 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; 1921 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; 1922 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)); 1923 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1924 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1925 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1926 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1927 if (req->result == EIO_PATH_MAX)
1928 {
1929 req->result = -1;
1930 errno = ENAMETOOLONG;
1931 }
1932 break;
1852 case EIO_UTIME: 1933 case EIO_UTIME:
1853 case EIO_FUTIME: 1934 case EIO_FUTIME:
1854 { 1935 {
1855 struct timespec ts[2]; 1936 struct timespec ts[2];
1856 struct timespec *times; 1937 struct timespec *times;
… …
1881 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break; 1962 req->result = lstat (path , (EIO_STRUCT_STAT *)req->ptr2); break;
1882 case EIO_CHOWN: req->result = chown (path , req->int2, req->int3); break; 1963 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; 1964 case EIO_CHMOD: req->result = chmod (path , (mode_t)req->int2); break;
1884 case EIO_TRUNCATE: req->result = truncate (path , req->offs); break; 1965 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; 1966 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1967 case EIO_SLURP: eio__slurp ( open (path , O_RDONLY | O_CLOEXEC), req); break;
1886 1968
1887 case EIO_UNLINK: req->result = unlink (path ); break; 1969 case EIO_UNLINK: req->result = unlink (path ); break;
1888 case EIO_RMDIR: req->result = rmdir (path ); break; 1970 case EIO_RMDIR: req->result = rmdir (path ); break;
1889 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1971 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1890 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1972 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; 1973 case EIO_LINK: req->result = link (path , req->ptr2); break;
1892 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1974 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; 1975 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)); 1976 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1977 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1978 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1979 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1980 if (req->result == EIO_PATH_MAX)
1981 {
1982 req->result = -1;
1983 errno = ENAMETOOLONG;
1984 }
1985 break;
1898 1986
1899 case EIO_UTIME: 1987 case EIO_UTIME:
1900 case EIO_FUTIME: 1988 case EIO_FUTIME:
1901 { 1989 {
1902 struct timeval tv[2]; 1990 struct timeval tv[2];
… …
1937 2025
1938 case EIO_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; 2026 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; 2027 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; 2028 case EIO_FTRUNCATE: req->result = ftruncate (req->int1, req->offs); break;
1941 2029
1942 case EIO_CLOSE: req->result = close (req->int1); break; 2030 case EIO_CLOSE: req->result = eio__close (req->int1); break;
1943 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break; 2031 case EIO_DUP2: req->result = dup2 (req->int1, req->int2); break;
1944 case EIO_SYNC: req->result = 0; sync (); break; 2032 case EIO_SYNC: req->result = 0; sync (); break;
1945 case EIO_FSYNC: req->result = fsync (req->int1); break; 2033 case EIO_FSYNC: req->result = fsync (req->int1); break;
1946 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break; 2034 case EIO_FDATASYNC: req->result = fdatasync (req->int1); break;
1947 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break; 2035 case EIO_SYNCFS: req->result = eio__syncfs (req->int1); break;
… …
1985 default: 2073 default:
1986 req->result = EIO_ENOSYS (); 2074 req->result = EIO_ENOSYS ();
1987 break; 2075 break;
1988 } 2076 }
1989 2077
2078alloc_fail:
1990 req->errorno = errno; 2079 req->errorno = errno;
1991} 2080}
1992 2081
1993#ifndef EIO_NO_WRAPPERS 2082#ifndef EIO_NO_WRAPPERS
1994 2083
… …
2083} 2172}
2084 2173
2085eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) 2174eio_req *eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2086{ 2175{
2087 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND; 2176 REQ (EIO_WRITE); req->int1 = fd; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2177}
2178
2179eio_req *eio_fcntl (int fd, int cmd, void *arg, int pri, eio_cb cb, void *data)
2180{
2181 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = cmd; req->ptr2 = arg; SEND;
2182}
2183
2184eio_req *eio_ioctl (int fd, unsigned long request, void *buf, int pri, eio_cb cb, void *data)
2185{
2186 REQ (EIO_IOCTL); req->int1 = fd; req->int2 = request; req->ptr2 = buf; SEND;
2088} 2187}
2089 2188
2090eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data) 2189eio_req *eio_fstat (int fd, int pri, eio_cb cb, void *data)
2091{ 2190{
2092 REQ (EIO_FSTAT); req->int1 = fd; SEND; 2191 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) 2336eio_req *eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data)
2238{ 2337{
2239 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data); 2338 return eio__2path (EIO_RENAME, path, new_path, pri, cb, data);
2240} 2339}
2241 2340
2341eio_req *eio_slurp (const char *path, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data)
2342{
2343 REQ (EIO_SLURP); PATH; req->offs = offset; req->size = length; req->ptr2 = buf; SEND;
2344}
2345
2242eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) 2346eio_req *eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data)
2243{ 2347{
2244 REQ (EIO_CUSTOM); req->feed = execute; SEND; 2348 REQ (EIO_CUSTOM); req->feed = execute; SEND;
2245} 2349}
2246 2350

Diff Legend

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