pretty-print bigger ino_t variables

1 files changed, 9 insertions, 7 deletions

diff --git a/usr.sbin/procmap/procmap.c b/usr.sbin/procmap/procmap.c
index d13348cca26..1eac37c10b6 100644
--- a/usr.sbin/procmap/procmap.c
+++ b/usr.sbin/procmap/procmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procmap.c,v 1.47 2013/04/21 00:40:08 tedu Exp $ */
+/*	$OpenBSD: procmap.c,v 1.48 2013/04/24 14:29:00 deraadt Exp $ */
 /*	$NetBSD: pmap.c,v 1.1 2002/09/01 20:32:44 atatat Exp $ */
 
 /*
@@ -706,7 +706,7 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace,
 	}
 
 	if (print_maps)
-		printf("%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %u     %s\n",
+		printf("%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %llu     %s\n",
 		    (int)sizeof(void *) * 2, vme->start,
 		    (int)sizeof(void *) * 2, vme->end,
 		    (vme->protection & VM_PROT_READ) ? 'r' : '-',
@@ -715,7 +715,8 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace,
 		    (vme->etype & UVM_ET_COPYONWRITE) ? 'p' : 's',
 		    (int)sizeof(void *) * 2,
 		    (unsigned long)vme->offset,
-		    major(dev), minor(dev), inode, inode ? name : "");
+		    major(dev), minor(dev), (unsigned long long)inode,
+		    inode ? name : "");
 
 	if (print_ddb) {
 		printf(" - <lost address>: 0x%lx->0x%lx: "
@@ -731,8 +732,9 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace,
 		    vme->protection, vme->max_protection,
 		    vme->inheritance, vme->wired_count, vme->advice);
 		if (inode && verbose)
-			printf("\t(dev=%d,%d ino=%u [%s] [%p])\n",
-			    major(dev), minor(dev), inode, inode ? name : "", P(vp));
+			printf("\t(dev=%d,%d ino=%llu [%s] [%p])\n",
+			    major(dev), minor(dev), (unsigned long long)inode,
+			    inode ? name : "", P(vp));
 		else if (name[0] == ' ' && verbose)
 			printf("\t(%s)\n", &name[2]);
 	}
@@ -757,7 +759,7 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace,
 
 	if (print_all) {
 		sz = (size_t)((vme->end - vme->start) / 1024);
-		printf("%0*lx-%0*lx %7luk %0*lx %c%c%c%c%c (%c%c%c) %d/%d/%d %02d:%02d %7u - %s",
+		printf("%0*lx-%0*lx %7luk %0*lx %c%c%c%c%c (%c%c%c) %d/%d/%d %02d:%02d %7llu - %s",
 		    (int)sizeof(void *) * 2, vme->start, (int)sizeof(void *) * 2,
 		    vme->end - (vme->start != vme->end ? 1 : 0), (unsigned long)sz,
 		    (int)sizeof(void *) * 2, (unsigned long)vme->offset,
@@ -770,7 +772,7 @@ dump_vm_map_entry(kvm_t *kd, struct kbit *vmspace,
 		    (vme->max_protection & VM_PROT_WRITE) ? 'w' : '-',
 		    (vme->max_protection & VM_PROT_EXECUTE) ? 'x' : '-',
 		    vme->inheritance, vme->wired_count, vme->advice,
-		    major(dev), minor(dev), inode, name);
+		    major(dev), minor(dev), (unsigned long long)inode, name);
 		if (A(vp))
 			printf(" [%p]", P(vp));
 		printf("\n");