# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1670716397 -3600
# Node ID 280e444c468cfbd5a788af47e5c36947e528a350
# Parent  3e13e20943e8bd2c4f994d2ad05331d199f37705
Attempt to fix the format specifier for the file link count type.

diff -r 3e13e20943e8 -r 280e444c468c fsaccess/op_list_objects.c
--- a/fsaccess/op_list_objects.c	Sun Dec 11 00:21:58 2022 +0100
+++ b/fsaccess/op_list_objects.c	Sun Dec 11 00:53:17 2022 +0100
@@ -29,16 +29,19 @@
 #include <e2access/format.h>    /* get_permission_string */
 #include <e2access/path.h>
 #include <fsclient/client.h>
+#include <systypes/format.h>
 
 #include "ops.h"
 
+#define FMTnlinkd "%" pFMTnlink "d"
+
 
 
 /* Show object details. */
 
 static void _show_object(const char *basename, struct stat *st)
 {
-    printf("%s%s   %5d %5d      %6ld %6d %s\n",
+    printf("%s%s   %5d %5d      %6ld " FMTnlinkd " %s\n",
         S_ISDIR(st->st_mode) ? "d" : "-",
         get_permission_string(st->st_mode),
         st->st_uid,
diff -r 3e13e20943e8 -r 280e444c468c fsaccess/op_stat_objects.c
--- a/fsaccess/op_stat_objects.c	Sun Dec 11 00:21:58 2022 +0100
+++ b/fsaccess/op_stat_objects.c	Sun Dec 11 00:53:17 2022 +0100
@@ -31,6 +31,7 @@
 #include "ops.h"
 
 #define FMT64d "%" pFMT64 "d"
+#define FMTnlinkd "%" pFMTnlink "d"
 
 
 
@@ -60,7 +61,7 @@
         printf("%s %ld %ld %x %d %d ",
             path, st.st_size, st.st_blocks, st.st_mode, st.st_uid, st.st_gid);
 
-        printf(FMT64d " %ld %d %x %x ",
+        printf(FMT64d " %ld " FMTnlinkd " %x %x ",
             st.st_dev, st.st_ino, st.st_nlink,
             major(st.st_rdev), minor(st.st_rdev));
 
diff -r 3e13e20943e8 -r 280e444c468c libsystypes/include/systypes/format.h
--- a/libsystypes/include/systypes/format.h	Sun Dec 11 00:21:58 2022 +0100
+++ b/libsystypes/include/systypes/format.h	Sun Dec 11 00:53:17 2022 +0100
@@ -31,8 +31,10 @@
 
 #if __WORDSIZE == 64
 #define pFMT64 "l"
+#define pFMTword pFMT64
 #else
 #define pFMT64 "ll"
+#define pFMTword pFMT32
 #endif
 
 /* See: systypes/base.h */
@@ -47,4 +49,8 @@
 #define pFMTsize "l"
 #endif
 
+/* Other format specifiers. */
+
+#define pFMTnlink pFMTword
+
 // vim: tabstop=2 expandtab shiftwidth=2
diff -r 3e13e20943e8 -r 280e444c468c tests/dstest_file_readdir.cc
--- a/tests/dstest_file_readdir.cc	Sun Dec 11 00:21:58 2022 +0100
+++ b/tests/dstest_file_readdir.cc	Sun Dec 11 00:53:17 2022 +0100
@@ -32,6 +32,7 @@
 #include <systypes/format.h>
 
 #define FMT64d "%" pFMT64 "d"
+#define FMTnlinkd "%" pFMTnlink "d"
 
 
 
@@ -88,7 +89,7 @@
     printf("%s %ld %ld %x %d %d ",
         path, st.st_size, st.st_blocks, st.st_mode, st.st_uid, st.st_gid);
 
-    printf(FMT64d " %ld %d %x %x ",
+    printf(FMT64d " %ld " FMTnlinkd " %x %x ",
         st.st_dev, st.st_ino, st.st_nlink,
         major(st.st_rdev), minor(st.st_rdev));