Attachment 15824 Details for Bug 29231 – file.diff

[patch] file.diff

file.diff (text/plain), 2.16 KB, created by Paul Herman on 2001-07-25 20:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Herman

Created: 2001-07-25 20:40:07 UTC

Size: 2.16 KB

patch

obsolete

>Index: usr.bin/fstat/fstat.c
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/fstat/fstat.c,v
>retrieving revision 1.21.2.3
>diff -u -r1.21.2.3 fstat.c
>--- usr.bin/fstat/fstat.c	2000/12/05 09:43:11	1.21.2.3
>+++ usr.bin/fstat/fstat.c	2001/07/25 18:04:22
>@@ -664,7 +664,7 @@
> 		goto bad;
> 	}
> 
>-	printf("* pipe %8x <-> %8x", (int)pi, (int)pip.pipe_peer);
>+	printf("* pipe %8lx <-> %8lx", (u_long)pi, (u_long)pip.pipe_peer);
> 	printf(" %6d", (int)pip.pipe_buffer.cnt);
> 	rw[0] = '\0';
> 	if (flag & FREAD)
>@@ -762,16 +762,16 @@
> 					    (void *)so.so_pcb);
> 					goto bad;
> 				}
>-				printf(" %x", (int)inpcb.inp_ppcb);
>+				printf(" %lx", (u_long)inpcb.inp_ppcb);
> 			}
> 		}
> 		else if (so.so_pcb)
>-			printf(" %x", (int)so.so_pcb);
>+			printf(" %lx", (u_long)so.so_pcb);
> 		break;
> 	case AF_UNIX:
> 		/* print address of pcb and connected pcb */
> 		if (so.so_pcb) {
>-			printf(" %x", (int)so.so_pcb);
>+			printf(" %lx", (u_long)so.so_pcb);
> 			if (kvm_read(kd, (u_long)so.so_pcb, (char *)&unpcb,
> 			    sizeof(struct unpcb)) != sizeof(struct unpcb)){
> 				dprintf(stderr, "can't read unpcb at %p\n",
>@@ -788,14 +788,14 @@
> 				if (!(so.so_state & SS_CANTSENDMORE))
> 					*cp++ = '>';
> 				*cp = '\0';
>-				printf(" %s %x", shoconn,
>-				    (int)unpcb.unp_conn);
>+				printf(" %s %lx", shoconn,
>+				    (u_long)unpcb.unp_conn);
> 			}
> 		}
> 		break;
> 	default:
> 		/* print protocol number and socket address */
>-		printf(" %d %x", proto.pr_protocol, (int)sock);
>+		printf(" %d %lx", proto.pr_protocol, (u_long)sock);
> 	}
> 	printf("\n");
> 	return;
>Index: usr.bin/sockstat/sockstat.pl
>===================================================================
>RCS file: /home/ncvs/src/usr.bin/sockstat/sockstat.pl,v
>retrieving revision 1.6.2.4
>diff -u -r1.6.2.4 sockstat.pl
>--- usr.bin/sockstat/sockstat.pl	2001/03/22 13:49:51	1.6.2.4
>+++ usr.bin/sockstat/sockstat.pl	2001/07/25 19:15:26
>@@ -57,7 +57,7 @@
> 	die("exec(netstat): $!\n");
>     }
>     while ($line = <PIPE>) {
>-	next unless ($line =~ m/^[0-9a-f]{8} /);
>+	next unless ($line =~ m/^[0-9a-f]{8} /) || ($line =~ m/^[0-9a-f]{16} /);
> 	chomp($line);
> 	@fields = split(' ', $line);
> 	$netstat{$fields[0]} = [ @fields ];

Actions: View | Diff

Attachments on bug 29231: 15824