Use st_blksize and st_blocks members conditionally #18964
Conversation
Instead of filtering Windows specifically, the preprocessor macros HAVE_STRUCT_STAT_ST_BLKSIZE and HAVE_STRUCT_STAT_ST_BLOCKS can be used. These members are mostly present on all POSIX-based systems except on Windows these days but this syncs the usage style across the code base. Additionally, in ext/standard/ftp_fopen_wrapper.c to set ssb->sb.st_blocks, also ssb->sb.st_blksize is added in the condition.
| ssb->sb.st_blksize = -1; | ||
| #endif | ||
| #ifdef HAVE_STRUCT_STAT_ST_BLOCKS | ||
| ssb->sb.st_blocks = -1; |
There was a problem hiding this comment.
it might be possible to simplify a tad as if there is st_blksize, there is st_blocks, wdyt ?
There was a problem hiding this comment.
I think we could do that, yes. Having st_blksize also most likely implies having st_blocks. And that would be good to get rid of this anomaly also in configure.ac then:
dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exist.
if test "$(uname -s 2>/dev/null)" != "QNX"; then
AC_STRUCT_ST_BLOCKS
fiBut I'm not sure. Should this be done all over php-src or only on this place?
There was a problem hiding this comment.
Ah, I see. Yes, I think this would be completely fine then to only check for st_blksize. If it's already in ext/phar and working out there when this condition is used #ifndef PHP_WIN32, then just checking for #ifdef HAVE_STRUCT_ST_BLKSIZE is the way to go in PHP. Because I don't see any build errors from ext/phar regarding these struct members...
There was a problem hiding this comment.
I'll recheck this a bit. Yes, everyone uses both checks and check them separately but this can totally be simplified indeed. Today's platforms all should have either both (POSIX) or none (Windows). I've already checked some BSDs, macOS, Solaris 10, Haiku...
Instead of filtering Windows specifically, the preprocessor macros HAVE_STRUCT_STAT_ST_BLKSIZE and HAVE_STRUCT_STAT_ST_BLOCKS can be used.
These members are mostly present on all POSIX-based systems except on Windows these days but this syncs the usage style across the code base.
Additionally, in ext/standard/ftp_fopen_wrapper.c to set ssb->sb.st_blocks, also ssb->sb.st_blksize is added in the condition.