[PATCH V6 adjustments]

[Pádraig Brady]

The main change here is to refactor code duplication.
In particular this reuses the large print_stat() function
rather than redefining an almost similar print_statx().