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.145 by root, Fri Jun 23 03:10:19 2017 UTC

… …
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 EIO_PATH_MIN
331# define EIO_PATH_MIN 8160
332#endif
333
334#define EIO_PATH_MAX (PATH_MAX <= EIO_PATH_MIN ? EIO_PATH_MIN : PATH_MAX)
323 335
324/* buffer size for various temporary buffers */ 336/* buffer size for various temporary buffers */
325#define EIO_BUFSIZE 65536 337#define EIO_BUFSIZE 65536
326 338
327#define dBUF \ 339#define dBUF \
… …
974 986
975 errno = ENOENT; 987 errno = ENOENT;
976 if (!*rel) 988 if (!*rel)
977 return -1; 989 return -1;
978 990
979 res = etp_tmpbuf_get (tmpbuf, PATH_MAX * 3); 991 res = etp_tmpbuf_get (tmpbuf, EIO_PATH_MAX * 3);
980#ifdef _WIN32 992#ifdef _WIN32
981 if (_access (rel, 4) != 0) 993 if (_access (rel, 4) != 0)
982 return -1; 994 return -1;
983 995
984 symlinks = GetFullPathName (rel, PATH_MAX * 3, res, 0); 996 symlinks = GetFullPathName (rel, EIO_PATH_MAX * 3, res, 0);
985 997
986 errno = ENAMETOOLONG; 998 errno = ENAMETOOLONG;
987 if (symlinks >= PATH_MAX * 3) 999 if (symlinks >= EIO_PATH_MAX * 3)
988 return -1; 1000 return -1;
989 1001
990 errno = EIO; 1002 errno = EIO;
991 if (symlinks <= 0) 1003 if (symlinks <= 0)
992 return -1; 1004 return -1;
993 1005
994 return symlinks; 1006 return symlinks;
995 1007
996#else 1008#else
997 tmp1 = res + PATH_MAX; 1009 tmp1 = res + EIO_PATH_MAX;
998 tmp2 = tmp1 + PATH_MAX; 1010 tmp2 = tmp1 + EIO_PATH_MAX;
999 1011
1000#if 0 /* disabled, the musl way to do things is just too racy */ 1012#if 0 /* disabled, the musl way to do things is just too racy */
1001#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME) 1013#if __linux && defined(O_NONBLOCK) && defined(O_NOATIME)
1002 /* on linux we may be able to ask the kernel */ 1014 /* on linux we may be able to ask the kernel */
1003 { 1015 {
1004 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME); 1016 int fd = open (rel, O_RDONLY | O_NONBLOCK | O_NOCTTY | O_NOATIME);
1005 1017
1006 if (fd >= 0) 1018 if (fd >= 0)
1007 { 1019 {
1008 sprintf (tmp1, "/proc/self/fd/%d", fd); 1020 sprintf (tmp1, "/proc/self/fd/%d", fd);
1009 req->result = readlink (tmp1, res, PATH_MAX); 1021 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 */ 1022 /* here we should probably stat the open file and the disk file, to make sure they still match */
1011 close (fd); 1023 close (fd);
1012 1024
1013 if (req->result > 0) 1025 if (req->result > 0)
1014 goto done; 1026 goto done;
… …
1027 if (wd == EIO_INVALID_WD) 1039 if (wd == EIO_INVALID_WD)
1028 return -1; 1040 return -1;
1029 1041
1030 if (wd == EIO_CWD) 1042 if (wd == EIO_CWD)
1031 { 1043 {
1032 if (!getcwd (res, PATH_MAX)) 1044 if (!getcwd (res, EIO_PATH_MAX))
1033 return -1; 1045 return -1;
1034 1046
1035 len = strlen (res); 1047 len = strlen (res);
1036 } 1048 }
1037 else 1049 else
… …
1084 1096
1085 /* zero-terminate, for readlink */ 1097 /* zero-terminate, for readlink */
1086 res [len + 1] = 0; 1098 res [len + 1] = 0;
1087 1099
1088 /* now check if it's a symlink */ 1100 /* now check if it's a symlink */
1089 linklen = readlink (tmpbuf->ptr, tmp1, PATH_MAX); 1101 linklen = readlink (tmpbuf->ptr, tmp1, EIO_PATH_MAX);
1090 1102
1091 if (linklen < 0) 1103 if (linklen < 0)
1092 { 1104 {
1093 if (errno != EINVAL) 1105 if (errno != EINVAL)
1094 return -1; 1106 return -1;
… …
1100 { 1112 {
1101 /* yay, it was a symlink - build new path in tmp2 */ 1113 /* yay, it was a symlink - build new path in tmp2 */
1102 int rellen = strlen (rel); 1114 int rellen = strlen (rel);
1103 1115
1104 errno = ENAMETOOLONG; 1116 errno = ENAMETOOLONG;
1105 if (linklen + 1 + rellen >= PATH_MAX) 1117 if (linklen + 1 + rellen >= EIO_PATH_MAX) /* also catch linklen >= EIO_PATH_MAX */
1106 return -1; 1118 return -1;
1107 1119
1108 errno = ELOOP; 1120 errno = ELOOP;
1109 if (!--symlinks) 1121 if (!--symlinks)
1110 return -1; 1122 return -1;
… …
1671 } 1683 }
1672} 1684}
1673 1685
1674#if HAVE_AT 1686#if HAVE_AT
1675 1687
1688static int
1689eio__renameat2 (int olddirfd, const char *oldpath, int newdirfd, const char *newpath, unsigned int flags)
1690{
1691#if HAVE_RENAMEAT2
1692 return syscall (SYS_renameat2, olddirfd, oldpath, newdirfd, newpath, flags);
1693#else
1694 if (flags)
1695 return EIO_ENOSYS ();
1696
1697 return renameat (olddirfd, oldpath, newdirfd, newpath);
1698#endif
1699}
1700
1676/* they forgot these */ 1701/* they forgot these */
1677 1702
1678static int 1703static int
1679eio__truncateat (int dirfd, const char *path, off_t length) 1704eio__truncateat (int dirfd, const char *path, off_t length)
1680{ 1705{
… …
1836 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */ 1861 case EIO_RMDIR: /* complications arise because "." cannot be removed, so we might have to expand */
1837 req->result = req->wd && SINGLEDOT (req->ptr1) 1862 req->result = req->wd && SINGLEDOT (req->ptr1)
1838 ? rmdir (req->wd->str) 1863 ? rmdir (req->wd->str)
1839 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break; 1864 : unlinkat (dirfd, req->ptr1, AT_REMOVEDIR); break;
1840 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break; 1865 case EIO_MKDIR: req->result = mkdirat (dirfd, req->ptr1, (mode_t)req->int2); break;
1866 case EIO_RENAME: req->result = eio__renameat2 (
1867 dirfd,
1841 case EIO_RENAME: /* complications arise because "." cannot be renamed, so we might have to expand */ 1868 /* complications arise because "." cannot be renamed, so we might have to expand */
1842 req->result = req->wd && SINGLEDOT (req->ptr1) 1869 req->wd && SINGLEDOT (req->ptr1) ? req->wd->str : req->ptr1,
1843 ? rename (req->wd->str, req->ptr2) 1870 WD2FD ((eio_wd)req->int3),
1844 : renameat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2); break; 1871 req->ptr2,
1872 req->int2
1873 );
1874 break;
1845 case EIO_LINK: req->result = linkat (dirfd, req->ptr1, WD2FD ((eio_wd)req->int3), req->ptr2, 0); break; 1875 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; 1876 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; 1877 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)); 1878 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1851 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break; 1879 req->result = eio__statvfsat (dirfd, req->ptr1, (EIO_STRUCT_STATVFS *)req->ptr2); break;
1880 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1881 req->result = readlinkat (dirfd, req->ptr1, req->ptr2, EIO_PATH_MAX);
1882 if (req->result == EIO_PATH_MAX)
1883 {
1884 req->result = -1;
1885 errno = ENAMETOOLONG;
1886 }
1887 break;
1852 case EIO_UTIME: 1888 case EIO_UTIME:
1853 case EIO_FUTIME: 1889 case EIO_FUTIME:
1854 { 1890 {
1855 struct timespec ts[2]; 1891 struct timespec ts[2];
1856 struct timespec *times; 1892 struct timespec *times;
… …
1885 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break; 1921 case EIO_OPEN: req->result = open (path , req->int1, (mode_t)req->int2); break;
1886 1922
1887 case EIO_UNLINK: req->result = unlink (path ); break; 1923 case EIO_UNLINK: req->result = unlink (path ); break;
1888 case EIO_RMDIR: req->result = rmdir (path ); break; 1924 case EIO_RMDIR: req->result = rmdir (path ); break;
1889 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break; 1925 case EIO_MKDIR: req->result = mkdir (path , (mode_t)req->int2); break;
1890 case EIO_RENAME: req->result = rename (path , req->ptr2); break; 1926 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; 1927 case EIO_LINK: req->result = link (path , req->ptr2); break;
1892 case EIO_SYMLINK: req->result = symlink (path , req->ptr2); break; 1928 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; 1929 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)); 1930 case EIO_STATVFS: ALLOC (sizeof (EIO_STRUCT_STATVFS));
1897 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break; 1931 req->result = statvfs (path , (EIO_STRUCT_STATVFS *)req->ptr2); break;
1932 case EIO_READLINK: ALLOC (EIO_PATH_MAX);
1933 req->result = readlink (path, req->ptr2, EIO_PATH_MAX);
1934 if (req->result == EIO_PATH_MAX)
1935 {
1936 req->result = -1;
1937 errno = ENAMETOOLONG;
1938 }
1939 break;
1898 1940
1899 case EIO_UTIME: 1941 case EIO_UTIME:
1900 case EIO_FUTIME: 1942 case EIO_FUTIME:
1901 { 1943 {
1902 struct timeval tv[2]; 1944 struct timeval tv[2];

Diff Legend

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