1.1 --- a/fsaccess/op_list_objects.c Sun Dec 11 00:21:58 2022 +0100
1.2 +++ b/fsaccess/op_list_objects.c Sun Dec 11 00:53:17 2022 +0100
1.3 @@ -29,16 +29,19 @@
1.4 #include <e2access/format.h> /* get_permission_string */
1.5 #include <e2access/path.h>
1.6 #include <fsclient/client.h>
1.7 +#include <systypes/format.h>
1.8
1.9 #include "ops.h"
1.10
1.11 +#define FMTnlinkd "%" pFMTnlink "d"
1.12 +
1.13
1.14
1.15 /* Show object details. */
1.16
1.17 static void _show_object(const char *basename, struct stat *st)
1.18 {
1.19 - printf("%s%s %5d %5d %6ld %6d %s\n",
1.20 + printf("%s%s %5d %5d %6ld " FMTnlinkd " %s\n",
1.21 S_ISDIR(st->st_mode) ? "d" : "-",
1.22 get_permission_string(st->st_mode),
1.23 st->st_uid,
2.1 --- a/fsaccess/op_stat_objects.c Sun Dec 11 00:21:58 2022 +0100
2.2 +++ b/fsaccess/op_stat_objects.c Sun Dec 11 00:53:17 2022 +0100
2.3 @@ -31,6 +31,7 @@
2.4 #include "ops.h"
2.5
2.6 #define FMT64d "%" pFMT64 "d"
2.7 +#define FMTnlinkd "%" pFMTnlink "d"
2.8
2.9
2.10
2.11 @@ -60,7 +61,7 @@
2.12 printf("%s %ld %ld %x %d %d ",
2.13 path, st.st_size, st.st_blocks, st.st_mode, st.st_uid, st.st_gid);
2.14
2.15 - printf(FMT64d " %ld %d %x %x ",
2.16 + printf(FMT64d " %ld " FMTnlinkd " %x %x ",
2.17 st.st_dev, st.st_ino, st.st_nlink,
2.18 major(st.st_rdev), minor(st.st_rdev));
2.19
3.1 --- a/libsystypes/include/systypes/format.h Sun Dec 11 00:21:58 2022 +0100
3.2 +++ b/libsystypes/include/systypes/format.h Sun Dec 11 00:53:17 2022 +0100
3.3 @@ -31,8 +31,10 @@
3.4
3.5 #if __WORDSIZE == 64
3.6 #define pFMT64 "l"
3.7 +#define pFMTword pFMT64
3.8 #else
3.9 #define pFMT64 "ll"
3.10 +#define pFMTword pFMT32
3.11 #endif
3.12
3.13 /* See: systypes/base.h */
3.14 @@ -47,4 +49,8 @@
3.15 #define pFMTsize "l"
3.16 #endif
3.17
3.18 +/* Other format specifiers. */
3.19 +
3.20 +#define pFMTnlink pFMTword
3.21 +
3.22 // vim: tabstop=2 expandtab shiftwidth=2
4.1 --- a/tests/dstest_file_readdir.cc Sun Dec 11 00:21:58 2022 +0100
4.2 +++ b/tests/dstest_file_readdir.cc Sun Dec 11 00:53:17 2022 +0100
4.3 @@ -32,6 +32,7 @@
4.4 #include <systypes/format.h>
4.5
4.6 #define FMT64d "%" pFMT64 "d"
4.7 +#define FMTnlinkd "%" pFMTnlink "d"
4.8
4.9
4.10
4.11 @@ -88,7 +89,7 @@
4.12 printf("%s %ld %ld %x %d %d ",
4.13 path, st.st_size, st.st_blocks, st.st_mode, st.st_uid, st.st_gid);
4.14
4.15 - printf(FMT64d " %ld %d %x %x ",
4.16 + printf(FMT64d " %ld " FMTnlinkd " %x %x ",
4.17 st.st_dev, st.st_ino, st.st_nlink,
4.18 major(st.st_rdev), minor(st.st_rdev));
4.19