Properly space/align "-" if no c18n information; handle P_SYSTM.

CTSRD-CHERI · Apr 9, 2024 · 8b2f98b · 8b2f98b
1 parent b32e6c1
commit 8b2f98b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/usr.bin/procstat/procstat_cheri.c b/usr.bin/procstat/procstat_cheri.c
@@ -88,7 +88,7 @@ procstat_cheri(struct procstat *procstat, struct kinfo_proc *kipp)
 		xo_emit(" {:revoker_epoch/%34s/%s}", abi_cheri == 'P' ?
 		    get_revoker_epoch(procstat, kipp) : "-");
 	}
-	xo_emit(" {:compartments/%s/%s}", get_c18n(procstat, kipp));
+	xo_emit(" {:compartments/%5s/%s}", get_c18n(procstat, kipp));
 	xo_emit("\n");
 }
 
@@ -193,6 +193,8 @@ get_c18n(struct procstat *procstat, struct kinfo_proc *kipp)
 		if (errno != ESRCH && errno != EPERM && errno != ENOEXEC)
 			warn("procstat_get_c18n");
 		snprintf(c18n_buf, sizeof(c18n_buf), "-");
+	} else if (len < sizeof(*rcsp)) {
+		snprintf(c18n_buf, sizeof(c18n_buf), "-");
 	} else {
 		snprintf(c18n_buf, sizeof(c18n_buf), "%5lu",
 		    rcsp->rcs_compartments);