fbsd-nat: Don't use '%jd' and '%ju' with printf_filtered.

The handler for 'info proc status' for native processes on FreeBSD
uses the 'j' size modifier along with uintmax_t / intmax_t casts to
output integer values for types such as off_t that are not aliases of
a basic C type such as 'int' or 'long'.  printf_filtered does not
support the 'j' modifer, so this resulted in runtime errors in
practice:

(gdb) info proc stat
process 8674
Name: ls
State: T (stopped)
Parent process: 8673
Process group: 8674
Session id: 2779
Unrecognized format specifier 'j' in printf

Instead, use plongest and pulongest to generate the output strings of
these integer values.

gdb/ChangeLog:

	* fbsd-nat.c (fbsd_nat_target::info_proc): Use plongest and
	pulongest instead of %j.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd4a9d11b92259c2f2b9f4f6216f417947ec6cd3..80cf523e6479389ffe46782779ca4d8b5b1539c9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-09-07  John Baldwin  <jhb@FreeBSD.org>
+
+       * fbsd-nat.c (fbsd_nat_target::info_proc): Use plongest and
+       pulongest instead of %j.
+
 2021-08-30  Tom de Vries  <tdevries@suse.de>
 
        PR cli/28290

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 234e74fcfd430a0e5cccb20ae782b5876aa2e529..6818d5acd9351ce9a0b6638d34a8fd564105f104 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -365,7 +365,7 @@ fbsd_nat_target::info_proc (const char *args, enum info_proc_what what)
          printf_filtered ("Parent process: %d\n", kp.ki_ppid);
          printf_filtered ("Process group: %d\n", kp.ki_pgid);
          printf_filtered ("Session id: %d\n", kp.ki_sid);
-         printf_filtered ("TTY: %ju\n", (uintmax_t) kp.ki_tdev);
+         printf_filtered ("TTY: %s\n", pulongest (kp.ki_tdev));
          printf_filtered ("TTY owner process group: %d\n", kp.ki_tpgid);
          printf_filtered ("User IDs (real, effective, saved): %d %d %d\n",
                           kp.ki_ruid, kp.ki_uid, kp.ki_svuid);
@@ -383,34 +383,35 @@ fbsd_nat_target::info_proc (const char *args, enum info_proc_what what)
                           kp.ki_rusage.ru_majflt);
          printf_filtered ("Major faults, children: %ld\n",
                           kp.ki_rusage_ch.ru_majflt);
-         printf_filtered ("utime: %jd.%06ld\n",
-                          (intmax_t) kp.ki_rusage.ru_utime.tv_sec,
+         printf_filtered ("utime: %s.%06ld\n",
+                          plongest (kp.ki_rusage.ru_utime.tv_sec),
                           kp.ki_rusage.ru_utime.tv_usec);
-         printf_filtered ("stime: %jd.%06ld\n",
-                          (intmax_t) kp.ki_rusage.ru_stime.tv_sec,
+         printf_filtered ("stime: %s.%06ld\n",
+                          plongest (kp.ki_rusage.ru_stime.tv_sec),
                           kp.ki_rusage.ru_stime.tv_usec);
-         printf_filtered ("utime, children: %jd.%06ld\n",
-                          (intmax_t) kp.ki_rusage_ch.ru_utime.tv_sec,
+         printf_filtered ("utime, children: %s.%06ld\n",
+                          plongest (kp.ki_rusage_ch.ru_utime.tv_sec),
                           kp.ki_rusage_ch.ru_utime.tv_usec);
-         printf_filtered ("stime, children: %jd.%06ld\n",
-                          (intmax_t) kp.ki_rusage_ch.ru_stime.tv_sec,
+         printf_filtered ("stime, children: %s.%06ld\n",
+                          plongest (kp.ki_rusage_ch.ru_stime.tv_sec),
                           kp.ki_rusage_ch.ru_stime.tv_usec);
          printf_filtered ("'nice' value: %d\n", kp.ki_nice);
-         printf_filtered ("Start time: %jd.%06ld\n", kp.ki_start.tv_sec,
+         printf_filtered ("Start time: %s.%06ld\n",
+                          plongest (kp.ki_start.tv_sec),
                           kp.ki_start.tv_usec);
          pgtok = getpagesize () / 1024;
-         printf_filtered ("Virtual memory size: %ju kB\n",
-                          (uintmax_t) kp.ki_size / 1024);
-         printf_filtered ("Data size: %ju kB\n",
-                          (uintmax_t) kp.ki_dsize * pgtok);
-         printf_filtered ("Stack size: %ju kB\n",
-                          (uintmax_t) kp.ki_ssize * pgtok);
-         printf_filtered ("Text size: %ju kB\n",
-                          (uintmax_t) kp.ki_tsize * pgtok);
-         printf_filtered ("Resident set size: %ju kB\n",
-                          (uintmax_t) kp.ki_rssize * pgtok);
-         printf_filtered ("Maximum RSS: %ju kB\n",
-                          (uintmax_t) kp.ki_rusage.ru_maxrss);
+         printf_filtered ("Virtual memory size: %s kB\n",
+                          pulongest (kp.ki_size / 1024));
+         printf_filtered ("Data size: %s kB\n",
+                          pulongest (kp.ki_dsize * pgtok));
+         printf_filtered ("Stack size: %s kB\n",
+                          pulongest (kp.ki_ssize * pgtok));
+         printf_filtered ("Text size: %s kB\n",
+                          pulongest (kp.ki_tsize * pgtok));
+         printf_filtered ("Resident set size: %s kB\n",
+                          pulongest (kp.ki_rssize * pgtok));
+         printf_filtered ("Maximum RSS: %s kB\n",
+                          pulongest (kp.ki_rusage.ru_maxrss));
          printf_filtered ("Pending Signals: ");
          for (int i = 0; i < _SIG_WORDS; i++)
            printf_filtered ("%08x ", kp.ki_siglist.__bits[i]);