tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Clarify _PC_REC_INCR_XFER_SIZE and _PC_REC_MAX_XFER_SIZE." into main

Browse source
This commit is contained in:
Elliott Hughes 2024-02-22 15:34:28 +00:00 committed by Gerrit Code Review
commit ea8be9ff96
2 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libc/bionic/pathconf.cpp
View file

@ -107,14 +107,6 @@ static long __pathconf(const struct statfs& s, int name) {
case _PC_REC_MIN_XFER_SIZE:
return s.f_bsize;
#if 0
case _PC_REC_INCR_XFER_SIZE:
case _PC_REC_MAX_XFER_SIZE:
#endif
case _PC_SYMLINK_MAX:
return -1; /* no limit */
case _PC_CHOWN_RESTRICTED:
return _POSIX_CHOWN_RESTRICTED;
@ -125,12 +117,15 @@ static long __pathconf(const struct statfs& s, int name) {
return _POSIX_VDISABLE;
case _PC_ASYNC_IO:
return -1;
case _PC_PRIO_IO:
return -1;
case _PC_REC_INCR_XFER_SIZE:
case _PC_REC_MAX_XFER_SIZE:
case _PC_SYMLINK_MAX:
case _PC_SYNC_IO:
// No API to answer these: the caller will have to "try it and see".
// This differs from the next case in not setting errno to EINVAL,
// since we did understand the question --- we just don't have a
// good answer.
return -1;
default:

40
tests/unistd_test.cpp
View file

@ -753,22 +753,36 @@ TEST(UNISTD_TEST, gethostname) {
TEST(UNISTD_TEST, pathconf_fpathconf) {
TemporaryFile tf;
long rc = 0L;
long l;
// As a file system's block size is always power of 2, the configure values
// for ALLOC and XFER should be power of 2 as well.
rc = pathconf(tf.path, _PC_ALLOC_SIZE_MIN);
ASSERT_TRUE(rc > 0 && powerof2(rc));
rc = pathconf(tf.path, _PC_REC_MIN_XFER_SIZE);
ASSERT_TRUE(rc > 0 && powerof2(rc));
rc = pathconf(tf.path, _PC_REC_XFER_ALIGN);
ASSERT_TRUE(rc > 0 && powerof2(rc));
l = pathconf(tf.path, _PC_ALLOC_SIZE_MIN);
ASSERT_TRUE(l > 0 && powerof2(l));
l = pathconf(tf.path, _PC_REC_MIN_XFER_SIZE);
ASSERT_TRUE(l > 0 && powerof2(l));
l = pathconf(tf.path, _PC_REC_XFER_ALIGN);
ASSERT_TRUE(l > 0 && powerof2(l));
rc = fpathconf(tf.fd, _PC_ALLOC_SIZE_MIN);
ASSERT_TRUE(rc > 0 && powerof2(rc));
rc = fpathconf(tf.fd, _PC_REC_MIN_XFER_SIZE);
ASSERT_TRUE(rc > 0 && powerof2(rc));
rc = fpathconf(tf.fd, _PC_REC_XFER_ALIGN);
ASSERT_TRUE(rc > 0 && powerof2(rc));
l = fpathconf(tf.fd, _PC_ALLOC_SIZE_MIN);
ASSERT_TRUE(l > 0 && powerof2(l));
l = fpathconf(tf.fd, _PC_REC_MIN_XFER_SIZE);
ASSERT_TRUE(l > 0 && powerof2(l));
l = fpathconf(tf.fd, _PC_REC_XFER_ALIGN);
ASSERT_TRUE(l > 0 && powerof2(l));
// Check that the "I can't answer that, you'll have to try it and see"
// cases don't set errno.
int names[] = {
_PC_ASYNC_IO, _PC_PRIO_IO, _PC_REC_INCR_XFER_SIZE, _PC_REC_MAX_XFER_SIZE, _PC_SYMLINK_MAX,
_PC_SYNC_IO, -1};
for (size_t i = 0; names[i] != -1; i++) {
errno = 0;
ASSERT_EQ(-1, pathconf(tf.path, names[i])) << names[i];
ASSERT_ERRNO(0) << names[i];
ASSERT_EQ(-1, fpathconf(tf.fd, names[i])) << names[i];
ASSERT_ERRNO(0) << names[i];
}
}
TEST(UNISTD_TEST, _POSIX_constants) {